diff --git a/error_report.php b/error_report.php index c4a8c755..ad51c86b 100644 --- a/error_report.php +++ b/error_report.php @@ -67,6 +67,11 @@ if (!empty($errid)) { $mail_body .= "User-Area: " . AREA . "\n"; $mail_body .= "Froxlor-version: " . Froxlor::VERSION . "\n"; $mail_body .= "DB-version: " . Froxlor::DBVERSION . "\n\n"; + try { + $mail_body .= "Database: " . Database::getAttribute(PDO::ATTR_SERVER_VERSION); + } catch (\Exception $e) { + /* ignore */ + } $mail_body .= "End of report"; $mail_html = nl2br($mail_body); diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index 07b0c7bf..d39cee1f 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -66,10 +66,11 @@ if (Froxlor::isFroxlorVersion('0.10.38.3')) { KEY customerid (customerid) ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_general_ci;"; Database::query($sql); + Database::query("SET SESSION innodb_strict_mode=OFF;"); // new customer allowed_mysqlserver field - Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `allowed_mysqlserver` text NOT NULL;"); - Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE COLUMN `allowed_phpconfigs` `allowed_phpconfigs` text NOT NULL;"); Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE COLUMN `customernumber` `customernumber` varchar(100) NOT NULL default '';"); + Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE COLUMN `allowed_phpconfigs` `allowed_phpconfigs` text NOT NULL;"); + Database::query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `allowed_mysqlserver` text NOT NULL;"); $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 '';");