diff --git a/admin_opcacheinfo.php b/admin_opcacheinfo.php index 5c660858..27654a44 100644 --- a/admin_opcacheinfo.php +++ b/admin_opcacheinfo.php @@ -155,6 +155,9 @@ if ($page == 'showinfo' && $userinfo['change_serversettings'] == '1') { if ($config['directives']['opcache.file_cache_only'] || !empty($status['file_cache_only'])) { $overview = false; } else { + $status['opcache_statistics']['start_time'] = $status['opcache_statistics']['start_time'] ?? time(); + $status['opcache_statistics']['last_restart_time'] = $status['opcache_statistics']['last_restart_time'] ?? time(); + $overview = array_merge( $status['memory_usage'], $status['opcache_statistics'], diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index ee7d041d..41b85ac7 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -176,7 +176,7 @@ CREATE TABLE `panel_customers` ( `phone` varchar(50) NOT NULL default '', `fax` varchar(50) NOT NULL default '', `email` varchar(255) NOT NULL default '', - `customernumber` varchar(255) NOT NULL default '', + `customernumber` varchar(100) NOT NULL default '', `def_language` varchar(100) NOT NULL default '', `diskspace` bigint(30) NOT NULL default '0', `diskspace_used` bigint(30) NOT NULL default '0', @@ -217,12 +217,12 @@ CREATE TABLE `panel_customers` ( `lepublickey` mediumtext default NULL, `leprivatekey` mediumtext default NULL, `leregistered` tinyint(1) NOT NULL default '0', - `allowed_phpconfigs` varchar(500) NOT NULL default '', + `allowed_phpconfigs` text NOT NULL default '', `type_2fa` tinyint(1) NOT NULL default '0', `data_2fa` varchar(25) NOT NULL default '', `api_allowed` tinyint(1) NOT NULL default '1', `logviewenabled` tinyint(1) NOT NULL default '0', - `allowed_mysqlserver` varchar(500) NOT NULL default '[0]', + `allowed_mysqlserver` text NOT NULL default '[0]', PRIMARY KEY (`customerid`), UNIQUE KEY `loginname` (`loginname`) ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci; @@ -696,7 +696,7 @@ opcache.validate_timestamps'), ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '2.0.0'), + ('system', 'update_notify_last', '2.0.1'), ('system', 'traffictool', 'goaccess'), ('api', 'enabled', '0'), ('2fa', 'enabled', '1'), @@ -740,7 +740,7 @@ opcache.validate_timestamps'), ('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), - ('panel', 'version', '2.0.0-beta1'), + ('panel', 'version', '2.0.1'), ('panel', 'db_version', '202212060'); diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 6c4b6ec1..c79f48e9 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -67,7 +67,10 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) { ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;"; Database::query($sql); // new customer allowed_mysqlserver field - Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `allowed_mysqlserver` varchar(500) NOT NULL default '[0]';"); + Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `allowed_mysqlserver` text NOT NULL default '[0]';"); + Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE COLUMN `allowed_phpconfigs` `allowed_phpconfigs` text NOT NULL default '';"); + Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE COLUMN `customernumber` `customernumber` varchar(100) NOT NULL default '';"); + $has_customer_table_update_200 = true; // ftp_users adjustments Database::query("ALTER TABLE `" . TABLE_FTP_USERS . "` CHANGE COLUMN `password` `password` varchar(255) NOT NULL default '';"); Database::query("ALTER TABLE `" . TABLE_FTP_QUOTALIMITS . "` CHANGE COLUMN `name` `name` varchar(255) default NULL;"); @@ -207,6 +210,7 @@ if (Froxlor::isDatabaseVersion('202211030')) { $newCronBin = Froxlor::getInstallDir().'/bin/froxlor-cli'; $compCron = <<getCode() === 405) {