maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

set version to 0.9.35 final for upcoming release

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-04-08 12:54:17 +02:00
parent c14017c244
commit fddd6e8965
3 changed files with 651 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/froxlor.sql
View File

@@ -555,7 +555,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES
('panel', 'password_numeric', '0'), ('panel', 'password_numeric', '0'),
('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char_required', '0'),
('panel', 'password_special_char', '!?<>§$%+#=@'), ('panel', 'password_special_char', '!?<>§$%+#=@'),
('panel', 'version', '0.9.35-rc1'), ('panel', 'version', '0.9.35'),
('panel', 'db_version', '201603150'); ('panel', 'db_version', '201603150');

557
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -14,14 +14,9 @@
* @package Install * @package Install
* *
*/ */
if (! defined('AREA') || (defined('AREA') && AREA != 'admin') || ! isset($userinfo['loginname']) || (isset($userinfo['loginname']) && $userinfo['loginname'] == '')) {
if (!defined('AREA')
|| (defined('AREA') && AREA != 'admin')
|| !isset($userinfo['loginname'])
|| (isset($userinfo['loginname']) && $userinfo['loginname'] == '')
) {
header('Location: ../../../../index.php'); header('Location: ../../../../index.php');
exit; exit();
} }
if (isFroxlorVersion('0.9-r0')) { if (isFroxlorVersion('0.9-r0')) {
@@ -32,8 +27,7 @@ if (isFroxlorVersion('0.9-r0')) {
// add missing database-updates if necessary (old: update/update_database.php) // add missing database-updates if necessary (old: update/update_database.php)
if (Settings::Get('system.dbversion') !== null && (int) Settings::Get('system.dbversion') < 1) { if (Settings::Get('system.dbversion') !== null && (int) Settings::Get('system.dbversion') < 1) {
Database::query(" Database::query("
ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';" ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';");
);
} }
if (Settings::Get('system.dbversion') !== null && (int) Settings::Get('system.dbversion') < 2) { if (Settings::Get('system.dbversion') !== null && (int) Settings::Get('system.dbversion') < 2) {
Database::query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL, Database::query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL,
@@ -195,9 +189,7 @@ if (isFroxlorVersion('0.9-r1')) {
Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@ IN TXT \"v=spf1 a mx -all\"');"); Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@ IN TXT \"v=spf1 a mx -all\"');");
Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'"); Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'");
if (Settings::Get('admin.syscp_graphic') !== null if (Settings::Get('admin.syscp_graphic') !== null && Settings::Get('admin.syscp_graphic') != '') {
&& Settings::Get('admin.syscp_graphic') != ''
){
Settings::Set('admin.froxlor_graphic', Settings::Get('admin.syscp_graphic')); Settings::Set('admin.froxlor_graphic', Settings::Get('admin.syscp_graphic'));
} else { } else {
Settings::Set('admin.froxlor_graphic', 'images/header.gif'); Settings::Set('admin.froxlor_graphic', 'images/header.gif');
@@ -300,10 +292,7 @@ if (isFroxlorVersion('0.9.1')) {
$result_stmt = Database::query("SELECT MAX(`guid`) as `latestguid` FROM `" . TABLE_PANEL_CUSTOMERS . "`"); $result_stmt = Database::query("SELECT MAX(`guid`) as `latestguid` FROM `" . TABLE_PANEL_CUSTOMERS . "`");
$result = $result_stmt->fetch(PDO::FETCH_ASSOC); $result = $result_stmt->fetch(PDO::FETCH_ASSOC);
if (isset($result['latestguid']) if (isset($result['latestguid']) && (int) $result['latestguid'] > 0 && $result['latestguid'] != Settings::Get('system.lastguid')) {
&& (int)$result['latestguid'] > 0
&& $result['latestguid'] != Settings::Get('system.lastguid')
) {
checkLastGuid(); checkLastGuid();
lastStepStatus(1, 'fixed'); lastStepStatus(1, 'fixed');
} else { } else {
@@ -404,28 +393,20 @@ if (isFroxlorVersion('0.9.4')) {
* because we already had this back in older versions. * because we already had this back in older versions.
* To not confuse Froxlor, we just update old settings. * To not confuse Froxlor, we just update old settings.
*/ */
if(Settings::Get('system.awstats_path') !== null if (Settings::Get('system.awstats_path') !== null && Settings::Get('system.awstats_path') != '') {
&& Settings::Get('system.awstats_path') != ''
) {
showUpdateStep("Updating awstats path setting"); showUpdateStep("Updating awstats path setting");
Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';"); Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';");
lastStepStatus(0); lastStepStatus(0);
} } elseif (Settings::Get('system.awstats_path') == null) {
elseif(Settings::Get('system.awstats_path') == null)
{
showUpdateStep("Adding new awstats path setting"); showUpdateStep("Adding new awstats path setting");
Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_path', '/usr/bin/');"); Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_path', '/usr/bin/');");
lastStepStatus(0); lastStepStatus(0);
} }
if(Settings::Get('system.awstats_domain_file') !== null if (Settings::Get('system.awstats_domain_file') !== null && Settings::Get('system.awstats_domain_file') != '') {
&& Settings::Get('system.awstats_domain_file') != ''
) {
showUpdateStep("Updating awstats configuration path setting"); showUpdateStep("Updating awstats configuration path setting");
Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';"); Database::query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';");
} } else {
else
{
showUpdateStep("Adding awstats configuration path settings"); showUpdateStep("Adding awstats configuration path settings");
Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_conf', '/etc/awstats/');"); Database::query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_conf', '/etc/awstats/');");
} }
@@ -503,9 +484,10 @@ if (isFroxlorVersion('0.9.6-svn1')) {
} else { } else {
$stmt = Database::prepare(" $stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :adminmail UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :adminmail
WHERE `settinggroup` = 'panel' AND `varname` = 'adminmail';" WHERE `settinggroup` = 'panel' AND `varname` = 'adminmail';");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('adminmail' => $update_adminmail)); 'adminmail' => $update_adminmail
));
lastStepStatus(0); lastStepStatus(0);
} }
} }
@@ -534,34 +516,37 @@ if (isFroxlorVersion('0.9.6-svn2')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'defaultwebsrverrhandler', `settinggroup` = 'defaultwebsrverrhandler',
`varname` = :varname, `varname` = :varname,
`value` = :err" `value` = :err");
);
if (isset($_POST['update_deferr_500']) if (isset($_POST['update_deferr_500']) && trim($_POST['update_deferr_500']) != '') {
&& trim($_POST['update_deferr_500']) != '' Database::pexecute($stmt, array(
) { 'varname' => 'err500',
Database::pexecute($stmt, array('varname' => 'err500', 'err' => $_POST['update_deferr_500'])); 'err' => $_POST['update_deferr_500']
));
$err500 = true; $err500 = true;
} }
if(isset($_POST['update_deferr_401']) if (isset($_POST['update_deferr_401']) && trim($_POST['update_deferr_401']) != '') {
&& trim($_POST['update_deferr_401']) != '' Database::pexecute($stmt, array(
) { 'varname' => 'err401',
Database::pexecute($stmt, array('varname' => 'err401', 'err' => $_POST['update_deferr_401'])); 'err' => $_POST['update_deferr_401']
));
$err401 = true; $err401 = true;
} }
if(isset($_POST['update_deferr_403']) if (isset($_POST['update_deferr_403']) && trim($_POST['update_deferr_403']) != '') {
&& trim($_POST['update_deferr_403']) != '' Database::pexecute($stmt, array(
) { 'varname' => 'err403',
Database::pexecute($stmt, array('varname' => 'err403', 'err' => $_POST['update_deferr_403'])); 'err' => $_POST['update_deferr_403']
));
$err403 = true; $err403 = true;
} }
if(isset($_POST['update_deferr_404']) if (isset($_POST['update_deferr_404']) && trim($_POST['update_deferr_404']) != '') {
&& trim($_POST['update_deferr_404']) != '' Database::pexecute($stmt, array(
) { 'varname' => 'err404',
Database::pexecute($stmt, array('varname' => 'err404', 'err' => $_POST['update_deferr_404'])); 'err' => $_POST['update_deferr_404']
));
$err404 = true; $err404 = true;
} }
} }
@@ -627,7 +612,9 @@ if (isFroxlorVersion('0.9.6-svn5')) {
// add ftp server setting // add ftp server setting
$stmt = Database::prepare("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ftpserver', `value` = :value;"); $stmt = Database::prepare("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ftpserver', `value` = :value;");
Database::pexecute($stmt, array('value' => $update_defsys_ftpserver)); Database::pexecute($stmt, array(
'value' => $update_defsys_ftpserver
));
// add proftpd quota // add proftpd quota
Database::query("CREATE TABLE `ftp_quotalimits` (`name` varchar(30) default NULL, `quota_type` enum('user','group','class','all') NOT NULL default 'user', `per_session` enum('false','true') NOT NULL default 'false', `limit_type` enum('soft','hard') NOT NULL default 'hard', `bytes_in_avail` float NOT NULL, `bytes_out_avail` float NOT NULL, `bytes_xfer_avail` float NOT NULL, `files_in_avail` int(10) unsigned NOT NULL, `files_out_avail` int(10) unsigned NOT NULL, `files_xfer_avail` int(10) unsigned NOT NULL) ENGINE=MyISAM;"); Database::query("CREATE TABLE `ftp_quotalimits` (`name` varchar(30) default NULL, `quota_type` enum('user','group','class','all') NOT NULL default 'user', `per_session` enum('false','true') NOT NULL default 'false', `limit_type` enum('soft','hard') NOT NULL default 'hard', `bytes_in_avail` float NOT NULL, `bytes_out_avail` float NOT NULL, `bytes_xfer_avail` float NOT NULL, `files_in_avail` int(10) unsigned NOT NULL, `files_out_avail` int(10) unsigned NOT NULL, `files_xfer_avail` int(10) unsigned NOT NULL) ENGINE=MyISAM;");
@@ -640,8 +627,7 @@ if (isFroxlorVersion('0.9.6-svn5')) {
while ($row_ftp_users = $result_ftp_users_stmt->fetch(PDO::FETCH_ASSOC)) { while ($row_ftp_users = $result_ftp_users_stmt->fetch(PDO::FETCH_ASSOC)) {
$result_ftp_quota_stmt = Database::query(" $result_ftp_quota_stmt = Database::query("
SELECT diskspace_used FROM `" . TABLE_PANEL_CUSTOMERS . "` SELECT diskspace_used FROM `" . TABLE_PANEL_CUSTOMERS . "`
WHERE loginname = SUBSTRING_INDEX('" . $row_ftp_users['username'] . "', '" . Settings::Get('customer.ftpprefix') . "', 1);" WHERE loginname = SUBSTRING_INDEX('" . $row_ftp_users['username'] . "', '" . Settings::Get('customer.ftpprefix') . "', 1);");
);
$row_ftp_quota = $result_ftp_quota_stmt->fetch(PDO::FETCH_ASSOC); $row_ftp_quota = $result_ftp_quota_stmt->fetch(PDO::FETCH_ASSOC);
Database::query("INSERT INTO `ftp_quotatallies` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $row_ftp_users['username'] . "', 'user', '" . $row_ftp_quota['diskspace_used'] . "'*1024, '0', '0', '0', '0', '0');"); Database::query("INSERT INTO `ftp_quotatallies` (`name`, `quota_type`, `bytes_in_used`, `bytes_out_used`, `bytes_xfer_used`, `files_in_used`, `files_out_used`, `files_xfer_used`) VALUES ('" . $row_ftp_users['username'] . "', 'user', '" . $row_ftp_quota['diskspace_used'] . "'*1024, '0', '0', '0', '0', '0');");
} }
@@ -796,9 +782,10 @@ if (isFroxlorVersion('0.9.9')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'httpuser', `varname` = 'httpuser',
`value` = :user" `value` = :user");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array(':user' => $update_httpuser)); ':user' => $update_httpuser
));
lastStepStatus(0); lastStepStatus(0);
Settings::Set('system.httpuser', $update_httpuser); Settings::Set('system.httpuser', $update_httpuser);
} }
@@ -810,9 +797,10 @@ if (isFroxlorVersion('0.9.9')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'httpgroup', `varname` = 'httpgroup',
`value` = :grp" `value` = :grp");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array(':grp' => $update_httpgroup)); ':grp' => $update_httpgroup
));
lastStepStatus(0); lastStepStatus(0);
Settings::Set('system.httpgroup', $update_httpgroup); Settings::Set('system.httpgroup', $update_httpgroup);
} }
@@ -860,12 +848,11 @@ if (isFroxlorVersion('0.9.10-svn1')) {
`databasename` = :dbname, `databasename` = :dbname,
`description` = :dbdesc, `description` = :dbdesc,
`dbserver` = '0', `dbserver` = '0',
`apsdb` = '1'" `apsdb` = '1'");
);
Database::pexecute($result, array( Database::pexecute($result, array(
'cid' => $cid, 'cid' => $cid,
'dbname' => $row['Database'], 'dbname' => $row['Database'],
'dbdesc' => $databasedescription, 'dbdesc' => $databasedescription
)); ));
Database::query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1 WHERE `customerid`="' . (int) $cid . '"'); Database::query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used`=`mysqls_used`+1 WHERE `customerid`="' . (int) $cid . '"');
$count_dbupdates ++; $count_dbupdates ++;
@@ -904,9 +891,10 @@ if (isFroxlorVersion('0.9.10')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'panel', `settinggroup` = 'panel',
`varname` = 'password_regex', `varname` = 'password_regex',
`value` = :regex" `value` = :regex");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('regex' => $update_pwdregex)); 'regex' => $update_pwdregex
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.11-svn1'); updateToVersion('0.9.11-svn1');
@@ -933,9 +921,10 @@ if (isFroxlorVersion('0.9.11-svn2')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'perl_path', `varname` = 'perl_path',
`value` = :path" `value` = :path");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('path' => $update_perlpath)); 'path' => $update_perlpath
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.11-svn3'); updateToVersion('0.9.11-svn3');
@@ -966,11 +955,19 @@ if (isFroxlorVersion('0.9.11')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'mod_fcgid_ownvhost', 'value' => $update_fcgid_ownvhost)); 'varname' => 'mod_fcgid_ownvhost',
Database::pexecute($stmt, array('varname' => 'mod_fcgid_httpuser', 'value' => $update_fcgid_httpuser)); 'value' => $update_fcgid_ownvhost
Database::pexecute($stmt, array('varname' => 'mod_fcgid_httpgroup', 'value' => $update_fcgid_httpgroup)); ));
Database::pexecute($stmt, array(
'varname' => 'mod_fcgid_httpuser',
'value' => $update_fcgid_httpuser
));
Database::pexecute($stmt, array(
'varname' => 'mod_fcgid_httpgroup',
'value' => $update_fcgid_httpgroup
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.12-svn1'); updateToVersion('0.9.12-svn1');
@@ -992,10 +989,15 @@ if (isFroxlorVersion('0.9.12-svn1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'perl', `settinggroup` = 'perl',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'suexecworkaround', 'value' => $update_perl_suexecworkaround)); 'varname' => 'suexecworkaround',
Database::pexecute($stmt, array('varname' => 'suexecpath', 'value' => $update_perl_suexecpath)); 'value' => $update_perl_suexecworkaround
));
Database::pexecute($stmt, array(
'varname' => 'suexecpath',
'value' => $update_perl_suexecpath
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.12-svn2'); updateToVersion('0.9.12-svn2');
@@ -1023,9 +1025,10 @@ if (isFroxlorVersion('0.9.12-svn3')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'awstats_awstatspath', `varname` = 'awstats_awstatspath',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_awstats_awstatspath)); 'value' => $update_awstats_awstatspath
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.12-svn4'); updateToVersion('0.9.12-svn4');
@@ -1108,9 +1111,10 @@ if (isFroxlorVersion('0.9.13')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'mod_fcgid_defaultini_ownvhost', `varname` = 'mod_fcgid_defaultini_ownvhost',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_defaultini_ownvhost)); 'value' => $update_defaultini_ownvhost
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.13.1'); updateToVersion('0.9.13.1');
@@ -1146,9 +1150,10 @@ if (isFroxlorVersion('0.9.14-svn2')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'awstats_icons', `varname` = 'awstats_icons',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_awstats_icons)); 'value' => $update_awstats_icons
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.14-svn3'); updateToVersion('0.9.14-svn3');
@@ -1169,9 +1174,10 @@ if (isFroxlorVersion('0.9.14-svn3')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'ssl_cert_chainfile', `varname` = 'ssl_cert_chainfile',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_ssl_cert_chainfile)); 'value' => $update_ssl_cert_chainfile
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Adding new field to IPs and ports for SSLCertificateChainFile"); showUpdateStep("Adding new field to IPs and ports for SSLCertificateChainFile");
@@ -1202,9 +1208,10 @@ if (isFroxlorVersion('0.9.14-svn5')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'login', `settinggroup` = 'login',
`varname` = 'domain_login', `varname` = 'domain_login',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_allow_domain_login)); 'value' => $update_allow_domain_login
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.14-svn6'); updateToVersion('0.9.14-svn6');
@@ -1295,11 +1302,19 @@ if (isFroxlorVersion('0.9.14')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'nginx_php_backend', 'value' => '127.0.0.1:8888')); 'varname' => 'nginx_php_backend',
Database::pexecute($stmt, array('varname' => 'perl_server', 'value' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock')); 'value' => '127.0.0.1:8888'
Database::pexecute($stmt, array('varname' => 'phpreload_command', 'value' => '')); ));
Database::pexecute($stmt, array(
'varname' => 'perl_server',
'value' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock'
));
Database::pexecute($stmt, array(
'varname' => 'phpreload_command',
'value' => ''
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.15-svn1'); updateToVersion('0.9.15-svn1');
@@ -1346,19 +1361,51 @@ if (isFroxlorVersion('0.9.15')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'phpfpm', `settinggroup` = 'phpfpm',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'enabled', 'value' => $update_phpfpm_enabled)); 'varname' => 'enabled',
Database::pexecute($stmt, array('varname' => 'configdir', 'value' => $update_phpfpm_configdir)); 'value' => $update_phpfpm_enabled
Database::pexecute($stmt, array('varname' => 'reload', 'value' => $update_phpfpm_reload)); ));
Database::pexecute($stmt, array('varname' => 'pm', 'value' => $update_phpfpm_pm)); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'max_children', 'value' => $update_phpfpm_max_children)); 'varname' => 'configdir',
Database::pexecute($stmt, array('varname' => 'max_requests', 'value' => $update_phpfpm_max_requests)); 'value' => $update_phpfpm_configdir
Database::pexecute($stmt, array('varname' => 'start_servers', 'value' => $update_phpfpm_start_servers)); ));
Database::pexecute($stmt, array('varname' => 'min_spare_servers', 'value' => $update_phpfpm_min_spare_servers)); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'max_spare_servers', 'value' => $update_phpfpm_max_spare_servers)); 'varname' => 'reload',
Database::pexecute($stmt, array('varname' => 'tmpdir', 'value' => $update_phpfpm_tmpdir)); 'value' => $update_phpfpm_reload
Database::pexecute($stmt, array('varname' => 'peardir', 'value' => $update_phpfpm_peardir)); ));
Database::pexecute($stmt, array(
'varname' => 'pm',
'value' => $update_phpfpm_pm
));
Database::pexecute($stmt, array(
'varname' => 'max_children',
'value' => $update_phpfpm_max_children
));
Database::pexecute($stmt, array(
'varname' => 'max_requests',
'value' => $update_phpfpm_max_requests
));
Database::pexecute($stmt, array(
'varname' => 'start_servers',
'value' => $update_phpfpm_start_servers
));
Database::pexecute($stmt, array(
'varname' => 'min_spare_servers',
'value' => $update_phpfpm_min_spare_servers
));
Database::pexecute($stmt, array(
'varname' => 'max_spare_servers',
'value' => $update_phpfpm_max_spare_servers
));
Database::pexecute($stmt, array(
'varname' => 'tmpdir',
'value' => $update_phpfpm_tmpdir
));
Database::pexecute($stmt, array(
'varname' => 'peardir',
'value' => $update_phpfpm_peardir
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.16-svn1'); updateToVersion('0.9.16-svn1');
@@ -1383,11 +1430,19 @@ if (isFroxlorVersion('0.9.16-svn1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'phpfpm', `settinggroup` = 'phpfpm',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'enabled_ownvhost', 'value' => $update_phpfpm_enabled_ownvhost)); 'varname' => 'enabled_ownvhost',
Database::pexecute($stmt, array('varname' => 'vhost_httpuser', 'value' => $update_phpfpm_httpuser)); 'value' => $update_phpfpm_enabled_ownvhost
Database::pexecute($stmt, array('varname' => 'vhost_httpgroup', 'value' => $update_phpfpm_httpgroup)); ));
Database::pexecute($stmt, array(
'varname' => 'vhost_httpuser',
'value' => $update_phpfpm_httpuser
));
Database::pexecute($stmt, array(
'varname' => 'vhost_httpgroup',
'value' => $update_phpfpm_httpgroup
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.16-svn2'); updateToVersion('0.9.16-svn2');
@@ -1412,11 +1467,19 @@ if (isFroxlorVersion('0.9.16')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'report_enable', 'value' => $update_system_report_enable)); 'varname' => 'report_enable',
Database::pexecute($stmt, array('varname' => 'report_webmax', 'value' => $update_system_report_webmax)); 'value' => $update_system_report_enable
Database::pexecute($stmt, array('varname' => 'report_trafficmax', 'value' => $update_system_report_trafficmax)); ));
Database::pexecute($stmt, array(
'varname' => 'report_webmax',
'value' => $update_system_report_webmax
));
Database::pexecute($stmt, array(
'varname' => 'report_trafficmax',
'value' => $update_system_report_trafficmax
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Adding new cron-module for web- and traffic-reporting"); showUpdateStep("Adding new cron-module for web- and traffic-reporting");
@@ -1428,35 +1491,31 @@ if (isFroxlorVersion('0.9.16')) {
`interval` = '1 DAY', `interval` = '1 DAY',
`desc_lng_key` = 'cron_usage_report', `desc_lng_key` = 'cron_usage_report',
`lastrun` = :lastrun, `lastrun` = :lastrun,
`isactive` = :isactive" `isactive` = :isactive");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('lastrun' => $clastrun, 'isactive' => $update_system_report_enable)); 'lastrun' => $clastrun,
'isactive' => $update_system_report_enable
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Updating various database-fields"); showUpdateStep("Updating various database-fields");
Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'last_traffic_report_run';"); Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'last_traffic_report_run';");
$check_stmt = Database::query(" $check_stmt = Database::query("
SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `varname` = 'trafficninetypercent_subject';" SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `varname` = 'trafficninetypercent_subject';");
);
Database::pexecute($check_stmt); Database::pexecute($check_stmt);
$check = $check_stmt->fetch(PDO::FETCH_ASSOC); $check = $check_stmt->fetch(PDO::FETCH_ASSOC);
if (isset($check['varname']) if (isset($check['varname']) && $check['varname'] == 'trafficninetypercent_subject') {
&& $check['varname'] == 'trafficninetypercent_subject'
) {
Database::query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `varname` = 'trafficmaxpercent_subject' WHERE `varname` = 'trafficninetypercent_subject';"); Database::query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `varname` = 'trafficmaxpercent_subject' WHERE `varname` = 'trafficninetypercent_subject';");
} }
$check_stmt = Database::query(" $check_stmt = Database::query("
SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `varname` = 'trafficninetypercent_mailbody';" SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `varname` = 'trafficninetypercent_mailbody';");
);
Database::pexecute($check_stmt); Database::pexecute($check_stmt);
$check = $check_stmt->fetch(PDO::FETCH_ASSOC); $check = $check_stmt->fetch(PDO::FETCH_ASSOC);
if (isset($check['varname']) if (isset($check['varname']) && $check['varname'] == 'trafficninetypercent_mailbody') {
&& $check['varname'] == 'trafficninetypercent_mailbody'
) {
Database::query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `varname` = 'trafficmaxpercent_mailbody' WHERE `varname` = 'trafficninetypercent_mailbody';"); Database::query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `varname` = 'trafficmaxpercent_mailbody' WHERE `varname` = 'trafficninetypercent_mailbody';");
} }
lastStepStatus(0); lastStepStatus(0);
@@ -1509,9 +1568,10 @@ if (isFroxlorVersion('0.9.17')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'httpgroup', `varname` = 'httpgroup',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => Settings::Get('system.httpuser'))); 'value' => Settings::Get('system.httpuser')
));
lastStepStatus(0); lastStepStatus(0);
} }
@@ -1534,9 +1594,10 @@ if (isFroxlorVersion('0.9.18-svn1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'panel', `settinggroup` = 'panel',
`varname` = 'default_theme', `varname` = 'default_theme',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_default_theme)); 'value' => $update_default_theme
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Delete old setting for header-graphic"); showUpdateStep("Delete old setting for header-graphic");
@@ -1579,8 +1640,7 @@ if (isFroxlorVersion('0.9.19')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'validate_domain', `varname` = 'validate_domain',
`value` = '1'" `value` = '1'");
);
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.20-svn1'); updateToVersion('0.9.20-svn1');
@@ -1827,9 +1887,10 @@ if (isFroxlorVersion('0.9.26')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'backup_ftp_enabled', `varname` = 'backup_ftp_enabled',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $state)); 'value' => $state
));
} }
updateToVersion('0.9.27-svn1'); updateToVersion('0.9.27-svn1');
@@ -1981,9 +2042,7 @@ if (isFroxlorVersion('0.9.28-svn3')) {
showUpdateStep("Updating from 0.9.28-svn3 to 0.9.28-svn4", true); showUpdateStep("Updating from 0.9.28-svn3 to 0.9.28-svn4", true);
lastStepStatus(0); lastStepStatus(0);
if (isset($_POST['classic_theme_replacement']) if (isset($_POST['classic_theme_replacement']) && $_POST['classic_theme_replacement'] != '') {
&& $_POST['classic_theme_replacement'] != ''
) {
$classic_theme_replacement = $_POST['classic_theme_replacement']; $classic_theme_replacement = $_POST['classic_theme_replacement'];
} else { } else {
$classic_theme_replacement = 'Froxlor'; $classic_theme_replacement = 'Froxlor';
@@ -1995,34 +2054,38 @@ if (isFroxlorVersion('0.9.28-svn3')) {
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET UPDATE `" . TABLE_PANEL_SETTINGS . "` SET
`value` = :theme `value` = :theme
WHERE `varname` = 'default_theme';" WHERE `varname` = 'default_theme';");
); Database::pexecute($upd_stmt, array(
Database::pexecute($upd_stmt, array('theme' => $classic_theme_replacement)); 'theme' => $classic_theme_replacement
));
} }
// Updating admin's theme setting // Updating admin's theme setting
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_ADMINS . "` SET UPDATE `" . TABLE_PANEL_ADMINS . "` SET
`theme` = :theme `theme` = :theme
WHERE `theme` = 'Classic';" WHERE `theme` = 'Classic';");
); Database::pexecute($upd_stmt, array(
Database::pexecute($upd_stmt, array('theme' => $classic_theme_replacement)); 'theme' => $classic_theme_replacement
));
// Updating customer's theme setting // Updating customer's theme setting
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
`theme` = :theme `theme` = :theme
WHERE `theme` = 'Classic';" WHERE `theme` = 'Classic';");
); Database::pexecute($upd_stmt, array(
Database::pexecute($upd_stmt, array('theme' => $classic_theme_replacement)); 'theme' => $classic_theme_replacement
));
// Updating theme setting of active sessions // Updating theme setting of active sessions
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SESSIONS . "` SET UPDATE `" . TABLE_PANEL_SESSIONS . "` SET
`theme` = :theme `theme` = :theme
WHERE `theme` = 'Classic';" WHERE `theme` = 'Classic';");
); Database::pexecute($upd_stmt, array(
Database::pexecute($upd_stmt, array('theme' => $classic_theme_replacement)); 'theme' => $classic_theme_replacement
));
lastStepStatus(0); lastStepStatus(0);
@@ -2066,9 +2129,10 @@ if (isFroxlorVersion('0.9.28-svn5')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'apache24', `varname` = 'apache24',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_system_apache24)); 'value' => $update_system_apache24
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Inserting new tickets-see-all field to panel_admins", true); showUpdateStep("Inserting new tickets-see-all field to panel_admins", true);
@@ -2079,9 +2143,10 @@ if (isFroxlorVersion('0.9.28-svn5')) {
$stmt = Database::prepare(" $stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_ADMINS . "` SET UPDATE `" . TABLE_PANEL_ADMINS . "` SET
`tickets_see_all` = '1' `tickets_see_all` = '1'
WHERE `adminid` = :adminid" WHERE `adminid` = :adminid");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('adminid' => $userinfo['adminid'])); 'adminid' => $userinfo['adminid']
));
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Inserting new panel webfont-settings (default: off)", true); showUpdateStep("Inserting new panel webfont-settings (default: off)", true);
@@ -2098,9 +2163,10 @@ if (isFroxlorVersion('0.9.28-svn5')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'nginx', `settinggroup` = 'nginx',
`varname` = 'fastcgiparams', `varname` = 'fastcgiparams',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $fastcgiparams)); 'value' => $fastcgiparams
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.28-svn6'); updateToVersion('0.9.28-svn6');
@@ -2123,9 +2189,10 @@ if (isFroxlorVersion('0.9.28-rc1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'documentroot_use_default_value', `varname` = 'documentroot_use_default_value',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $update_system_documentroot_use_default_value)); 'value' => $update_system_documentroot_use_default_value
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.28-rc2'); updateToVersion('0.9.28-rc2');
@@ -2158,9 +2225,10 @@ if (isFroxlorVersion('0.9.28.1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'panel', `settinggroup` = 'panel',
`varname` = 'phpconfigs_hidestdsubdomain', `varname` = 'phpconfigs_hidestdsubdomain',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $hide_stdsubdomains)); 'value' => $hide_stdsubdomains
));
lastStepStatus(0); lastStepStatus(0);
// don't advertise security questions - just set a default silently // don't advertise security questions - just set a default silently
@@ -2173,9 +2241,10 @@ if (isFroxlorVersion('0.9.28.1')) {
$stmt = Database::prepare(" $stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET UPDATE `" . TABLE_PANEL_SETTINGS . "` SET
`value` = :value `value` = :value
WHERE `varname` = 'fastcgiparams'" WHERE `varname` = 'fastcgiparams'");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $fastcgiparams)); 'value' => $fastcgiparams
));
} }
updateToVersion('0.9.29-dev1'); updateToVersion('0.9.29-dev1');
} }
@@ -2192,10 +2261,15 @@ if (isFroxlorVersion('0.9.29-dev1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'panel', `settinggroup` = 'panel',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('varname' => 'allow_theme_change_admin', 'value' => $allow_themechange_a)); 'varname' => 'allow_theme_change_admin',
Database::pexecute($stmt, array('varname' => 'allow_theme_change_customer', 'value' => $allow_themechange_c)); 'value' => $allow_themechange_a
));
Database::pexecute($stmt, array(
'varname' => 'allow_theme_change_customer',
'value' => $allow_themechange_c
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.29-dev2'); updateToVersion('0.9.29-dev2');
@@ -2222,9 +2296,10 @@ if (isFroxlorVersion('0.9.29-dev2')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'axfrservers', `varname` = 'axfrservers',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $system_axfrservers)); 'value' => $system_axfrservers
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.29-dev3'); updateToVersion('0.9.29-dev3');
@@ -2256,9 +2331,10 @@ if (isFroxlorVersion('0.9.29-dev3')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'system', `settinggroup` = 'system',
`varname` = 'customer_ssl_path', `varname` = 'customer_ssl_path',
`value` = :value" `value` = :value");
); Database::pexecute($stmt, array(
Database::pexecute($stmt, array('value' => $system_customersslpath)); 'value' => $system_customersslpath
));
updateToVersion('0.9.29-dev4'); updateToVersion('0.9.29-dev4');
} }
@@ -2277,12 +2353,17 @@ if (isFroxlorVersion('0.9.29-dev4')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET
`settinggroup` = 'phpfpm', `settinggroup` = 'phpfpm',
`varname` = :varname, `varname` = :varname,
`value` = :value" `value` = :value");
);
$dval = (Settings::Get('system.mod_fcgid_defaultini') !== null ? Settings::Get('system.mod_fcgid_defaultini') : '1'); $dval = (Settings::Get('system.mod_fcgid_defaultini') !== null ? Settings::Get('system.mod_fcgid_defaultini') : '1');
Database::pexecute($stmt, array('varname' => 'defaultini', 'value' => $dval)); Database::pexecute($stmt, array(
'varname' => 'defaultini',
'value' => $dval
));
$dval = (Settings::Get('system.mod_fcgid_ownvhost') !== null ? Settings::Get('system.mod_fcgid_ownvhost') : '1'); $dval = (Settings::Get('system.mod_fcgid_ownvhost') !== null ? Settings::Get('system.mod_fcgid_ownvhost') : '1');
Database::pexecute($stmt, array('varname' => 'vhost_defaultini', 'value' => $dval)); Database::pexecute($stmt, array(
'varname' => 'vhost_defaultini',
'value' => $dval
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.29-rc1'); updateToVersion('0.9.29-rc1');
@@ -2323,18 +2404,13 @@ if (isFroxlorVersion('0.9.29')) {
Database::query("INSERT INTO `" . TABLE_DOMAINTOIP . "` SET Database::query("INSERT INTO `" . TABLE_DOMAINTOIP . "` SET
`id_domain` = " . (int) $row['id'] . ", `id_domain` = " . (int) $row['id'] . ",
`id_ipandports` = " . (int) $row['ssl_ipandport']); `id_ipandports` = " . (int) $row['ssl_ipandport']);
} } // Subdomains also have ssl ports if the parent has
// Subdomains also have ssl ports if the parent has elseif ((int) $row['ssl_ipandport'] == 0 && (int) $row['ssl_redirect'] != 0 && (int) $row['parentdomainid'] != 0) {
elseif ((int)$row['ssl_ipandport'] == 0
&& (int)$row['ssl_redirect'] != 0
&& (int)$row['parentdomainid'] != 0
) {
Database::query("INSERT INTO `" . TABLE_DOMAINTOIP . "` SET Database::query("INSERT INTO `" . TABLE_DOMAINTOIP . "` SET
`id_domain` = " . (int) $row['id'] . ", `id_domain` = " . (int) $row['id'] . ",
`id_ipandports` = ( `id_ipandports` = (
SELECT `ssl_ipandport` FROM `" . TABLE_PANEL_DOMAINS . "` SELECT `ssl_ipandport` FROM `" . TABLE_PANEL_DOMAINS . "`
WHERE `id` = '".(int)$row['parentdomainid']."');" WHERE `id` = '" . (int) $row['parentdomainid'] . "');");
);
} }
} }
lastStepStatus(0); lastStepStatus(0);
@@ -2536,7 +2612,9 @@ if (isFroxlorVersion('0.9.31-rc1')) {
$ins_stmt = Database::prepare(" $ins_stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET `settinggroup` = 'admin', `varname` = 'show_news_feed', `value` = :value INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET `settinggroup` = 'admin', `varname` = 'show_news_feed', `value` = :value
"); ");
Database::pexecute($ins_stmt, array('value' => $update_admin_news_feed)); Database::pexecute($ins_stmt, array(
'value' => $update_admin_news_feed
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.31-rc2'); updateToVersion('0.9.31-rc2');
@@ -2559,13 +2637,17 @@ if (isFroxlorVersion('0.9.31-rc2')) {
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value WHERE `settinggroup` = 'system' AND `varname` = 'mod_fcgid_defaultini_ownvhost' UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value WHERE `settinggroup` = 'system' AND `varname` = 'mod_fcgid_defaultini_ownvhost'
"); ");
Database::pexecute($upd_stmt, array('value' => $frxvhostconfid)); Database::pexecute($upd_stmt, array(
'value' => $frxvhostconfid
));
} }
if (Settings::Get('phpfpm.vhost_defaultini') == '1') { if (Settings::Get('phpfpm.vhost_defaultini') == '1') {
$upd_stmt = Database::prepare(" $upd_stmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value WHERE `settinggroup` = 'phpfpm' AND `varname` = 'vhost_defaultini' UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value WHERE `settinggroup` = 'phpfpm' AND `varname` = 'vhost_defaultini'
"); ");
Database::pexecute($upd_stmt, array('value' => $frxvhostconfid)); Database::pexecute($upd_stmt, array(
'value' => $frxvhostconfid
));
} }
lastStepStatus(0); lastStepStatus(0);
@@ -2653,11 +2735,26 @@ if (isFroxlorVersion('0.9.32-dev1')) {
INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET `settinggroup` = 'system', `varname` = :varname, `value` = :value INSERT INTO `" . TABLE_PANEL_SETTINGS . "` SET `settinggroup` = 'system', `varname` = :varname, `value` = :value
"); ");
Database::pexecute($ins_stmt, array('varname' => 'mailtraffic_enabled', 'value' => isset($_POST['mailtraffic_enabled']) ? (int)$_POST['mailtraffic_enabled'] : '1')); Database::pexecute($ins_stmt, array(
Database::pexecute($ins_stmt, array('varname' => 'mdalog', 'value' => isset($_POST['mdalog']) ? $_POST['mdalog'] : '/var/log/mail.log')); 'varname' => 'mailtraffic_enabled',
Database::pexecute($ins_stmt, array('varname' => 'mtalog', 'value' => isset($_POST['mtalog']) ? $_POST['mtalog'] : '/var/log/mail.log')); 'value' => isset($_POST['mailtraffic_enabled']) ? (int) $_POST['mailtraffic_enabled'] : '1'
Database::pexecute($ins_stmt, array('varname' => 'mdaserver', 'value' => isset($_POST['mdaserver']) ? $_POST['mdaserver'] : 'dovecot')); ));
Database::pexecute($ins_stmt, array('varname' => 'mtaserver', 'value' => isset($_POST['mtaserver']) ? $_POST['mtaserver'] : 'postfix')); Database::pexecute($ins_stmt, array(
'varname' => 'mdalog',
'value' => isset($_POST['mdalog']) ? $_POST['mdalog'] : '/var/log/mail.log'
));
Database::pexecute($ins_stmt, array(
'varname' => 'mtalog',
'value' => isset($_POST['mtalog']) ? $_POST['mtalog'] : '/var/log/mail.log'
));
Database::pexecute($ins_stmt, array(
'varname' => 'mdaserver',
'value' => isset($_POST['mdaserver']) ? $_POST['mdaserver'] : 'dovecot'
));
Database::pexecute($ins_stmt, array(
'varname' => 'mtaserver',
'value' => isset($_POST['mtaserver']) ? $_POST['mtaserver'] : 'postfix'
));
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.32-dev2'); updateToVersion('0.9.32-dev2');
@@ -2884,7 +2981,6 @@ if (isFroxlorVersion('0.9.33-rc2')) {
showUpdateStep("Updating from 0.9.33-rc2 to 0.9.33-rc3"); showUpdateStep("Updating from 0.9.33-rc2 to 0.9.33-rc3");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.33-rc3'); updateToVersion('0.9.33-rc3');
} }
if (isFroxlorVersion('0.9.33-rc3')) { if (isFroxlorVersion('0.9.33-rc3')) {
@@ -2892,7 +2988,6 @@ if (isFroxlorVersion('0.9.33-rc3')) {
showUpdateStep("Updating from 0.9.33-rc3 to 0.9.33 final"); showUpdateStep("Updating from 0.9.33-rc3 to 0.9.33 final");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.33'); updateToVersion('0.9.33');
} }
if (isFroxlorVersion('0.9.33')) { if (isFroxlorVersion('0.9.33')) {
@@ -2900,7 +2995,6 @@ if (isFroxlorVersion('0.9.33')) {
showUpdateStep("Updating from 0.9.33 to 0.9.33.1"); showUpdateStep("Updating from 0.9.33 to 0.9.33.1");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.33.1'); updateToVersion('0.9.33.1');
} }
if (isFroxlorVersion('0.9.33.1')) { if (isFroxlorVersion('0.9.33.1')) {
@@ -2908,7 +3002,6 @@ if (isFroxlorVersion('0.9.33.1')) {
showUpdateStep("Updating from 0.9.33.1 to 0.9.33.2"); showUpdateStep("Updating from 0.9.33.1 to 0.9.33.2");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.33.2'); updateToVersion('0.9.33.2');
} }
if (isFroxlorVersion('0.9.33.2')) { if (isFroxlorVersion('0.9.33.2')) {
@@ -2929,7 +3022,9 @@ if (isFroxlorVersion('0.9.33.2')) {
// get each row // get each row
while ($row = $chk_stmt->fetch()) { while ($row = $chk_stmt->fetch()) {
// let htmlentities run over the language name and update the entry // let htmlentities run over the language name and update the entry
Database::pexecute($upd_stmt, array('lang' => htmlentities($row['language'])), false); Database::pexecute($upd_stmt, array(
'lang' => htmlentities($row['language'])
), false);
} }
lastStepStatus(0); lastStepStatus(0);
} else { } else {
@@ -2938,11 +3033,26 @@ if (isFroxlorVersion('0.9.33.2')) {
showUpdateStep("Updating language descriptions to be in the native language"); showUpdateStep("Updating language descriptions to be in the native language");
$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_LANGUAGE . "` SET `language` = :lang WHERE `iso` = :iso"); $upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_LANGUAGE . "` SET `language` = :lang WHERE `iso` = :iso");
Database::pexecute($upd_stmt, array('lang' => 'Fran&ccedil;ais', 'iso' => 'fr'), false); Database::pexecute($upd_stmt, array(
Database::pexecute($upd_stmt, array('lang' => 'Portugu&ecirc;s', 'iso' => 'pt'), false); 'lang' => 'Fran&ccedil;ais',
Database::pexecute($upd_stmt, array('lang' => 'Italiano', 'iso' => 'it'), false); 'iso' => 'fr'
Database::pexecute($upd_stmt, array('lang' => 'Nederlands', 'iso' => 'nl'), false); ), false);
Database::pexecute($upd_stmt, array('lang' => 'Svenska', 'iso' => 'sv'), false); Database::pexecute($upd_stmt, array(
'lang' => 'Portugu&ecirc;s',
'iso' => 'pt'
), false);
Database::pexecute($upd_stmt, array(
'lang' => 'Italiano',
'iso' => 'it'
), false);
Database::pexecute($upd_stmt, array(
'lang' => 'Nederlands',
'iso' => 'nl'
), false);
Database::pexecute($upd_stmt, array(
'lang' => 'Svenska',
'iso' => 'sv'
), false);
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.34-dev1'); updateToVersion('0.9.34-dev1');
@@ -2964,7 +3074,6 @@ if (isFroxlorVersion('0.9.34-dev1')) {
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.34-dev2'); updateToVersion('0.9.34-dev2');
} }
if (isFroxlorVersion('0.9.34-dev2')) { if (isFroxlorVersion('0.9.34-dev2')) {
@@ -2985,7 +3094,6 @@ if (isFroxlorVersion('0.9.34-dev2')) {
} }
} }
if (isFroxlorVersion('0.9.34-dev3')) { if (isFroxlorVersion('0.9.34-dev3')) {
showUpdateStep("Updating from 0.9.34-dev3 to 0.9.34-dev4", false); showUpdateStep("Updating from 0.9.34-dev3 to 0.9.34-dev4", false);
@@ -3040,8 +3148,7 @@ if (isFroxlorVersion('0.9.34.2')) {
`interval` = '5 MINUTE', `interval` = '5 MINUTE',
`desc_lng_key` = 'cron_letsencrypt', `desc_lng_key` = 'cron_letsencrypt',
`lastrun` = UNIX_TIMESTAMP(), `lastrun` = UNIX_TIMESTAMP(),
`isactive` = 0" `isactive` = 0");
);
Database::pexecute($stmt); Database::pexecute($stmt);
lastStepStatus(0); lastStepStatus(0);
@@ -3084,7 +3191,6 @@ if (isFroxlorVersion('0.9.35-dev3')) {
updateToVersion('0.9.35-dev4'); updateToVersion('0.9.35-dev4');
} }
if (isFroxlorVersion('0.9.35-dev4')) { if (isFroxlorVersion('0.9.35-dev4')) {
showUpdateStep("Updating from 0.9.35-dev4 to 0.9.35-dev5", false); showUpdateStep("Updating from 0.9.35-dev4 to 0.9.35-dev5", false);
@@ -3160,7 +3266,6 @@ if (isFroxlorVersion('0.9.35-rc1') && isDatabaseVersion(null)) {
Settings::AddNew("system.leenabled", $enable_letsencrypt); Settings::AddNew("system.leenabled", $enable_letsencrypt);
Database::query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `isactive` = '" . $enable_letsencrypt . "' WHERE `cronfile` = 'letsencrypt'"); Database::query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `isactive` = '" . $enable_letsencrypt . "' WHERE `cronfile` = 'letsencrypt'");
lastStepStatus(0); lastStepStatus(0);
} }
if (isDatabaseVersion('201603070')) { if (isDatabaseVersion('201603070')) {
@@ -3171,3 +3276,11 @@ if (isDatabaseVersion('201603070')) {
updateToDbVersion('201603150'); updateToDbVersion('201603150');
} }
if (isFroxlorVersion('0.9.35-rc1')) {
showUpdateStep("Updating from 0.9.35-rc1 to 0.9.35 final");
lastStepStatus(0);
updateToVersion('0.9.35');
}

2
lib/version.inc.php
View File

@@ -16,7 +16,7 @@
*/ */
// Main version variable // Main version variable
$version = '0.9.35-rc1'; $version = '0.9.35';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
$dbversion = '201603150'; $dbversion = '201603150';