diff --git a/install/froxlor.sql b/install/froxlor.sql index 164875bf..17a408e5 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -534,7 +534,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_regex', ''), ('panel', 'use_webfonts', '0'), ('panel', 'webfont', 'Numans'), - ('panel', 'version', '0.9.28-rc1'); + ('panel', 'version', '0.9.28'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 0f8ee35a..681f75e1 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2026,13 +2026,23 @@ if (isFroxlorVersion('0.9.28-svn6')) { } if (isFroxlorVersion('0.9.28-rc1')) { + showUpdateStep("Updating from 0.9.28-rc1 to 0.9.28-rc2", true); + lastStepStatus(0); + $update_system_documentroot_use_default_value = isset($_POST['update_system_documentroot_use_default_value']) ? (int)$_POST['update_system_documentroot_use_default_value'] : '0'; showUpdateStep("Adding new settings for using domain name as default value for DocumentRoot path", true); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'documentroot_use_default_value', '".$update_system_documentroot_use_default_value."');"); lastStepStatus(0); - showUpdateStep("Updating from 0.9.28-rc1 to 0.9.28-rc2", true); + updateToVersion('0.9.28-rc2'); +} + +if (isFroxlorVersion('0.9.28-rc2')) { + showUpdateStep("Updating from 0.9.28-rc2 to 0.9.28 final", true); + $db->query("DELETE FROM `panel_settings` WHERE `settinggroup`='system' AND `varname`='mod_log_sql'"); + $db->query("DELETE FROM `panel_settings` WHERE `settinggroup`='system' AND `varname`='openssl_cnf'"); + $db->query("ALTER `panel_domains` DROP `safemode`"); lastStepStatus(0); - updateToVersion('0.9.28-rc2'); -} \ No newline at end of file + updateToVersion('0.9.28'); +} diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index 3a17daab..6562d872 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -484,4 +484,23 @@ LoadModule authz_host_module modules/mod_authz_host.so
'; eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } + if (versionInUpdate($current_version, '0.9.28')) { + + $has_preconfig = true; + // just an information about the new sendmail parameter (#1134) + $description = 'Froxlor changed the default parameter-set of sendmail (php.ini)
'; + $description .= 'sendmail_path = "/usr/sbin/sendmail -t -i -f {CUSTOMER_EMAIL}"

'; + $description .= 'If you don\'t have any problems with sending mails, you don\'t need to change this'; + if ($this->_settings['system']['mod_fcgid'] == '1' + || $this->_settings['phpfpm']['enabled'] == '1' + ) { + // information about removal of php's safe_mode + $description .= '

The php safe_mode flag has been removed as current versions of PHP
'; + $description .= 'do not support it anymore.

'; + $description .= 'Please check your php-configurations and remove safe_mode-directives to avoid php notices/warnings.'; + } + $question = ''; + + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 28aa2a59..a0dd7e5c 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.28-rc2'; +$version = '0.9.28'; $dbversion = '2'; $branding = '';