set version to 0.10.0

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>

install/froxlor.sql

@@ -656,6 +656,7 @@ opcache.interned_strings_buffer'),
 	('system', 'nssextrausers', '0'),
 	('system', 'disable_le_selfcheck', '0'),
 	('system', 'ssl_protocols', 'TLSv1,TLSv1.2'),
+	('api', 'enabled', '0'),
 	('panel', 'decimal_places', '4'),
 	('panel', 'adminmail', 'admin@SERVERNAME'),
 	('panel', 'phpmyadmin_url', ''),
@@ -687,8 +688,8 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char_required', '0'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
-	('panel', 'version', '0.9.39.5'),
-	('panel', 'db_version', '201802130');
+	('panel', 'version', '0.10.0'),
+	('panel', 'db_version', '201802150');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;

install/updates/froxlor/0.9/update_0.10.inc.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2010 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright  (c) the authors
+ * @author     Froxlor team <team@froxlor.org> (2010-)
+ * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package    Install
+ *
+ */
+if (!defined('_CRON_UPDATE')) {
+	if (! defined('AREA') || (defined('AREA') && AREA != 'admin') || ! isset($userinfo['loginname']) || (isset($userinfo['loginname']) && $userinfo['loginname'] == '')) {
+		header('Location: ../../../../index.php');
+		exit();
+	}
+}
+
+if (isFroxlorVersion('0.9.39.5')) {
+	
+	showUpdateStep("Updating from 0.9.39.5 to 0.10.0", false);
+	updateToVersion('0.10.0');
+}

install/updates/froxlor/0.9/update_0.9.inc.php

@@ -3939,3 +3939,29 @@ if (isFroxlorVersion('0.9.39.4')) {
 	showUpdateStep("Updating from 0.9.39.4 to 0.9.39.5", false);
 	updateToVersion('0.9.39.5');
 }
+
+if (isDatabaseVersion('201802130')) {
+
+	showUpdateStep("Adding new api keys table");
+	Database::query("DROP TABLE IF EXISTS `api_keys`;");
+	$sql = "CREATE TABLE `api_keys` (
+	  `id` int(11) NOT NULL auto_increment,
+	  `adminid` int(11) NOT NULL default '0',
+	  `customerid` int(11) NOT NULL default '0',
+	  `apikey` varchar(500) NOT NULL default '',
+	  `secret` varchar(500) NOT NULL default '',
+	  `allowed_from` text NOT NULL,
+	  `valid_until` int(15) NOT NULL default '0',
+	  PRIMARY KEY  (id),
+	  KEY adminid (adminid),
+	  KEY customerid (customerid)
+	) ENGINE=MyISAM CHARSET=utf8 COLLATE=utf8_general_ci;";
+	Database::query($sql);
+	lastStepStatus(0);
+
+	showUpdateStep("Adding new api settings");
+	Settings::AddNew('api.enabled', 0);
+	lastStepStatus(0);
+
+	updateToDbVersion('201802150');
+}

install/updatesql.php

@@ -55,6 +55,7 @@ if(!isFroxlor()) {
 
 if (isFroxlor()) {
 	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.9/update_0.9.inc.php'));
+	include_once (makeCorrectFile(dirname(__FILE__).'/updates/froxlor/0.10/update_0.10.inc.php'));
 
 	// Check Froxlor - database integrity (only happens after all updates are done, so we know the db-layout is okay)
 	showUpdateStep("Checking database integrity");

lib/tables.inc.php

@@ -53,5 +53,6 @@ define('TABLE_DOMAINTOIP', 'panel_domaintoip');
 define('TABLE_DOMAIN_DNS', 'domain_dns_entries');
 define('TABLE_PANEL_FPMDAEMONS', 'panel_fpmdaemons');
 define('TABLE_PANEL_PLANS', 'panel_plans');
+define('TABLE_API_KEYS', 'api_keys');
 
 require dirname(__FILE__).'/version.inc.php';

lib/version.inc.php

@@ -16,10 +16,10 @@
  */
 
 // Main version variable
-$version = '0.9.39.5';
+$version = '0.10.0';
 
 // Database version (YYYYMMDDC where C is a daily counter)
-$dbversion = '201802130';
+$dbversion = '201802150';
 
 // Distribution branding-tag (used for Debian etc.)
 $branding = '';