diff --git a/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php b/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php deleted file mode 100644 index 75d38a04..00000000 --- a/install/updates/syscp/1.0/update_1.0.10_1.2-beta1.inc.php +++ /dev/null @@ -1,82 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Install - * - */ - -/** - * We need those defines, because the tables.inc.php doesn't have them. - */ - -define('TABLE_POSTFIX_TRANSPORT', 'postfix_transport'); -define('TABLE_POSTFIX_USERS', 'postfix_users'); -define('TABLE_POSTFIX_VIRTUAL', 'postfix_virtual'); -define('TABLE_PROFTPD_GROUPS', 'proftpd_groups'); -define('TABLE_PROFTPD_USERS', 'proftpd_users'); - -if($settings['panel']['version'] == '1.0.10') -{ - // Drop/Rename postfix_ tables - - $db->query("DROP TABLE IF EXISTS `" . TABLE_POSTFIX_TRANSPORT . "`"); - $db->query("ALTER TABLE `" . TABLE_POSTFIX_USERS . "` RENAME `" . TABLE_MAIL_USERS . "` "); - $db->query("ALTER TABLE `" . TABLE_POSTFIX_VIRTUAL . "` RENAME `" . TABLE_MAIL_VIRTUAL . "` "); - - // Rename proftpd_ tables - - $db->query("ALTER TABLE `" . TABLE_PROFTPD_USERS . "` RENAME `" . TABLE_FTP_USERS . "` "); - $db->query("ALTER TABLE `" . TABLE_PROFTPD_GROUPS . "` RENAME `" . TABLE_FTP_GROUPS . "` "); - - // Adding tables - - $db->query("DROP TABLE IF EXISTS `" . TABLE_PANEL_HTACCESS . "`;"); - $db->query("CREATE TABLE `" . TABLE_PANEL_HTACCESS . "` (" . " `id` int(11) unsigned NOT NULL auto_increment," . " `customerid` int(11) unsigned NOT NULL default '0'," . " `path` varchar(255) NOT NULL default ''," . " `options_indexes` tinyint(1) NOT NULL default '0'," . " PRIMARY KEY (`id`)" . ") ENGINE=MyISAM ;"); - $db->query("DROP TABLE IF EXISTS `" . TABLE_PANEL_ADMINS . "`;"); - $db->query("CREATE TABLE `" . TABLE_PANEL_ADMINS . "` (" . " `adminid` int(11) unsigned NOT NULL auto_increment," . " `loginname` varchar(50) NOT NULL default ''," . " `password` varchar(50) NOT NULL default ''," . " `name` varchar(255) NOT NULL default ''," . " `email` varchar(255) NOT NULL default ''," . " `customers` int(15) NOT NULL default '0'," . " `customers_used` int(15) NOT NULL default '0'," . " `customers_see_all` tinyint(1) NOT NULL default '0'," . " `domains` int(15) NOT NULL default '0'," . " `domains_used` int(15) NOT NULL default '0'," . " `domains_see_all` tinyint(1) NOT NULL default '0'," . " `change_serversettings` tinyint(1) NOT NULL default '0'," . " `diskspace` int(15) NOT NULL default '0'," . " `diskspace_used` int(15) NOT NULL default '0'," . " `mysqls` int(15) NOT NULL default '0'," . " `mysqls_used` int(15) NOT NULL default '0'," . " `emails` int(15) NOT NULL default '0'," . " `emails_used` int(15) NOT NULL default '0'," . " `email_forwarders` int(15) NOT NULL default '0'," . " `email_forwarders_used` int(15) NOT NULL default '0'," . " `ftps` int(15) NOT NULL default '0'," . " `ftps_used` int(15) NOT NULL default '0'," . " `subdomains` int(15) NOT NULL default '0'," . " `subdomains_used` int(15) NOT NULL default '0'," . " `traffic` int(15) NOT NULL default '0'," . " `traffic_used` int(15) NOT NULL default '0'," . " `deactivated` tinyint(1) NOT NULL default '0'," . " `lastlogin_succ` int(11) unsigned NOT NULL default '0'," . " `lastlogin_fail` int(11) unsigned NOT NULL default '0'," . " `loginfail_count` int(11) unsigned NOT NULL default '0'," . " PRIMARY KEY (`adminid`)" . ") ENGINE=MyISAM ;"); - - // Insert Admin user - - if(!isset($adminusername) - || $adminusername == '') - { - $adminusername = 'admin'; - $adminpassword = 'admin'; - } - - $db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` (`loginname`, `password`, `name`, `email`, `customers`, `customers_used`, `customers_see_all`, `domains`, `domains_used`, `domains_see_all`, `change_serversettings`, `diskspace`, `diskspace_used`, `mysqls`, `mysqls_used`, `emails`, `emails_used`, `email_forwarders`, `email_forwarders_used`, `ftps`, `ftps_used`, `subdomains`, `subdomains_used`, `traffic`, `traffic_used`, `deactivated`) VALUES ('" . $db->escape($adminusername) . "', '" . md5($adminpassword) . "', 'Siteadmin', 'admin@servername', -1, 0, 1, -1, 0, 1, 1, -1024, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1, 0, -1048576, 0, 0);"); - - // Alter Tables - - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `adminid` INT( 11 ) UNSIGNED NOT NULL ," . "ADD `lastlogin_succ` INT( 11 ) UNSIGNED NOT NULL ," . "ADD `lastlogin_fail` INT( 11 ) UNSIGNED NOT NULL ," . "ADD `loginfail_count` INT( 11 ) UNSIGNED NOT NULL ;"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD INDEX ( `adminid` ) ;"); - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `adminid` = '1'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `adminid` INT( 11 ) UNSIGNED NOT NULL ," . "ADD `iswildcarddomain` TINYINT( 1 ) NOT NULL ," . "ADD `speciallogfile` TINYINT( 1 ) NOT NULL ;"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD INDEX ( `adminid` ) ;"); - $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `adminid` = '1'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_SESSIONS . "` CHANGE `customerid` `userid` INT( 11 ) UNSIGNED DEFAULT '0' NOT NULL "); - $db->query("ALTER TABLE `" . TABLE_MAIL_USERS . "` CHANGE `password` `password_enc` VARCHAR( 128 ) NOT NULL "); - $db->query("ALTER TABLE `" . TABLE_MAIL_USERS . "` ADD `password` VARCHAR( 128 ) NOT NULL AFTER `email` ;"); - $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');"); - $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');"); - $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (26, 'panel', 'webmail_url', '');"); - $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (27, 'panel', 'webftp_url', '');"); - $db->query("INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (28, 'panel', 'standardlanguage', 'german');"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname`='ipaddress' WHERE `settinggroup`='system' AND `varname`='ipadress'"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.0' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.0'; -} - -?> diff --git a/install/updates/syscp/1.0/update_1.0_1.0.10.inc.php b/install/updates/syscp/1.0/update_1.0_1.0.10.inc.php deleted file mode 100644 index 57659cb2..00000000 --- a/install/updates/syscp/1.0/update_1.0_1.0.10.inc.php +++ /dev/null @@ -1,132 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Install - * - */ - -define('TABLE_POSTFIX_TRANSPORT', 'postfix_transport'); -define('TABLE_POSTFIX_USERS', 'postfix_users'); -define('TABLE_POSTFIX_VIRTUAL', 'postfix_virtual'); -define('TABLE_PROFTPD_GROUPS', 'proftpd_groups'); -define('TABLE_PROFTPD_USERS', 'proftpd_users'); - -if(!isset($settings['panel']['version'])) -{ - $settings['panel']['version'] = '1.0.0'; -} - -if($settings['panel']['version'] == '1.0.0') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.0.1')"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `openbasedir` TINYINT( 1 ) NOT NULL , ADD `safemode` TINYINT( 1 ) NOT NULL"); - $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `openbasedir`='1', `safemode`='1'"); - $settings['panel']['version'] = '1.0.1'; -} - -if($settings['panel']['version'] == '1.0.1') -{ - $db->query("ALTER TABLE `" . TABLE_POSTFIX_USERS . "` ADD `domainid` INT( 11 ) NOT NULL AFTER `postfix`"); - $db->query("ALTER TABLE `" . TABLE_POSTFIX_VIRTUAL . "` ADD `domainid` INT( 11 ) NOT NULL AFTER `destination`"); - $result = $db->query("SELECT `id`, `domain` FROM `" . TABLE_PANEL_DOMAINS . "`"); - - while($row = $db->fetch_array($result)) - { - $db->query("UPDATE `" . TABLE_POSTFIX_USERS . "` SET `domainid`='" . (int)$row['id'] . "' WHERE `email` LIKE '%@" . $db->escape($row['domain']) . "'"); - $db->query("UPDATE `" . TABLE_POSTFIX_VIRTUAL . "` SET `domainid`='" . (int)$row['id'] . "' WHERE `email` LIKE '%@" . $db->escape($row['domain']) . "'"); - } - - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `createstdsubdomain` TINYINT( 1 ) NOT NULL AFTER `documentroot`"); - inserttask('1'); - inserttask('4'); - $hostname = explode('@', $settings['panel']['adminmail']); - $hostname = $hostname[1]; - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', '" . $db->escape($hostname) . "')"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.2'; -} - -if($settings['panel']['version'] == '1.0.2') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_SESSIONS . "` ADD `language` VARCHAR( 64 ) NOT NULL AFTER `lastactivity` ;"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.3'; -} - -if($settings['panel']['version'] == '1.0.3') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.4'; -} - -if($settings['panel']['version'] == '1.0.4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.5' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.5'; -} - -if($settings['panel']['version'] == '1.0.5') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `deactivated` TINYINT( 1 ) NOT NULL ;"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `deactivated` TINYINT( 1 ) NOT NULL ;"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.6' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.6'; -} - -if($settings['panel']['version'] == '1.0.6') -{ - $db->query("ALTER TABLE `" . TABLE_POSTFIX_VIRTUAL . "` ADD `popaccountid` INT( 11 ) NOT NULL ;"); - $result = $db->query("SELECT `id`, `email` FROM `" . TABLE_POSTFIX_USERS . "`"); - - while($row = $db->fetch_array($result)) - { - $db->query("UPDATE `" . TABLE_POSTFIX_VIRTUAL . "` SET `popaccountid`='" . (int)$row['id'] . "' WHERE `email` = '" . $db->escape(str_replace($settings['email']['catchallkeyword'], '', $row['email'])) . "' AND `destination` = '" . $db->escape($row['email']) . "'"); - } - - $result = $db->query("SELECT `id`, `email`, `destination` FROM `" . TABLE_POSTFIX_VIRTUAL . "` WHERE `popaccountid` = '0'"); - - while($row = $db->fetch_array($result)) - { - if(str_replace($settings['email']['catchallkeyword'], '', $row['email']) != $row['email']) - { - $db->query("UPDATE `" . TABLE_POSTFIX_VIRTUAL . "` SET `email` = '" . $db->escape(str_replace($settings['email']['catchallkeyword'], '', $row['email'])) . "' WHERE `id` = '" . (int)$row['id'] . "'"); - } - } - - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.7' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.7'; -} - -if($settings['panel']['version'] == '1.0.7') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.8' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.8'; -} - -if($settings['panel']['version'] == '1.0.8') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_DATABASES . "` DROP `password` ;"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `specialsettings` TEXT NOT NULL AFTER `safemode` ;"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.9' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.9'; -} - -if($settings['panel']['version'] == '1.0.9') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.0.10' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.0.10'; -} - -?> \ No newline at end of file diff --git a/install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php b/install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php deleted file mode 100644 index 6416970a..00000000 --- a/install/updates/syscp/1.2/update_1.2-beta1_1.2.19.inc.php +++ /dev/null @@ -1,1189 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Install - * - */ - -if($settings['panel']['version'] == '1.2-beta1' - || $settings['panel']['version'] == '1.2-rc1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.0' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.0'; -} - -if($settings['panel']['version'] == '1.2.0') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.1'; -} - -if($settings['panel']['version'] == '1.2.1') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_SESSIONS . "` CHANGE `useragent` `useragent` VARCHAR( 255 ) NOT NULL"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.2'; -} - -if($settings['panel']['version'] == '1.2.2') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.2-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.2-cvs1'; -} - -if($settings['panel']['version'] == '1.2.2-cvs1') -{ - $db->query(" - CREATE TABLE `" . TABLE_PANEL_LANGUAGE . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `language` varchar(30) NOT NULL default '', - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) - ) ENGINE=MyISAM - "); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (1, 'Deutsch', 'lng/german.lng.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (2, 'English', 'lng/english.lng.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (3, 'Francais', 'lng/french.lng.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`id`, `language`, `file`) VALUES (4, 'Chinese', 'lng/zh-cn.lng.php');"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.2-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.2-cvs2'; -} - -if($settings['panel']['version'] == '1.2.2-cvs2') -{ - if($settings['panel']['standardlanguage'] == 'german') - { - $standardlanguage_new = 'Deutsch'; - } - elseif($settings['panel']['standardlanguage'] == 'french') - { - $standardlanguage_new = 'Francais'; - } - else - { - $standardlanguage_new = 'English'; - } - - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($standardlanguage_new) . "' WHERE `settinggroup`='panel' AND `varname`='standardlanguage'"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.2-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.2-cvs3'; -} - -if($settings['panel']['version'] == '1.2.2-cvs3') -{ - $db->query(" - CREATE TABLE `" . TABLE_PANEL_CRONSCRIPT . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `file` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`) - ) ENGINE=MyISAM - "); - $db->query("INSERT INTO `" . TABLE_PANEL_CRONSCRIPT . "` (`id`, `file`) VALUES (1, 'cron_traffic.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_CRONSCRIPT . "` (`id`, `file`) VALUES (2, 'cron_tasks.php');"); - $settings['panel']['version'] = '1.2.2-cvs4'; - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.2-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); -} - -if($settings['panel']['version'] == '1.2.2-cvs4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3'; -} - -if($settings['panel']['version'] == '1.2.3') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3-cvs1'; -} - -if($settings['panel']['version'] == '1.2.3-cvs1') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_DATABASES . '` ADD `description` VARCHAR( 255 ) NOT NULL'); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3-cvs2'; -} - -if($settings['panel']['version'] == '1.2.3-cvs2') -{ - $db->query("ALTER TABLE `" . TABLE_MAIL_USERS . "` ADD `username` VARCHAR( 128 ) NOT NULL"); - $db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `username`=`email`"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3-cvs3'; -} - -if($settings['panel']['version'] == '1.2.3-cvs3') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3-cvs4'; -} - -if($settings['panel']['version'] == '1.2.3-cvs4') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_TRAFFIC . "` ADD UNIQUE `date` ( `customerid` , `year` , `month` , `day` )"); - $db->query(" - CREATE TABLE `" . TABLE_PANEL_TRAFFIC_ADMINS . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `adminid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `http` bigint(30) unsigned NOT NULL default '0', - `ftp_up` bigint(30) unsigned NOT NULL default '0', - `ftp_down` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `adminid` (`adminid`), - UNIQUE `date` (`adminid` , `year` , `month` , `day`) - ) ENGINE=MyISAM - "); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.3-cvs5' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.3-cvs5'; -} - -if($settings['panel']['version'] == '1.2.3-cvs5') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.4'; -} - -if($settings['panel']['version'] == '1.2.4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.4-2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.4-2'; -} - -if($settings['panel']['version'] == '1.2.4-2') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_HTACCESS . '` ADD `error404path` VARCHAR( 255 ) NOT NULL , - ADD `error403path` VARCHAR( 255 ) NOT NULL , - ADD `error500path` VARCHAR( 255 ) NOT NULL , - ADD `error401path` VARCHAR( 255 ) NOT NULL - '); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.4-2cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.4-2cvs1'; -} - -if($settings['panel']['version'] == '1.2.4-2cvs1') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_CUSTOMERS . '` - ADD `email_accounts` INT( 15 ) NOT NULL AFTER `emails_used` , - ADD `email_accounts_used` INT( 15 ) NOT NULL AFTER `email_accounts` - '); - $db->query('ALTER TABLE `' . TABLE_PANEL_ADMINS . '` - ADD `email_accounts` INT( 15 ) NOT NULL AFTER `emails_used` , - ADD `email_accounts_used` INT( 15 ) NOT NULL AFTER `email_accounts` - '); - $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `email_accounts` = `emails` '); - $db->query('UPDATE `' . TABLE_PANEL_ADMINS . '` SET `email_accounts` = `emails` '); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.4-2cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.4-2cvs2'; -} - -if($settings['panel']['version'] == '1.2.4-2cvs2') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.5' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.5'; -} - -if($settings['panel']['version'] == '1.2.5') -{ - $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`=ENCRYPT(`password`)"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.5-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.5-cvs1'; -} - -if($settings['panel']['version'] == '1.2.5-cvs1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.5-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.5-cvs2'; -} - -if($settings['panel']['version'] == '1.2.5-cvs2') -{ - $db->query('ALTER TABLE `' . TABLE_MAIL_VIRTUAL . '` - ADD `email_full` VARCHAR( 50 ) NOT NULL AFTER `email` , - ADD `iscatchall` TINYINT( 1 ) UNSIGNED NOT NULL AFTER `popaccountid` - '); - $db->query('UPDATE `' . TABLE_MAIL_VIRTUAL . '` SET `email_full` = `email`'); - $email_virtual_result = $db->query('SELECT `id`, `email` FROM `' . TABLE_MAIL_VIRTUAL . '`'); - - while($email_virtual_row = $db->fetch_array($email_virtual_result)) - { - if($email_virtual_row['email'] - { - 0 - } == '@') - { - $email_full = $settings['email']['catchallkeyword'] . $email_virtual_row['email']; - $db->query('UPDATE `' . TABLE_MAIL_VIRTUAL . '` SET `email_full` = "' . $db->escape($email_full) . '", `iscatchall` = "1" WHERE `id` = "' . (int)$email_virtual_row['id'] . '"'); - } - } - - $db->query(' DELETE FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = "email" AND `varname` = "catchallkeyword" '); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.5-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.5-cvs3'; -} - -if($settings['panel']['version'] == '1.2.5-cvs3') -{ - $db->query('UPDATE `' . TABLE_PANEL_HTACCESS . '` SET `error404path` = "", `error403path` = "", `error401path` = "", `error500path` = "" '); - inserttask('1'); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.5-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.5-cvs4'; -} - -if($settings['panel']['version'] == '1.2.5-cvs4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.6'; -} - -if($settings['panel']['version'] == '1.2.6') -{ - $result = $db->query_first('SELECT `value` FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = \'panel\' AND `varname` = \'standardlanguage\''); - $def_language = $result['value']; - $db->query('ALTER TABLE `' . TABLE_PANEL_ADMINS . '` ADD `def_language` VARCHAR( 255 ) NOT NULL AFTER `email`'); - $db->query('UPDATE `' . TABLE_PANEL_ADMINS . '` SET `def_language` = \'' . $db->escape($def_language) . '\''); - $db->query('ALTER TABLE `' . TABLE_PANEL_CUSTOMERS . '` ADD `def_language` VARCHAR( 255 ) NOT NULL AFTER `customernumber`'); - $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `def_language` = \'' . $db->escape($def_language) . '\''); - $db->query('CREATE TABLE `' . TABLE_PANEL_TEMPLATES . '` ( - `id` int(11) NOT NULL auto_increment, - `adminid` int(11) NOT NULL default \'0\', - `language` varchar(255) NOT NULL default \'\', - `templategroup` varchar(255) NOT NULL default \'\', - `varname` varchar(255) NOT NULL default \'\', - `value` longtext NOT NULL, - PRIMARY KEY (`id`), - KEY `adminid` (`adminid`) - ) ENGINE=MyISAM - '); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.6-cvs1'; -} - -if($settings['panel']['version'] == '1.2.6-cvs1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.6-cvs2'; -} - -if($settings['panel']['version'] == '1.2.6-cvs2') -{ - if($sql['host'] == 'localhost') - { - $mysql_access_host = 'localhost'; - } - else - { - $mysql_access_host = $serverip; - } - - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`,`varname`,`value`) VALUES ('system','mysql_access_host','" . $db->escape($mysql_access_host) . "')"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.6-cvs3'; -} - -if($settings['panel']['version'] == '1.2.6-cvs3') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `surname` `firstname` VARCHAR( 255 ) NOT NULL "); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.6-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.6-cvs4'; -} - -if($settings['panel']['version'] == '1.2.6-cvs4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.7' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.7'; -} - -if($settings['panel']['version'] == '1.2.7') -{ - inserttask('1'); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.7-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.7-cvs1'; -} - -if($settings['panel']['version'] == '1.2.7-cvs1') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `createstdsubdomain` `standardsubdomain` INT( 11 ) NOT NULL "); - $result = $db->query('SELECT * FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `standardsubdomain`=\'1\''); - - while($row = $db->fetch_array($result)) - { - $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` " . "(`domain`, `customerid`, `adminid`, `documentroot`, `zonefile`, `isemaildomain`, `openbasedir`, `safemode`, `speciallogfile`, `specialsettings`) " . "VALUES ('" . $db->escape($row['loginname']) . '.' . $db->escape($settings['system']['hostname']) . "', '" . (int)$row['customerid'] . "', '" . (int)$row['adminid'] . "', '" . $db->escape($row['documentroot']) . "', '', '0', '1', '1', '0', '')"); - $domainid = $db->insert_id(); - $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `standardsubdomain`=\'' . (int)$domainid . '\' WHERE `customerid`=\'' . (int)$row['customerid'] . '\''); - } - - inserttask('1'); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.7-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.7-cvs2'; -} - -if($settings['panel']['version'] == '1.2.7-cvs2') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `isbinddomain` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `documentroot`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `subcanemaildomain` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `iswildcarddomain`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `caneditdomain` TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER `subcanemaildomain`"); - $db->query('UPDATE `' . TABLE_PANEL_DOMAINS . '` SET `isbinddomain`=\'1\' WHERE `isemaildomain`=\'1\''); - $standardsubdomainids = Array(); - $result = $db->query('SELECT * FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `standardsubdomain`<>\'0\''); - - while($row = $db->fetch_array($result)) - { - $standardsubdomainids[] = "'" . (int)$row['standardsubdomain'] . "'"; - } - - $standardsubdomainids = implode(',', $standardsubdomainids); - - if($standardsubdomainids != '') - { - $db->query('UPDATE `' . TABLE_PANEL_DOMAINS . '` SET `caneditdomain`=\'0\' WHERE `id` IN(' . $standardsubdomainids . ')'); - } - - inserttask('1'); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.7-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.7-cvs3'; -} - -if($settings['panel']['version'] == '1.2.7-cvs3') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Catalan', 'lng/catalan.lng.php');"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.7-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.7-cvs4'; -} - -if($settings['panel']['version'] == '1.2.7-cvs4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.8' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.8'; -} - -if($settings['panel']['version'] == '1.2.8' - || $settings['panel']['version'] == '1.2.8-cvs1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.9' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.9'; -} - -if($settings['panel']['version'] == '1.2.9') -{ - $db->query("UPDATE `" . TABLE_PANEL_LANGUAGE . "` SET `language`='Français' WHERE `language`='Francais'"); - $db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `language`='Français' WHERE `language`='Francais'"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Español', 'lng/spanish.lng.php');"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.9-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.9-cvs1'; -} - -if($settings['panel']['version'] == '1.2.9-cvs1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.10' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.10'; -} - -if($settings['panel']['version'] == '1.2.10') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Português', 'lng/portugues.lng.php');"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.10-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.10-cvs1'; -} - -if($settings['panel']['version'] == '1.2.10-cvs1') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.11' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.11'; -} - -if($settings['panel']['version'] == '1.2.11') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `aliasdomain` INT( 11 ) UNSIGNED NULL AFTER `customerid`"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.11-cvs1' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.11-cvs1'; -} - -if($settings['panel']['version'] == '1.2.11-cvs1') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settingid` = \'\' , `settinggroup` = \'panel\', `varname` = \'pathedit\', `value` = \'Manual\''); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.11-cvs2' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.11-cvs2'; -} - -if($settings['panel']['version'] == '1.2.11-cvs2') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.11-cvs3' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.11-cvs3'; -} - -if($settings['panel']['version'] == '1.2.11-cvs3') -{ - $db->query('ALTER TABLE `' . TABLE_MAIL_USERS . '` CHANGE `email` `email` VARCHAR( 255 ) NOT NULL , CHANGE `username` `username` VARCHAR( 255 ) NOT NULL , CHANGE `homedir` `homedir` VARCHAR( 255 ) NOT NULL , CHANGE `maildir` `maildir` VARCHAR( 255 ) NOT NULL '); - $db->query('ALTER TABLE `' . TABLE_MAIL_VIRTUAL . '` CHANGE `email` `email` VARCHAR( 255 ) NOT NULL , CHANGE `email_full` `email_full` VARCHAR( 255 ) NOT NULL '); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.11-cvs4' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.11-cvs4'; -} - -if($settings['panel']['version'] == '1.2.11-cvs4') -{ - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='1.2.12' WHERE `settinggroup`='panel' AND `varname`='version'"); - $settings['panel']['version'] = '1.2.12'; -} - -if($settings['panel']['version'] == '1.2.12') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'apacheconf_filename\', `value` = \'vhosts.conf\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'lastcronrun\', `value` = \'\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'panel\', `varname` = \'paging\', `value` = \'20\' '); - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.12-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''); - $settings['panel']['version'] = '1.2.12-svn1'; -} - -if($settings['panel']['version'] == '1.2.12-svn1') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_DOMAINS . '` ADD `ipandport` int(11) unsigned NOT NULL default \'1\' AFTER `documentroot`'); - $db->query('CREATE TABLE `' . TABLE_PANEL_IPSANDPORTS . '` ( - `id` int(11) unsigned NOT NULL auto_increment, - `ip` varchar(15) NOT NULL default \'\', - `port` int(5) NOT NULL default \'80\', - `default` int(1) NOT NULL default \'0\', - PRIMARY KEY (`id`) - ) ENGINE=MyISAM'); - $db->query('INSERT INTO `' . TABLE_PANEL_IPSANDPORTS . '` (`ip`, `port`, `default`) VALUES (\'' . $settings['system']['ipaddress'] . '\', \'80\', \'1\')'); - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.12-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''); - $settings['panel']['version'] = '1.2.12-svn2'; -} - -if($settings['panel']['version'] == '1.2.12-svn2') -{ - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.13-rc1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''); - $settings['panel']['version'] = '1.2.13-rc1'; -} - -if($settings['panel']['version'] == '1.2.13-rc1') -{ - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.13-rc2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''); - $settings['panel']['version'] = '1.2.13-rc2'; -} - -if($settings['panel']['version'] == '1.2.13-rc2') -{ - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `value` = \'1.2.13-rc3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''); - $settings['panel']['version'] = '1.2.13-rc3'; -} - -if($settings['panel']['version'] == '1.2.13-rc3') -{ - // update lastcronrun to current date - - $query = 'UPDATE `%s` SET `value` = UNIX_TIMESTAMP() WHERE `settinggroup` = \'system\' AND `varname` = \'lastcronrun\' '; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-rc4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-rc4'; -} - -if($settings['panel']['version'] == '1.2.13-rc4') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13'; -} - -if($settings['panel']['version'] == '1.2.13') -{ - //get highest accountnumber - - $query = 'SELECT `loginname` FROM `' . TABLE_PANEL_CUSTOMERS . '` WHERE `loginname` LIKE \'' . $db->escape($settings['customer']['accountprefix']) . '%\';'; - $result = $db->query($query); - $lastaccountnumber = 0; - - while($row = $db->fetch_array($result)) - { - $tmpnumber = intval(substr($row['loginname'], strlen($settings['customer']['accountprefix']))); - - if($tmpnumber > $lastaccountnumber) - { - $lastaccountnumber = $tmpnumber; - } - } - - //update the lastaccountnumber to refer to the highest account availible + 1 - - $query = 'UPDATE `%s` SET `value` = \'' . (int)$lastaccountnumber . '\' WHERE `settinggroup` = \'system\' AND `varname` = \'lastaccountnumber\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['system']['lastaccountnumber'] = $lastaccountnumber; - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-svn1'; -} - -if($settings['panel']['version'] == '1.2.13-svn1') -{ - $query = 'ALTER TABLE `%s` ADD `openbasedir_path` TINYINT( 1 ) UNSIGNED NOT NULL AFTER `openbasedir` '; - $query = sprintf($query, TABLE_PANEL_DOMAINS); - $db->query($query); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-svn2'; -} - -if($settings['panel']['version'] == '1.2.13-svn2') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-svn3'; -} - -if($settings['panel']['version'] == '1.2.13-svn3') -{ - $result = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_IPSANDPORTS . '` WHERE `default` = \'1\' '); - $defaultip = $result['id']; - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'defaultip\', `value` = \'' . (int)$defaultip . '\' '); - $db->query('ALTER TABLE `' . TABLE_PANEL_IPSANDPORTS . '` DROP `default` '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-svn4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-svn4'; -} - -if($settings['panel']['version'] == '1.2.13-svn4') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_SESSIONS . '` ADD `lastpaging` VARCHAR( 255 ) NOT NULL AFTER `lastactivity` '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.13-svn5\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.13-svn5'; -} - -if($settings['panel']['version'] == '1.2.13-svn5') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc1'; -} - -if($settings['panel']['version'] == '1.2.14-rc1') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Russian', 'lng/russian.lng.php');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc1-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc1-svn1'; -} - -if($settings['panel']['version'] == '1.2.14-rc1-svn1') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc2'; -} - -if($settings['panel']['version'] == '1.2.14-rc2') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc3'; -} - -if($settings['panel']['version'] == '1.2.14-rc3') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Danish', 'lng/danish.lng.php');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc3-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc3-svn1'; -} - -if($settings['panel']['version'] == '1.2.14-rc3-svn1') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` CHANGE `diskspace` `diskspace` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` CHANGE `diskspace_used` `diskspace_used` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` CHANGE `traffic` `traffic` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` CHANGE `traffic_used` `traffic_used` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `diskspace` `diskspace` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `diskspace_used` `diskspace_used` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `traffic` `traffic` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` CHANGE `traffic_used` `traffic_used` BIGINT( 30 ) NOT NULL DEFAULT '0';"); - $query = 'SELECT * FROM `' . TABLE_PANEL_LANGUAGE . '` WHERE `language` = \'Russian\';'; - $result = $db->query($query); - - if($db->num_rows($result) == 0) - { - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Russian', 'lng/russian.lng.php');"); - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc3-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc3-svn2'; -} - -if($settings['panel']['version'] == '1.2.14-rc3-svn2') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Italian', 'lng/italian.lng.php');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc3-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc3-svn3'; -} - -if($settings['panel']['version'] == '1.2.14-rc3-svn3') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-rc4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-rc4'; -} - -if($settings['panel']['version'] == '1.2.14-rc4') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14'; -} - -if($settings['panel']['version'] == '1.2.14') -{ - // insert apacheversion (guess) - - if(strtoupper(@php_sapi_name()) == "APACHE2HANDLER") - { - $apacheversion = 'apache2'; - } - else - { - $apacheversion = 'apache1'; - } - - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'apacheversion\', `value` = \'' . $apacheversion . '\' '); - $settings['system']['apacheversion'] = $apacheversion; - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-svn1'; -} - -if($settings['panel']['version'] == '1.2.14-svn1') -{ - $tables = getTables($db); - - if(isset($tables[TABLE_PANEL_CUSTOMERS]) - && is_array($tables[TABLE_PANEL_CUSTOMERS]) - && isset($tables[TABLE_PANEL_CUSTOMERS]['loginname'])) - { - $db->query('ALTER TABLE `' . TABLE_PANEL_CUSTOMERS . '` DROP INDEX `loginname` '); - } - - $db->query('ALTER TABLE `' . TABLE_PANEL_ADMINS . '` ADD UNIQUE ( `loginname` )'); - $db->query('ALTER TABLE `' . TABLE_PANEL_CUSTOMERS . '` ADD UNIQUE ( `loginname` )'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-svn2'; -} - -if($settings['panel']['version'] == '1.2.14-svn2') -{ - $db->query('ALTER TABLE `' . TABLE_MAIL_VIRTUAL . '` ADD INDEX ( `email` ) '); - $db->query('ALTER TABLE `' . TABLE_PANEL_DOMAINS . '` ADD INDEX ( `domain` ) '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-svn3'; -} - -if($settings['panel']['version'] == '1.2.14-svn3') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Bulgarian', 'lng/bulgarian.lng.php');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-svn4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-svn4'; -} - -if($settings['panel']['version'] == '1.2.14-svn4') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'phpappendopenbasedir\', `value` = \'/tmp/\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.14-svn5\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.14-svn5'; -} - -if($settings['panel']['version'] == '1.2.14-svn5') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.15\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.15'; -} - -if($settings['panel']['version'] == '1.2.15') -{ - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Slovak', 'lng/slovak.lng.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Dutch', 'lng/dutch.lng.php');"); - $db->query("INSERT INTO `" . TABLE_PANEL_LANGUAGE . "` (`language`, `file`) VALUES ('Hungarian', 'lng/hungarian.lng.php');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.15-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.15-svn1'; -} - -if($settings['panel']['version'] == '1.2.15-svn1') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16'; -} - -if($settings['panel']['version'] == '1.2.16') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'panel\', `varname` = \'natsorting\', `value` = \'1\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn1'; -} - -if($settings['panel']['version'] == '1.2.16-svn1') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'deactivateddocroot\', `value` = \'\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn2'; -} - -if($settings['panel']['version'] == '1.2.16-svn2') -{ - $tables = getTables($db); - - if(isset($tables[TABLE_PANEL_CRONSCRIPT]) - && is_array($tables[TABLE_PANEL_CRONSCRIPT])) - { - $deletecronscriptstable = true; - $cronscripts_result = $db->query('SELECT * FROM `' . TABLE_PANEL_CRONSCRIPT . '`'); - - while($cronscripts_row = $db->fetch_array($cronscripts_result)) - { - if($cronscripts_row['file'] != 'cron_tasks.php' - && $cronscripts_row['file'] != 'cron_traffic.php') - { - $deletecronscriptstable = false; - } - } - - if($deletecronscriptstable === true) - { - $db->query('DROP TABLE IF EXISTS `' . TABLE_PANEL_CRONSCRIPT . '` '); - } - else - { - $db->query('DELETE FROM `' . TABLE_PANEL_CRONSCRIPT . '` WHERE `file` IN( "cron_tasks.php", "cron_traffic.php" ) '); - } - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn3'; -} - -if($settings['panel']['version'] == '1.2.16-svn3') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn4'; -} - -if($settings['panel']['version'] == '1.2.16-svn4') -{ - $tables = getTables($db); - $db->query('ALTER TABLE `' . TABLE_PANEL_TRAFFIC . '` ADD `stamp` INT( 11 ) unsigned NOT NULL DEFAULT \'0\' AFTER `day` '); - - if(isset($tables[TABLE_PANEL_TRAFFIC]) - && is_array($tables[TABLE_PANEL_TRAFFIC]) - && isset($tables[TABLE_PANEL_TRAFFIC]['date'])) - { - $db->query('ALTER TABLE `' . TABLE_PANEL_TRAFFIC . '` DROP INDEX `date` '); - } - - $tables = getTables($db); - $db->query('ALTER TABLE `' . TABLE_PANEL_TRAFFIC_ADMINS . '` ADD `stamp` INT( 11 ) unsigned NOT NULL DEFAULT \'0\' AFTER `day` '); - - if(isset($tables[TABLE_PANEL_TRAFFIC_ADMINS]) - && is_array($tables[TABLE_PANEL_TRAFFIC_ADMINS]) - && isset($tables[TABLE_PANEL_TRAFFIC_ADMINS]['date'])) - { - $db->query('ALTER TABLE `' . TABLE_PANEL_TRAFFIC_ADMINS . '` DROP INDEX `date` '); - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn5\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn5'; -} - -if($settings['panel']['version'] == '1.2.16-svn5') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_CUSTOMERS . '` ADD `reportsent` TINYINT( 4 ) unsigned NOT NULL DEFAULT \'0\' AFTER `loginfail_count` '); - $db->query('ALTER TABLE `' . TABLE_PANEL_ADMINS . '` ADD `reportsent` TINYINT( 4 ) unsigned NOT NULL DEFAULT \'0\' AFTER `loginfail_count` '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'last_traffic_report_run\', `value` = \'\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn6\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn6'; -} - -if($settings['panel']['version'] == '1.2.16-svn6') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_IPSANDPORTS . '` ADD `vhostcontainer` TINYINT( 1 ) NOT NULL DEFAULT \'0\', ADD `specialsettings` TEXT NOT NULL '); - $db->query('UPDATE `' . TABLE_PANEL_IPSANDPORTS . '` SET `vhostcontainer` = \'1\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn7\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn7'; -} - -if($settings['panel']['version'] == '1.2.16-svn7') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_SESSIONS . "` CHANGE `ipaddress` `ipaddress` VARCHAR( 255 ) NOT NULL"); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'mailpwcleartext\', `value` = \'1\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn8\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn8'; -} - -if($settings['panel']['version'] == '1.2.16-svn8') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'last_tasks_run\', `value` = \'0\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn9\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn9'; -} - -if($settings['panel']['version'] == '1.2.16-svn9') -{ - $db->query("ALTER TABLE `" . TABLE_FTP_USERS . "` CHANGE `username` `username` VARCHAR( 255 ) NOT NULL"); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'customer\', `varname` = \'ftpatdomain\', `value` = \'0\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn10\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn10'; -} - -if($settings['panel']['version'] == '1.2.16-svn10') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_DOMAINS . '` ADD `bindserial` VARCHAR( 10 ) NOT NULL DEFAULT \'2000010100\''); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'system\', \'nameservers\', \'\')'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'system\', \'mxservers\', \'\')'); - $db->query('DELETE FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup`=\'system\' AND `varname`=\'binddefaultzone\''); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn11\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn11'; -} - -if($settings['panel']['version'] == '1.2.16-svn11') -{ - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `phpenabled` TINYINT( 1 ) unsigned NOT NULL DEFAULT '1' AFTER `deactivated`"); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'mod_log_sql\', `value` = \'0\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'mod_fcgid\', `value` = \'0\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn12\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn12'; -} - -if($settings['panel']['version'] == '1.2.16-svn12') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'panel\', `varname` = \'sendalternativemail\', `value` = \'0\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn13\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn13'; -} - -if($settings['panel']['version'] == '1.2.16-svn13') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'apacheconf_vhost\', `value` = \'' . makeCorrectFile($settings['system']['apacheconf_directory'] . '/' . $settings['system']['apacheconf_filename']) . '\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'apacheconf_diroptions\', `value` = \'' . makeCorrectFile($settings['system']['apacheconf_directory'] . '/diroptions.conf') . '\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'apacheconf_htpasswddir\', `value` = \'' . makeCorrectDir($settings['system']['apacheconf_directory'] . '/htpasswd/') . '\' '); - $db->query('DELETE FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = \'system\' AND `varname` = \'apacheconf_directory\' '); - $db->query('DELETE FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = \'system\' AND `varname` = \'apacheconf_filename\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn14\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn14'; -} - -if($settings['panel']['version'] == '1.2.16-svn14') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_SESSIONS . '` ADD `formtoken` CHAR( 32 ) NOT NULL AFTER `lastpaging` '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.16-svn15\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.16-svn15'; -} - -if($settings['panel']['version'] == '1.2.16-svn15') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.17\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.17'; -} - -if($settings['panel']['version'] == '1.2.17') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18'; -} - -if($settings['panel']['version'] == '1.2.18') -{ - $db->query('ALTER TABLE `' . TABLE_PANEL_IPSANDPORTS . '` ADD `listen_statement` TINYINT( 1 ) NOT NULL DEFAULT \'0\', ADD `namevirtualhost_statement` TINYINT( 1 ) NOT NULL DEFAULT \'0\', ADD `vhostcontainer_servername_statement` TINYINT( 1 ) NOT NULL DEFAULT \'0\' '); - $db->query('UPDATE `' . TABLE_PANEL_IPSANDPORTS . '` SET `listen_statement` = 0, `namevirtualhost_statement` = 1, `vhostcontainer_servername_statement` = 1 '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18-svn1'; -} - -if($settings['panel']['version'] == '1.2.18-svn1') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\', `varname` = \'webalizer_quiet\', `value` = \'2\' '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18-svn2'; -} - -if($settings['panel']['version'] == '1.2.18-svn2') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'noreply_email\', `value` = \'NO-REPLY@SERVERNAME\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'admin_email\', `value` = \'admin@SERVERNAME\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'worktime_all\', `value` = \'1\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'worktime_begin\', `value` = \'00:00\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'worktime_end\', `value` = \'23:59\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'worktime_sat\', `value` = \'0\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'worktime_sun\', `value` = \'0\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'archiving_days\', `value` = \'5\' '); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'ticket\', `varname` = \'last_archive_run\', `value` = \'0\' '); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `tickets` INT( 15 ) NOT NULL DEFAULT '0' AFTER `ftps_used`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `tickets_used` INT( 15 ) NOT NULL DEFAULT '0' AFTER `tickets`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `tickets` INT( 15 ) NOT NULL DEFAULT '-1' AFTER `ftps_used`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `tickets_used` INT( 15 ) NOT NULL DEFAULT '0' AFTER `tickets`"); - $db->query("CREATE TABLE `" . TABLE_PANEL_TICKETS . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) NOT NULL, - `category` smallint(5) unsigned NOT NULL default '1', - `priority` enum('1','2','3') NOT NULL default '3', - `subject` varchar(70) NOT NULL, - `message` text NOT NULL, - `dt` int(15) NOT NULL, - `lastchange` int(15) NOT NULL, - `ip` varchar(20) NOT NULL, - `status` enum('0','1','2','3') NOT NULL default '1', - `lastreplier` enum('0','1') NOT NULL default '0', - `answerto` int(11) unsigned NOT NULL, - `by` enum('0','1') NOT NULL default '0', - `archived` enum('0','1') NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`)) ENGINE=MyISAM;"); - $db->query("CREATE TABLE `" . TABLE_PANEL_TICKET_CATS . "` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `name` varchar(60) NOT NULL, - PRIMARY KEY (`id`)) ENGINE=MyISAM;"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18-svn3'; -} - -if($settings['panel']['version'] == '1.2.18-svn3') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'ticket\', \'enabled\', \'1\');'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'ticket\', \'concurrently_open\', \'5\');'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18-svn4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18-svn4'; -} - -if($settings['panel']['version'] == '1.2.18-svn4') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'ticket\', \'noreply_name\', \'SysCP Support\')'); - $db->query('DELETE FROM `' . TABLE_PANEL_SETTINGS . '` WHERE `settinggroup` = \'ticket\' AND `varname`=\'admin_email\''); - $db->query('ALTER TABLE `' . TABLE_PANEL_TICKETS . '` ADD `adminid` INT( 11 ) NOT NULL DEFAULT \'1\' AFTER `customerid` '); - $db->query('ALTER TABLE `' . TABLE_PANEL_TICKET_CATS . '` ADD `adminid` INT( 11 ) NOT NULL DEFAULT \'1\' AFTER `name` '); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.18-svn5\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.18-svn5'; -} - -if($settings['panel']['version'] == '1.2.18-svn5') -{ - $db->query('UPDATE `' . TABLE_PANEL_SETTINGS . '` SET `settinggroup` = \'system\' WHERE `settinggroup` = \'ticket\' AND `varname` = \'last_archive_run\''); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19'; -} - -?> diff --git a/install/updates/syscp/1.2/update_1.2.19_1.4.inc.php b/install/updates/syscp/1.2/update_1.2.19_1.4.inc.php deleted file mode 100644 index e59966ee..00000000 --- a/install/updates/syscp/1.2/update_1.2.19_1.4.inc.php +++ /dev/null @@ -1,1084 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Install - * - */ - -if($settings['panel']['version'] == '1.2.19') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'system\', \'mod_fcgid_configdir\', \'/var/www/php-fcgi-scripts\')'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'system\', \'mod_fcgid_tmpdir\', \'/var/kunden/tmp\')'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn1'; -} - -if($settings['panel']['version'] == '1.2.19-svn1') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_LANGUAGE . '` (`language`, `file`) VALUES (\'Swedish\', \'lng/swedish.lng.php\');'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn2\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn2'; -} - -if($settings['panel']['version'] == '1.2.19-svn2') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'ticket\', \'reset_cycle\', \'2\')'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn3\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn3'; -} - -if($settings['panel']['version'] == '1.2.19-svn3') -{ - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn4'; -} - -if($settings['panel']['version'] == '1.2.19-svn4') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'panel\', \'no_robots\', \'1\')'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn4.5\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn4.5'; -} - -if($settings['panel']['version'] == '1.2.19-svn4.5') -{ - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'logger\', \'enabled\', \'1\');'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'logger\', \'log_cron\', \'0\');'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'logger\', \'logfile\', \'\');'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'logger\', \'logtypes\', \'syslog\');'); - $db->query('INSERT INTO `' . TABLE_PANEL_SETTINGS . '` (`settinggroup`, `varname`, `value`) VALUES (\'logger\', \'severity\', \'2\');'); - $db->query('CREATE TABLE IF NOT EXISTS `panel_syslog` ( - `logid` bigint(20) NOT NULL auto_increment, - `action` int(5) NOT NULL default \'10\', - `type` int(5) NOT NULL default \'0\', - `date` int(15) NOT NULL, - `user` varchar(50) NOT NULL, - `text` text NOT NULL, - PRIMARY KEY (`logid`) - ) ENGINE=MyISAM;'); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn6\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn6'; -} - -// ok, from this version on, we need the php filter-extension! - -if(!extension_loaded('filter')) -{ - $updatelog->logAction(ADM_ACTION, LOG_ERR, "You need to install the php filter-extension! Update to 1.2.19-svn6 aborted"); - - // skipping the update will not work, this ends up in an endless redirection from index.php to updatesql.php and back to index.php - - die("You need to install the php filter-extension! Update to 1.2.19-svn6 aborted"); -} -else -{ - if(!extension_loaded('bcmath')) - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "The php extension 'bcmath' is not installed - SysCP will work without it but might not return exact traffic/space-usage values!"); - } - - $php_ob = @ini_get("open_basedir"); - - if(!empty($php_ob) - && $php_ob != '') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Detected enabled 'open_basedir', please disable open_basedir to make SysCP work properly!"); - } - - if($settings['panel']['version'] == '1.2.19-svn6') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn6 to 1.2.19-svn7"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `ssl` tinyint(4) NOT NULL default '0'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `ssl_redirect` tinyint(4) NOT NULL default '0'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `ssl_ipandport` tinyint(4) NOT NULL default '0'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_IPSANDPORTS . "` ADD `ssl` tinyint(4) NOT NULL default '0'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_IPSANDPORTS . "` ADD `ssl_cert` tinytext AFTER `ssl`"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system','ssl_cert_file','/etc/apache2/apache2.pem')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system','use_ssl','1')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system','openssl_cnf','[ req ]\r\ndefault_bits = 1024\r\ndistinguished_name = req_distinguished_name\r\nattributes = req_attributes\r\nprompt = no\r\noutput_password =\r\ninput_password =\r\n[ req_distinguished_name ]\r\nC = DE\r\nST = syscp\r\nL = syscp \r\nO = Testcertificate\r\nOU = syscp \r\nCN = @@domain_name@@\r\nemailAddress = @@email@@ \r\n[ req_attributes ]\r\nchallengePassword =\r\n')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system','default_vhostconf', '')"); - $db->query("ALTER TABLE `" . TABLE_MAIL_USERS . "` ADD `quota` BIGINT( 13 ) NOT NULL DEFAULT '0' AFTER `customerid`, ADD `pop3` TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER `quota` , ADD `imap` TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER `pop3`"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mail_quota_enabled', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'mail_quota', '104857600')"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `email_quota` BIGINT( 13 ) NOT NULL DEFAULT '0' AFTER `email_forwarders_used` , ADD `email_quota_used` BIGINT( 13 ) NOT NULL DEFAULT '0' AFTER `email_quota`, ADD `imap` TINYINT( 1 ) NOT NULL DEFAULT '1', ADD `pop3` TINYINT( 1 ) NOT NULL DEFAULT '1'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `email_quota` BIGINT( 13 ) NOT NULL DEFAULT '0' AFTER `email_forwarders_used` , ADD `email_quota_used` BIGINT( 13 ) NOT NULL DEFAULT '0' AFTER `email_quota`"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'decimal_places', '4')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn7\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn7'; - } - - if($settings['panel']['version'] == '1.2.19-svn7') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn7 to 1.2.19-svn8"); - $db->query(" - CREATE TABLE `mail_dkim` ( - `id` int(11) NOT NULL auto_increment, - `domain_id` int(11) NOT NULL default '0', - `publickey` text NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=MyISAM - "); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `dkim` tinyint(1) NOT NULL default '0' AFTER `zonefile`"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_prefix', '/etc/postfix/dkim/')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_domains', 'domains')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkim_dkimkeys', 'dkim-keys.conf')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'dkimrestart_command', '/etc/init.d/dkim-filter restart')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn8\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn8'; - } - - if($settings['panel']['version'] == '1.2.19-svn8') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn8 to 1.2.19-svn9"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `caneditphpsettings` tinyint(1) NOT NULL default '0' AFTER `domains_see_all`"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn9\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn9'; - } - - if($settings['panel']['version'] == '1.2.19-svn9') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn9 to 1.2.19-svn10"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn10\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn10'; - } - - if($settings['panel']['version'] == '1.2.19-svn10') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn10 to 1.2.19-svn11"); - $db->query("ALTER TABLE `" . TABLE_PANEL_IPSANDPORTS . "` CHANGE `ip` `ip` VARCHAR(39) NOT NULL default ''"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn11\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn11'; - } - - if($settings['panel']['version'] == '1.2.19-svn11') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn11 to 1.2.19-svn12"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `ip` tinyint(4) NOT NULL default '-1' AFTER `def_language`"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn12\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn12'; - } - - if($settings['panel']['version'] == '1.2.19-svn12') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn12 to 1.2.19-svn13"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('dkim', 'use_dkim', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn13\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn13'; - } - - if($settings['panel']['version'] == '1.2.19-svn13') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn13 to 1.2.19-svn14"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `email_only` tinyint(1) NOT NULL default '0' AFTER `isemaildomain`"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `wwwserveralias` tinyint(1) NOT NULL default '1' AFTER `dkim`"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn14\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn14'; - } - - if($settings['panel']['version'] == '1.2.19-svn14') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn14 to 1.2.19-svn15"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'webalizer_enabled', '1')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_enabled', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_domain_file', '/etc/awstats/')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_model_file', '/etc/awstats/awstats.model.conf.syscp')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn15\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn15'; - } - - if($settings['panel']['version'] == '1.2.19-svn15') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn15 to 1.2.19-svn16"); - $db->query(" - CREATE TABLE `panel_dns` ( - `dnsid` bigint(15) NOT NULL auto_increment, - `domainid` int(11) NOT NULL, - `customerid` int(11) NOT NULL, - `adminid` int(11) NOT NULL, - `ipv4` varchar(15) NOT NULL, - `ipv6` varchar(39) NOT NULL, - `cname` varchar(255) NOT NULL, - `mx10` varchar(255) NOT NULL, - `mx20` varchar(255) NOT NULL, - `txt` text NOT NULL, - PRIMARY KEY (`dnsid`), - UNIQUE KEY `domainid` (`domainid`) - ) ENGINE=MyISAM; - "); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'userdns', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'customerdns', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn16\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn16'; - } - - if($settings['panel']['version'] == '1.2.19-svn16') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn16 to 1.2.19-svn17"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'unix_names', '1')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn17\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn17'; - } - - if($settings['panel']['version'] == '1.2.19-svn17') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn17 to 1.2.19-svn18"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_preset', '1')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn18\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn18'; - } - - if($settings['panel']['version'] == '1.2.19-svn18') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn18 to 1.2.19-svn19"); - - // Update all email-admins and give'em unlimited email_quota resources - - $sql = "SELECT `adminid` FROM `" . TABLE_PANEL_ADMINS . "` - WHERE `emails` = '-1' - AND `email_accounts` = '-1' - AND `email_forwarders` = '-1'"; - $admins = $db->query($sql); - - while($admin = $db->fetch_array($admins)) - { - $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `email_quota` = '-1' WHERE `adminid` = '" . $admin['adminid'] . "'"); - } - - if($settings['system']['apacheversion'] == 'lighttpd' - && $settings['system']['apachereload_command'] == '/etc/init.d/lighttpd force-reload') - { - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/lighttpd reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'"); - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn19\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn19'; - } - - if($settings['panel']['version'] == '1.2.19-svn19') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn19 to 1.2.19-svn20"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_path', '/usr/share/awstats/VERSION/webroot/cgi-bin/')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'awstats_updateall_command', '/usr/bin/awstats_updateall.pl')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn20\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn20'; - } - - if($settings['panel']['version'] == '1.2.19-svn20') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn20 to 1.2.19-svn21"); - - // ADDING BILLING - - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` - ADD `firstname` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `title` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `company` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `street` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `zipcode` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `city` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `country` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `phone` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `fax` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `taxid` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `contract_date` DATE NOT NULL, - ADD `contract_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `contract_details` TEXT NOT NULL DEFAULT '', - ADD `included_domains_qty` INT( 11 ) NOT NULL DEFAULT '0', - ADD `included_domains_tld` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `additional_traffic_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `additional_traffic_unit` BIGINT( 30 ) NOT NULL DEFAULT '0', - ADD `additional_diskspace_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `additional_diskspace_unit` BIGINT( 30 ) NOT NULL DEFAULT '0', - ADD `taxclass` INT( 11 ) NOT NULL DEFAULT '0', - ADD `setup_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - ADD `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'm', - ADD `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `calc_tax` TINYINT( 1 ) NOT NULL DEFAULT '1', - ADD `term_of_payment` INT( 11 ) NOT NULL DEFAULT '0', - ADD `payment_every` INT( 11 ) NOT NULL DEFAULT '0', - ADD `payment_method` INT( 11 ) NOT NULL DEFAULT '0', - ADD `bankaccount_holder` TEXT NOT NULL DEFAULT '', - ADD `bankaccount_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `bankaccount_blz` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `bankaccount_bank` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `service_active` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `servicestart_date` DATE NOT NULL, - ADD `serviceend_date` DATE NOT NULL, - ADD `lastinvoiced_date` DATE NOT NULL, - ADD `lastinvoiced_date_traffic` DATE NOT NULL, - ADD `lastinvoiced_date_diskspace` DATE NOT NULL, - ADD `customer_categories_once` TEXT NOT NULL DEFAULT '', - ADD `customer_categories_period` TEXT NOT NULL DEFAULT '', - ADD `invoice_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_hosting` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_hosting_customers` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_domains` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_traffic` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_diskspace` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_other` DECIMAL( 10,2 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` - ADD `taxid` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `title` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `country` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `additional_service_description` TEXT NOT NULL DEFAULT '', - ADD `contract_date` DATE NOT NULL, - ADD `contract_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `contract_details` TEXT NOT NULL DEFAULT '', - ADD `included_domains_qty` INT( 11 ) NOT NULL DEFAULT '0', - ADD `included_domains_tld` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `additional_traffic_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `additional_traffic_unit` BIGINT( 30 ) NOT NULL DEFAULT '0', - ADD `additional_diskspace_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `additional_diskspace_unit` BIGINT( 30 ) NOT NULL DEFAULT '0', - ADD `taxclass` INT( 11 ) NOT NULL DEFAULT '0', - ADD `setup_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - ADD `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'm', - ADD `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `calc_tax` TINYINT( 1 ) NOT NULL DEFAULT '1', - ADD `term_of_payment` INT( 11 ) NOT NULL DEFAULT '0', - ADD `payment_every` INT( 11 ) NOT NULL DEFAULT '0', - ADD `payment_method` INT( 11 ) NOT NULL DEFAULT '0', - ADD `bankaccount_holder` TEXT NOT NULL DEFAULT '', - ADD `bankaccount_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `bankaccount_blz` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `bankaccount_bank` VARCHAR( 255 ) NOT NULL DEFAULT '', - ADD `service_active` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `servicestart_date` DATE NOT NULL, - ADD `serviceend_date` DATE NOT NULL, - ADD `lastinvoiced_date` DATE NOT NULL, - ADD `lastinvoiced_date_traffic` DATE NOT NULL, - ADD `lastinvoiced_date_diskspace` DATE NOT NULL, - ADD `invoice_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_hosting` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_domains` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_traffic` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_diskspace` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `invoice_fee_other` DECIMAL( 10,2 ) NOT NULL DEFAULT '0';"); - $db->query("ALTER TABLE `panel_domains` - ADD `add_date` INT( 11 ) NOT NULL DEFAULT '0', - ADD `registration_date` DATE NOT NULL, - ADD `taxclass` INT( 11 ) NOT NULL DEFAULT '0', - ADD `setup_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_fee` DECIMAL( 10,2 ) NOT NULL DEFAULT '0', - ADD `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - ADD `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'y', - ADD `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `service_active` TINYINT( 1 ) NOT NULL DEFAULT '0', - ADD `servicestart_date` DATE NOT NULL, - ADD `serviceend_date` DATE NOT NULL, - ADD `lastinvoiced_date` DATE NOT NULL;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_SERVICE_CATEGORIES . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `category_name` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_order` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `category_classname` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_classfile` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_cachefield` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_caption` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_rowcaption_setup` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_rowcaption_interval` VARCHAR( 255 ) NOT NULL DEFAULT '' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `category_name` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_order` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `category_mode` TINYINT( 1 ) NOT NULL DEFAULT '0', - `category_classname` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_classfile` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_cachefield` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_caption` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_rowcaption_setup` VARCHAR( 255 ) NOT NULL DEFAULT '', - `category_rowcaption_interval` VARCHAR( 255 ) NOT NULL DEFAULT '' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_SERVICE_DOMAINS_TEMPLATES . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `tld` VARCHAR( 255 ) NOT NULL DEFAULT '', - `valid_from` DATE NOT NULL, - `valid_to` DATE NOT NULL, - `taxclass` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `setup_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'y', - `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_SERVICE_OTHER . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `customerid` INT( 11 ) NOT NULL DEFAULT '0', - `templateid` INT( 11 ) NOT NULL DEFAULT '0', - `service_type` VARCHAR( 255 ) NOT NULL DEFAULT '', - `caption_setup` VARCHAR( 255 ) NOT NULL DEFAULT '', - `caption_interval` VARCHAR( 255 ) NOT NULL DEFAULT '', - `taxclass` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `quantity` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `setup_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'm', - `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0', - `service_active` TINYINT( 1 ) NOT NULL DEFAULT '0', - `servicestart_date` DATE NOT NULL, - `serviceend_date` DATE NOT NULL, - `lastinvoiced_date` DATE NOT NULL - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_SERVICE_OTHER_TEMPLATES . "` ( - `templateid` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `valid_from` DATE NOT NULL, - `valid_to` DATE NOT NULL, - `service_type` VARCHAR( 255 ) NOT NULL DEFAULT '', - `caption_setup` VARCHAR( 255 ) NOT NULL DEFAULT '', - `caption_interval` VARCHAR( 255 ) NOT NULL DEFAULT '', - `taxclass` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `setup_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `interval_length` INT( 11 ) NOT NULL DEFAULT '0', - `interval_type` VARCHAR( 1 ) NOT NULL DEFAULT 'm', - `interval_payment` TINYINT( 1 ) NOT NULL DEFAULT '0' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_TAXCLASSES . "` ( - `classid` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `classname` VARCHAR( 255 ) NOT NULL DEFAULT '', - `default` TINYINT( 1 ) NOT NULL DEFAULT '0' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_TAXRATES . "` ( - `taxid` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `taxclass` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `taxrate` DECIMAL( 4, 4 ) NOT NULL , - `valid_from` DATE NOT NULL - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_INVOICES . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `customerid` INT( 11 ) NOT NULL DEFAULT '0', - `xml` LONGTEXT NOT NULL DEFAULT '', - `invoice_date` DATE NOT NULL, - `state` TINYINT( 1 ) NOT NULL DEFAULT '0', - `state_change` INT( 11 ) NOT NULL DEFAULT '0', - `invoice_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - `total_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `total_fee_taxed` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_INVOICES_ADMINS . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `adminid` INT( 11 ) NOT NULL DEFAULT '0', - `xml` LONGTEXT NOT NULL DEFAULT '', - `invoice_date` DATE NOT NULL, - `state` TINYINT( 1 ) NOT NULL DEFAULT '0', - `state_change` INT( 11 ) NOT NULL DEFAULT '0', - `invoice_number` VARCHAR( 255 ) NOT NULL DEFAULT '', - `total_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `total_fee_taxed` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00' - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_INVOICE_CHANGES . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `customerid` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `userid` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `timestamp` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `key` VARCHAR( 255 ) NOT NULL DEFAULT '', - `action` TINYINT( 1 ) NOT NULL DEFAULT '0', - `caption` VARCHAR( 255 ) NOT NULL DEFAULT '', - `interval` VARCHAR( 255 ) NOT NULL DEFAULT '', - `quantity` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `total_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `taxrate` DECIMAL( 4, 4 ) NOT NULL - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_BILLING_INVOICE_CHANGES_ADMINS . "` ( - `id` INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `adminid` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `userid` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `timestamp` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `key` VARCHAR( 255 ) NOT NULL DEFAULT '', - `action` TINYINT( 1 ) NOT NULL DEFAULT '0', - `caption` VARCHAR( 255 ) NOT NULL DEFAULT '', - `interval` VARCHAR( 255 ) NOT NULL DEFAULT '', - `quantity` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0', - `total_fee` DECIMAL( 10, 2 ) NOT NULL DEFAULT '0.00', - `taxrate` DECIMAL( 4, 4 ) NOT NULL - ) TYPE = MYISAM ;"); - $db->query("CREATE TABLE `" . TABLE_PANEL_DISKSPACE . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `customerid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `stamp` int(11) unsigned NOT NULL default '0', - `webspace` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - `mysql` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `customerid` (`customerid`) - ) ENGINE=MyISAM ;"); - $db->query("CREATE TABLE `" . TABLE_PANEL_DISKSPACE_ADMINS . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `adminid` int(11) unsigned NOT NULL default '0', - `year` int(4) unsigned zerofill NOT NULL default '0000', - `month` int(2) unsigned zerofill NOT NULL default '00', - `day` int(2) unsigned zerofill NOT NULL default '00', - `stamp` int(11) unsigned NOT NULL default '0', - `webspace` bigint(30) unsigned NOT NULL default '0', - `mail` bigint(30) unsigned NOT NULL default '0', - `mysql` bigint(30) unsigned NOT NULL default '0', - PRIMARY KEY (`id`), - KEY `adminid` (`adminid`) - ) ENGINE=MyISAM ;"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (1, 'hosting', 10, 'hosting', 'lib/billing_class_hosting.php', 'invoice_fee_hosting', 'hosting_caption', 'hosting_rowcaption_setup', 'hosting_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (2, 'domains', 20, 'domains', 'lib/billing_class_domains.php', 'invoice_fee_domains', 'domains_caption', 'domains_rowcaption_setup', 'domains_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (3, 'traffic', 30, 'traffic', 'lib/billing_class_traffic.php', 'invoice_fee_traffic', 'traffic_caption', 'traffic_rowcaption_setup', 'traffic_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (4, 'diskspace', 40, 'diskspace', 'lib/billing_class_diskspace.php', 'invoice_fee_diskspace', 'diskspace_caption', 'diskspace_rowcaption_setup', 'diskspace_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES . "` (`id`, `category_name`, `category_order`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (5, 'other', 50, 'other', 'lib/billing_class_other.php', 'invoice_fee_other', 'other_caption', 'other_rowcaption_setup', 'other_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (1, 'hosting', 10, 0, 'hosting', 'lib/billing_class_hosting.php', 'invoice_fee_hosting', 'hosting_caption', 'hosting_rowcaption_setup', 'hosting_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (2, 'hosting_customers', 20, 1, 'hosting', 'lib/billing_class_hosting.php', 'invoice_fee_hosting_customers', 'hosting_caption', 'hosting_rowcaption_setup_withloginname', 'hosting_rowcaption_interval_withloginname');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (3, 'domains', 30, 1, 'domains', 'lib/billing_class_domains.php', 'invoice_fee_domains', 'domains_caption', 'domains_rowcaption_setup', 'domains_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (4, 'traffic', 40, 0, 'traffic', 'lib/billing_class_traffic.php', 'invoice_fee_traffic', 'traffic_caption', 'traffic_rowcaption_setup', 'traffic_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (5, 'diskspace', 50, 0, 'diskspace', 'lib/billing_class_diskspace.php', 'invoice_fee_diskspace', 'diskspace_caption', 'diskspace_rowcaption_setup', 'diskspace_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_SERVICE_CATEGORIES_ADMINS . "` (`id`, `category_name`, `category_order`, `category_mode`, `category_classname`, `category_classfile`, `category_cachefield`, `category_caption`, `category_rowcaption_setup`, `category_rowcaption_interval`) VALUES (6, 'other', 60, 1, 'other', 'lib/billing_class_other.php', 'invoice_fee_other', 'other_caption', 'other_rowcaption_setup', 'other_rowcaption_interval');"); - $db->query("INSERT INTO `" . TABLE_BILLING_TAXCLASSES . "` (`classid`, `classname`, `default`) VALUES ( NULL, 'MwSt Deutschland', '1' );"); - $db->query("INSERT INTO `" . TABLE_BILLING_TAXCLASSES . "` (`classid`, `classname`, `default`) VALUES ( NULL, 'MwSt Deutschland (reduziert)', '0' );"); - $db->query("INSERT INTO `" . TABLE_BILLING_TAXRATES . "` (`taxid`, `taxclass`, `taxrate`, `valid_from`) VALUES ( NULL, 1, 0.1600, '0' );"); - $db->query("INSERT INTO `" . TABLE_BILLING_TAXRATES . "` (`taxid`, `taxclass`, `taxrate`, `valid_from`) VALUES ( NULL, 1, 0.1900, '2007-01-01' );"); - $db->query("INSERT INTO `" . TABLE_BILLING_TAXRATES . "` (`taxid`, `taxclass`, `taxrate`, `valid_from`) VALUES ( NULL, 2, 0.0700, '0' );"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (NULL, 'billing', 'invoicenumber_count', '0');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn21\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn21'; - } - - if($settings['panel']['version'] == '1.2.19-svn21') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn21 to 1.2.19-svn22"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_preset_admin', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn22\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn22'; - } - - if($settings['panel']['version'] == '1.2.19-svn22') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn22 to 1.2.19-svn23"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `edit_billingdata` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `change_serversettings`"); - $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `edit_billingdata` = '1' WHERE `customers_see_all` = '1'"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn23\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn23'; - } - - if($settings['panel']['version'] == '1.2.19-svn23') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn23 to 1.2.19-svn24"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('billing', 'activate_billing', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('billing', 'highlight_inactive', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn24\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn24'; - } - - if($settings['panel']['version'] == '1.2.19-svn24') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn24 to 1.2.19-svn25"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn25\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn25'; - } - - if($settings['panel']['version'] == '1.2.19-svn25') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn25 to 1.2.19-svn26"); - $db->query("INSERT INTO " . TABLE_PANEL_LANGUAGE . " SET `language` = 'Swedish', `file` = 'lng/swedish.lng.php';"); - $db->query("INSERT INTO " . TABLE_PANEL_LANGUAGE . " SET `language` = 'Czech', `file` = 'lng/czech.lng.php';"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn26\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn26'; - } - - if($settings['panel']['version'] == '1.2.19-svn26') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn26 to 1.2.19-svn27"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'webserver', 'apache2')"); - $db->query("CREATE TABLE `" . TABLE_MAIL_AUTORESPONDER . "` ( - `email` varchar(255) NOT NULL default '', - `message` text NOT NULL, - `enabled` tinyint(1) NOT NULL default '0', - `subject` varchar(255) NOT NULL default '', - `customerid` int(11) NOT NULL default '0', - PRIMARY KEY (`email`), - KEY `customerid` (`customerid`), - FULLTEXT KEY `message` (`message`) - ) ENGINE=MyISAM"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('autoresponder', 'autoresponder_active', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('autoresponder', 'last_autoresponder_run', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn27\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn27'; - } - - if($settings['panel']['version'] == '1.2.19-svn27') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn27 to 1.2.19-svn28"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('admin', 'show_version_login', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn28\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn28'; - } - - if($settings['panel']['version'] == '1.2.19-svn28') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn28 to 1.2.19-svn29"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('admin', 'show_version_footer', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn29\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn29'; - } - - if($settings['panel']['version'] == '1.2.19-svn29') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn29 to 1.2.19-svn30"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('admin', 'syscp_graphic', 'images/header.gif')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn30\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn30'; - } - - if($settings['panel']['version'] == '1.2.19-svn30') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn30 to 1.2.19-svn31"); - - //fcgid improvements - - $db->query("CREATE TABLE `" . TABLE_PANEL_PHPCONFIGS . "` ( - `id` int(11) unsigned NOT NULL auto_increment, - `phpsettings` text NOT NULL, - `description` varchar(50) NOT NULL, - PRIMARY KEY (`id`) - ) ENGINE=MyISAM"); - $db->query("INSERT INTO `" . TABLE_PANEL_PHPCONFIGS . "` (`id`, `phpsettings`, `description`) VALUES(1, 'short_open_tag = On\r\nasp_tags = Off\r\nprecision = 14\r\noutput_buffering = 4096\r\nallow_call_time_pass_reference = Off\r\nsafe_mode = {SAFE_MODE}\r\nsafe_mode_gid = Off\r\nsafe_mode_include_dir = \"{PEAR_DIR}\"\r\nsafe_mode_allowed_env_vars = PHP_\r\nsafe_mode_protected_env_vars = LD_LIBRARY_PATH\r\n{OPEN_BASEDIR_C}open_basedir = \"{OPEN_BASEDIR}\"\r\ndisable_functions = exec,passthru,shell_exec,system,proc_close,proc_get_status,proc_nice,proc_open,proc_terminate\r\ndisable_classes =\r\nexpose_php = Off\r\nmax_execution_time = 30\r\nmax_input_time = 60\r\nmemory_limit = 16M\r\npost_max_size = 16M\r\nerror_reporting = E_ALL & ~E_NOTICE\r\ndisplay_errors = On\r\ndisplay_startup_errors = Off\r\nlog_errors = On\r\nlog_errors_max_len = 1024\r\nignore_repeated_errors = Off\r\nignore_repeated_source = Off\r\nreport_memleaks = On\r\ntrack_errors = Off\r\nhtml_errors = Off\r\nvariables_order = \"GPCS\"\r\nregister_globals = Off\r\nregister_argc_argv = Off\r\ngpc_order = \"GPC\"\r\nmagic_quotes_gpc = Off\r\nmagic_quotes_runtime = Off\r\nmagic_quotes_sybase = Off\r\ninclude_path = \".:{PEAR_DIR}\"\r\nenable_dl = Off\r\nfile_uploads = On\r\nupload_tmp_dir = \"{TMP_DIR}\"\r\nupload_max_filesize = 32M\r\nallow_url_fopen = Off\r\nsendmail_path = \"/usr/sbin/sendmail -t -f {CUSTOMER_EMAIL}\"\r\nsession.save_handler = files\r\nsession.save_path = \"{TMP_DIR}\"\r\nsession.use_cookies = 1\r\nsession.name = PHPSESSID\r\nsession.auto_start = 0\r\nsession.cookie_lifetime = 0\r\nsession.cookie_path = /\r\nsession.cookie_domain =\r\nsession.serialize_handler = php\r\nsession.gc_probability = 1\r\nsession.gc_divisor = 1000\r\nsession.gc_maxlifetime = 1440\r\nsession.bug_compat_42 = 0\r\nsession.bug_compat_warn = 1\r\nsession.referer_check =\r\nsession.entropy_length = 16\r\nsession.entropy_file = /dev/urandom\r\nsession.cache_limiter = nocache\r\nsession.cache_expire = 180\r\nsession.use_trans_sid = 0\r\nsuhosin.simulation = Off\r\nsuhosin.mail.protect = 1\r\n', 'Default Config')"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `phpsettingid` INT( 11 ) UNSIGNED NOT NULL DEFAULT '1'"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES('system', 'mod_fcgid_wrapper', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES('system', 'mod_fcgid_starter', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES('system', 'mod_fcgid_peardir', '/usr/share/php/:/usr/share/php5/')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn31\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn31'; - } - - if($settings['panel']['version'] == '1.2.19-svn31') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn31 to 1.2.19-svn32"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES('system', 'index_file_extension', 'html');"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn32\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn32'; - } - - if($settings['panel']['version'] == '1.2.19-svn32') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn32 to 1.2.19-svn33"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `dkim_id` INT( 11 ) UNSIGNED NOT NULL AFTER `dkim`, ADD `dkim_privkey` TEXT NOT NULL AFTER `dkim_id`, ADD `dkim_pubkey` TEXT NOT NULL AFTER `dkim_privkey`"); - $db->query("DROP TABLE IF EXISTS `mail_dkim`"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn33\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn33'; - } - - if($settings['panel']['version'] == '1.2.19-svn33') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn33 to 1.2.19-svn34"); - $db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'userdns'"); - $db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'customerdns'"); - $db->query("DROP TABLE IF EXISTS `panel_dns`"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn34\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn34'; - } - - if($settings['panel']['version'] == '1.2.19-svn34') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn34 to 1.2.19-svn35"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'items_per_page', '20')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'upload_fields', '5')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'aps_active', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'php-extension', '')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'php-configuration', '')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'webserver-htaccess', '')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'php-function', '')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('aps', 'webserver-module', '')"); - $db->query("CREATE TABLE IF NOT EXISTS `" . TABLE_APS_INSTANCES . "` ( - `ID` int(4) NOT NULL auto_increment, - `CustomerID` int(4) NOT NULL, - `PackageID` int(4) NOT NULL, - `Status` int(4) NOT NULL, - PRIMARY KEY (`ID`) - ) ENGINE=MyISAM"); - $db->query("CREATE TABLE IF NOT EXISTS `" . TABLE_APS_PACKAGES . "` ( - `ID` int(4) NOT NULL auto_increment, - `Path` varchar(500) NOT NULL, - `Name` varchar(500) NOT NULL, - `Version` varchar(20) NOT NULL, - `Release` int(4) NOT NULL, - `Status` int(1) NOT NULL default '1', - PRIMARY KEY (`ID`) - ) ENGINE=MyISAM"); - $db->query("CREATE TABLE IF NOT EXISTS `" . TABLE_APS_SETTINGS . "` ( - `ID` int(4) NOT NULL auto_increment, - `InstanceID` int(4) NOT NULL, - `Name` varchar(250) NOT NULL, - `Value` varchar(250) NOT NULL, - PRIMARY KEY (`ID`) - ) ENGINE=MyISAM"); - $db->query("CREATE TABLE IF NOT EXISTS `" . TABLE_APS_TASKS . "` ( - `ID` int(4) NOT NULL auto_increment, - `InstanceID` int(4) NOT NULL, - `Task` int(4) NOT NULL, - PRIMARY KEY (`ID`) - ) ENGINE=MyISAM"); - $db->query("CREATE TABLE IF NOT EXISTS `" . TABLE_APS_TEMP_SETTINGS . "` ( - `ID` int(4) NOT NULL auto_increment, - `PackageID` int(4) NOT NULL, - `CustomerID` int(4) NOT NULL, - `Name` varchar(250) NOT NULL, - `Value` varchar(250) NOT NULL, - PRIMARY KEY (`ID`) - ) ENGINE=MyISAM"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn35\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn35'; - } - - if($settings['panel']['version'] == '1.2.19-svn35') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn35 to 1.2.19-svn36"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `mod_fcgid_starter` INT( 4 ) NULL DEFAULT '-1'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `can_manage_aps_packages` TINYINT( 1 ) NOT NULL DEFAULT '1'"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn36\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn36'; - } - - if($settings['panel']['version'] == '1.2.19-svn36') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn36 to 1.2.19-svn37"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'realtime_port', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('session', 'allow_multiple_login', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_domain_change_admin', '0')"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'allow_domain_change_customer', '0')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn37\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn37'; - } - - if($settings['panel']['version'] == '1.2.19-svn37') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn37 to 1.2.19-svn38"); - $db->query("ALTER TABLE `" . TABLE_PANEL_PHPCONFIGS . "` ADD `binary` VARCHAR( 255 ) NOT NULL, ADD `file_extensions` VARCHAR( 255 ) NOT NULL, ADD `mod_fcgid_starter` int(4) NOT NULL DEFAULT '-1', ADD `mod_fcgid_maxrequests` int(4) NOT NULL DEFAULT '-1'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_DOMAINS . "` ADD `mod_fcgid_maxrequests` INT( 4 ) NULL DEFAULT '-1'"); - $db->query("UPDATE `" . TABLE_PANEL_PHPCONFIGS . "` SET `binary` = '/usr/bin/php-cgi', `file_extensions` = 'php'"); - $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES('system', 'mod_fcgid_maxrequests', '250')"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn38\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn38'; - } - - if($settings['panel']['version'] == '1.2.19-svn38') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn38 to 1.2.19-svn39"); - $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` ADD `aps_packages` INT( 5 ) NOT NULL DEFAULT '0', ADD `aps_packages_used` INT( 5 ) NOT NULL DEFAULT '0'"); - $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `aps_packages` INT( 5 ) NOT NULL DEFAULT '0', ADD `aps_packages_used` INT( 5 ) NOT NULL DEFAULT '0'"); - - //give admins which can see all customers and domains plus change serversettings the ability to have unlimited aps instances - - $admins = $db->query("SELECT `adminid` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `customers_see_all` = 1 AND `domains_see_all` = 1 AND `change_serversettings` = 1"); - - while($admin = $db->fetch_array($admins)) - { - $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `aps_packages` = -1 WHERE `adminid` = '" . $admin['adminid'] . "'"); - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn39\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn39'; - } - - if($settings['panel']['version'] == '1.2.19-svn39') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn39 to 1.2.19-svn40"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'webserver' WHERE `settinggroup` = 'system' AND `varname` = 'apacheversion'"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn40\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn40'; - } - - if($settings['panel']['version'] == '1.2.19-svn40') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn40 to 1.2.19-svn41"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn41\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn41'; - } - - if($settings['panel']['version'] == '1.2.19-svn41') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn41 to 1.2.19-svn42"); - $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '100' WHERE `settinggroup` = 'system' AND `varname` = 'mail_quota' AND `value` = '104857600'"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn42\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn42'; - } - - if($settings['panel']['version'] == '1.2.19-svn42') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn42 to 1.2.19-svn43"); - - // Going to fix double slashes in the database - - $result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTACCESS . "` WHERE `path` LIKE '%//%';"); - - while($row = $db->fetch_array($result)) - { - $row['path'] = makeCorrectDir($row['path']); - $db->query("UPDATE `" . TABLE_PANEL_HTACCESS . "` SET `path` = '" . $db->escape($row['path']) . "' WHERE `id` = '" . $row['id'] . "';"); - } - - $result = $db->query("SELECT * FROM `" . TABLE_PANEL_HTPASSWDS . "` WHERE `path` LIKE '%//%';"); - - while($row = $db->fetch_array($result)) - { - $row['path'] = makeCorrectDir($row['path']); - $db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `path` = '" . $db->escape($row['path']) . "' WHERE `id` = '" . $row['id'] . "';"); - } - - $result = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `documentroot` LIKE '%//%';"); - - while($row = $db->fetch_array($result)) - { - if(!preg_match("#^https?://#i", $row['documentroot'])) - { - $row['documentroot'] = makeCorrectDir($row['documentroot']); - $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot` = '" . $db->escape($row['documentroot']) . "' WHERE `id` = '" . $row['id'] . "';"); - } - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.2.19-svn43\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.2.19-svn43'; - } - - if($settings['panel']['version'] == '1.2.19-svn43') - { - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.2.19-svn43 to 1.4"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.4\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.4'; - } -} - -// php filter-extension check - - - -?> diff --git a/install/updates/syscp/1.4/update_1.4.inc.php b/install/updates/syscp/1.4/update_1.4.inc.php deleted file mode 100644 index a2b73c11..00000000 --- a/install/updates/syscp/1.4/update_1.4.inc.php +++ /dev/null @@ -1,120 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Install - * - */ - -if($settings['panel']['version'] == '1.4') -{ - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.4 to 1.4-svn1"); - - // Going to fix the stuff the update 1.2.19-svn42 to 1.2.19-svn43 broke - - $result = $db->query("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `documentroot` LIKE 'http%';"); - - while($row = $db->fetch_array($result)) - { - if(preg_match("#(https?)://?(.*)#i", $row['documentroot'], $matches)) - { - $row['documentroot'] = $matches[1] . "://" . $matches[2]; - $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot` = '" . $db->escape($row['documentroot']) . "' WHERE `id` = '" . $row['id'] . "';"); - } - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.4-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.4-svn1'; -} - -if($settings['panel']['version'] == '1.4-svn1') -{ - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.4-svn1 to 1.4.1"); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.4.1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.4.1'; -} - -if($settings['panel']['version'] == '1.4.1') -{ - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from 1.4.1 to 1.4.1-svn1"); - - // give at least ONE admin the permission to edit phpsettings, bug #1031 - - $cntCanEditPHP = $db->query_first("SELECT COUNT(`caneditphpsettings`) as `cnt` FROM `" . TABLE_PANEL_ADMINS . "` WHERE `caneditphpsettings` = '1'"); - - if($cntCanEditPHP['cnt'] <= 0) - { - // none of the admins can edit php-settings, - //so we give those who can edit serversettings the right to edit php-settings - - $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `caneditphpsettings` = '1' WHERE `change_serversettings` = '1'"); - } - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'1.4.1-svn1\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = '1.4.1-svn1'; -} - -if($settings['panel']['version'] == '1.4.1-svn1') -{ - $updateto = '1.4.1-svn2'; - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from " . $settings['panel']['version'] . " to " . $updateto); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'' . $updateto . '\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = $updateto; -} - -if($settings['panel']['version'] == '1.4.1-svn2') -{ - $updateto = '1.4.1-svn3'; - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from " . $settings['panel']['version'] . " to " . $updateto); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'' . $updateto . '\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = $updateto; -} - -if($settings['panel']['version'] == '1.4.1-svn3') -{ - $updateto = '1.4.2'; - $updatelog->logAction(ADM_ACTION, LOG_WARNING, "Updating from " . $settings['panel']['version'] . " to " . $updateto); - - // set new version - - $query = 'UPDATE `%s` SET `value` = \'' . $updateto . '\' WHERE `settinggroup` = \'panel\' AND `varname` = \'version\''; - $query = sprintf($query, TABLE_PANEL_SETTINGS); - $db->query($query); - $settings['panel']['version'] = $updateto; -} - -?> \ No newline at end of file diff --git a/lib/functions/database/function.getTables.php b/lib/functions/database/function.getTables.php deleted file mode 100644 index c4cbbef9..00000000 --- a/lib/functions/database/function.getTables.php +++ /dev/null @@ -1,122 +0,0 @@ - (2003-2009) - * @author Froxlor team (2010-) - * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt - * @package Functions - * - */ - -/** - * Returns an array with all tables with keys which are in the currently selected database - * - * @param db A valid DB-object - * @return array Array with tables and keys - * - * @author Florian Lippert - */ - -function getTables(&$db) -{ - // This variable is our return-value - - $tables = array(); - - // The fieldname in the associative array which we get by fetch_array() - - $tablefieldname = 'Tables_in_' . $db->database; - - // Query for a list of tables in the currently selected database - - $tables_result = $db->query('SHOW TABLES'); - - while($tables_row = $db->fetch_array($tables_result)) - { - // Extract tablename - - $tablename = $tables_row[$tablefieldname]; - - // Create sub-array with key tablename - - $tables[$tablename] = array(); - - // Query for a list of indexes of the currently selected table - - $keys_result = $db->query('SHOW INDEX FROM ' . $tablename); - - while($keys_row = $db->fetch_array($keys_result)) - { - // Extract keyname - - $keyname = $keys_row['Key_name']; - - // If there is aleady a key in our tablename-sub-array with has the same name as our key - // OR if the sequence is not one - // then we have more then index-columns for our keyname - - if((isset($tables[$tablename][$keyname]) && $tables[$tablename][$keyname] != '') - || $keys_row['Seq_in_index'] != '1') - { - // If there is no keyname in the tablename-sub-array set ... - - if(!isset($tables[$tablename][$keyname])) - { - // ... then create one - - $tables[$tablename][$keyname] = array(); - } - - // If the keyname-sub-array isn't an array ... - - elseif (!is_array($tables[$tablename][$keyname])) - { - // temporary move columname - - $tmpkeyvalue = $tables[$tablename][$keyname]; - - // unset keyname-key - - unset($tables[$tablename][$keyname]); - - // create new array for keyname-key - - $tables[$tablename][$keyname] = array(); - - // keyindex will be 1 by default, if seq is also 1 we'd better use 0 (this case shouldn't ever occur) - - $keyindex = ($keys_row['Seq_in_index'] == '1') ? '0' : '1'; - - // then move back our tmp columname from above - - $tables[$tablename][$keyname][$keyindex] = $tmpkeyvalue; - - // end unset the variable afterwards - - unset($tmpkeyvalue); - } - - // set columname - - $tables[$tablename][$keyname][$keys_row['Seq_in_index']] = $keys_row['Column_name']; - } - else - { - // set columname - - $tables[$tablename][$keyname] = $keys_row['Column_name']; - } - } - } - - return $tables; -} diff --git a/lib/functions/filedir/function.maildirExists.php b/lib/functions/filedir/function.maildirExists.php index bedf2271..b6153c5b 100644 --- a/lib/functions/filedir/function.maildirExists.php +++ b/lib/functions/filedir/function.maildirExists.php @@ -24,7 +24,7 @@ */ function maildirExists($result = null) { - global $settings, $theme; + global $settings; if(is_array($result)) { diff --git a/lib/functions/filedir/function.makeChownWithNewStats.php b/lib/functions/filedir/function.makeChownWithNewStats.php index 343fdc2f..b0b1b5dc 100644 --- a/lib/functions/filedir/function.makeChownWithNewStats.php +++ b/lib/functions/filedir/function.makeChownWithNewStats.php @@ -26,7 +26,7 @@ */ function makeChownWithNewStats($row) { - global $settings, $theme; + global $settings; // get correct user if($settings['system']['mod_fcgid'] == '1' && isset($row['deactivated']) && $row['deactivated'] == '0') diff --git a/lib/functions/filedir/function.makePathfield.php b/lib/functions/filedir/function.makePathfield.php index ed52d37c..a24c1d32 100644 --- a/lib/functions/filedir/function.makePathfield.php +++ b/lib/functions/filedir/function.makePathfield.php @@ -34,7 +34,7 @@ function makePathfield($path, $uid, $gid, $fieldType, $value = '', $dom = false) { - global $lng, $theme; + global $lng; $value = str_replace($path, '', $value); $field = array(); diff --git a/lib/functions/filedir/function.safe_exec.php b/lib/functions/filedir/function.safe_exec.php index 97b3b55e..012998cc 100644 --- a/lib/functions/filedir/function.safe_exec.php +++ b/lib/functions/filedir/function.safe_exec.php @@ -20,101 +20,33 @@ /** * Wrapper around the exec command. * - * @author Martin Burchert - * @version 1.2 * @param string exec_string String to be executed + * * @return string The result of the exec() - * - * History: - * 1.0 : Initial Version - * 1.1 : Added |,&,>,<,`,*,$,~,? as security breaks. - * 1.2 : Removed * as security break */ +function safe_exec($exec_string, &$return_value = false) { -function safe_exec($exec_string, &$return_value = false) -{ - global $settings, $theme; - - // - // define allowed system commands - // - - $allowed_commands = array( - 'touch', - 'chown', - 'mkdir', - 'webalizer', - 'cp', - 'du', - 'chmod', - 'chattr', - 'chflags', /* freebsd equivalent to linux' chattr */ - $settings['system']['apachereload_command'], - $settings['system']['bindreload_command'], - $settings['dkim']['dkimrestart_command'], - 'openssl', - 'unzip', - 'php', - 'rm', - 'awstats_buildstaticpages.pl', - 'ln' - ); - - // - // check for ; in execute command - // - - if((stristr($exec_string, ';')) - or (stristr($exec_string, '|')) - or (stristr($exec_string, '&')) - or (stristr($exec_string, '>')) - or (stristr($exec_string, '<')) - or (stristr($exec_string, '`')) - or (stristr($exec_string, '$')) - or (stristr($exec_string, '~')) - or (stristr($exec_string, '?'))) - { + // check for bad signs in execute command + if ((stristr($exec_string, ';')) + || (stristr($exec_string, '|')) + || (stristr($exec_string, '&')) + || (stristr($exec_string, '>')) + || (stristr($exec_string, '<')) + || (stristr($exec_string, '`')) + || (stristr($exec_string, '$')) + || (stristr($exec_string, '~')) + || (stristr($exec_string, '?')) + ) { die('SECURITY CHECK FAILED!' . "\n" . 'The execute string "' . htmlspecialchars($exec_string) . '" is a possible security risk!' . "\n" . 'Please check your whole server for security problems by hand!' . "\n"); } - /* - * This is not needed anymore, we allow all commands and just check for pipes and stuff - // - // check if command is allowed here - // - - $ok = false; - foreach($allowed_commands as $allowed_command) - { - if(strpos($exec_string, $allowed_command) === 0 - && (strlen($exec_string) === ($allowed_command_pos = strlen($allowed_command)) || substr($exec_string, $allowed_command_pos, 1) === ' ')) - { - $ok = true; - } - } - - if(!$ok) - { - die('SECURITY CHECK FAILED!' . "\n" . 'Your command "' . htmlspecialchars($exec_string) . '" is not allowed!' . "\n" . 'Please check your whole server for security problems by hand!' . "\n"); - } - */ - - // // execute the command and return output - // - // --- martin @ 08.08.2005 ------------------------------------------------------- - // fixing usage of uninitialised variable - $return = ''; // ------------------------------------------------------------------------------- - - if($return_value == false) - { + if ($return_value == false) { exec($exec_string, $return); - } - else - { + } else { exec($exec_string, $return, $return_value); } diff --git a/lib/functions/filedir/function.storeDefaultIndex.php b/lib/functions/filedir/function.storeDefaultIndex.php index 88ab5e18..98c3af5f 100644 --- a/lib/functions/filedir/function.storeDefaultIndex.php +++ b/lib/functions/filedir/function.storeDefaultIndex.php @@ -25,18 +25,26 @@ * * @return null */ -function storeDefaultIndex($loginname = null, $destination = null, $logger = null, $force = false) -{ - global $db, $settings, $pathtophpfiles, $theme; +function storeDefaultIndex($loginname = null, $destination = null, $logger = null, $force = false) { + + global $settings; if ($force || (int)$settings['system']['store_index_file_subs'] == 1 ) { - $result = $db->query("SELECT `t`.`value`, `c`.`email` AS `customer_email`, `a`.`email` AS `admin_email`, `c`.`loginname` AS `customer_login`, `a`.`loginname` AS `admin_login` FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c` INNER JOIN `" . TABLE_PANEL_ADMINS . "` AS `a` ON `c`.`adminid` = `a`.`adminid` INNER JOIN `" . TABLE_PANEL_TEMPLATES . "` AS `t` ON `a`.`adminid` = `t`.`adminid` WHERE `varname` = 'index_html' AND `c`.`loginname` = '" . $db->escape($loginname) . "'"); - - if($db->num_rows($result) > 0) - { - $template = $db->fetch_array($result); + $result_stmt = Database::prepare(" + SELECT `t`.`value`, `c`.`email` AS `customer_email`, `a`.`email` AS `admin_email`, `c`.`loginname` AS `customer_login`, `a`.`loginname` AS `admin_login` + FROM `" . TABLE_PANEL_CUSTOMERS . "` AS `c` INNER JOIN `" . TABLE_PANEL_ADMINS . "` AS `a` + ON `c`.`adminid` = `a`.`adminid` + INNER JOIN `" . TABLE_PANEL_TEMPLATES . "` AS `t` + ON `a`.`adminid` = `t`.`adminid` + WHERE `varname` = 'index_html' AND `c`.`loginname` = :loginname"); + Database::pexecute($result_stmt, array('loginname' => $loginname)); + + if (Database::num_rows() > 0) { + + $template = $result_stmt->fetch(PDO::FETCH_ASSOC); + $replace_arr = array( 'SERVERNAME' => $settings['system']['hostname'], 'CUSTOMER' => $template['customer_login'], @@ -44,6 +52,7 @@ function storeDefaultIndex($loginname = null, $destination = null, $logger = nul 'CUSTOMER_EMAIL' => $template['customer_email'], 'ADMIN_EMAIL' => $template['admin_email'] ); + $htmlcontent = replace_variables($template['value'], $replace_arr); $indexhtmlpath = makeCorrectFile($destination . '/index.' . $settings['system']['index_file_extension']); $index_html_handler = fopen($indexhtmlpath, 'w'); @@ -52,14 +61,13 @@ function storeDefaultIndex($loginname = null, $destination = null, $logger = nul if ($logger !== null) { $logger->logAction(CRON_ACTION, LOG_NOTICE, 'Creating \'index.' . $settings['system']['index_file_extension'] . '\' for Customer \'' . $template['customer_login'] . '\' based on template in directory ' . escapeshellarg($indexhtmlpath)); } - } - else - { + + } else { $destination = makeCorrectDir($destination); if ($logger !== null) { - $logger->logAction(CRON_ACTION, LOG_NOTICE, 'Running: cp -a ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination)); + $logger->logAction(CRON_ACTION, LOG_NOTICE, 'Running: cp -a ' . FROXLOR_INSTALL_DIR . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination)); } - safe_exec('cp -a ' . $pathtophpfiles . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination)); + safe_exec('cp -a ' . FROXLOR_INSTALL_DIR . '/templates/misc/standardcustomer/* ' . escapeshellarg($destination)); } } return; diff --git a/lib/functions/froxlor/function.CorrectErrorDocument.php b/lib/functions/froxlor/function.CorrectErrorDocument.php index cda65525..71835639 100644 --- a/lib/functions/froxlor/function.CorrectErrorDocument.php +++ b/lib/functions/froxlor/function.CorrectErrorDocument.php @@ -15,56 +15,48 @@ * */ -/* +/** * this functions validates a given value as ErrorDocument * refs #267 - * + * * @param string error-document-string - * + * * @return string error-document-string - * + * */ - function correctErrorDocument($errdoc = null) - { - global $settings, $idna_convert, $theme; +function correctErrorDocument($errdoc = null) { - if($errdoc !== null && $errdoc != '') - { - // not a URL - if((strtoupper(substr($errdoc, 0, 5)) != 'HTTP:' - && strtoupper(substr($errdoc, 0, 6)) != 'HTTPS:') - || !validateUrl($idna_convert->encode($errdoc))) - { - // a file - if(substr($errdoc, 0, 1) != '"') - { - $errdoc = makeCorrectFile($errdoc); - // apache needs a starting-slash (starting at the domains-docroot) - if(!substr($errdoc, 0, 1) == '/') { - $errdoc = '/'.$errdoc; - } - } - // a string (check for ending ") - else - { - // string won't work for lighty - if($settings['system']['webserver'] == 'lighttpd') - { - standard_error('stringerrordocumentnotvalidforlighty'); - } - elseif(substr($errdoc, -1) != '"') - { - $errdoc .= '"'; - } - } - } - else - { - if($settings['system']['webserver'] == 'lighttpd') - { - standard_error('urlerrordocumentnotvalidforlighty'); - } - } - } - return $errdoc; - } + global $settings, $idna_convert; + + if ($errdoc !== null && $errdoc != '') { + // not a URL + if ((strtoupper(substr($errdoc, 0, 5)) != 'HTTP:' + && strtoupper(substr($errdoc, 0, 6)) != 'HTTPS:') + || !validateUrl($idna_convert->encode($errdoc)) + ) { + // a file + if (substr($errdoc, 0, 1) != '"') { + $errdoc = makeCorrectFile($errdoc); + // apache needs a starting-slash (starting at the domains-docroot) + if (!substr($errdoc, 0, 1) == '/') { + $errdoc = '/'.$errdoc; + } + } + // a string (check for ending ") + else { + // string won't work for lighty + if ($settings['system']['webserver'] == 'lighttpd') { + standard_error('stringerrordocumentnotvalidforlighty'); + + } elseif(substr($errdoc, -1) != '"') { + $errdoc .= '"'; + } + } + } else { + if ($settings['system']['webserver'] == 'lighttpd') { + standard_error('urlerrordocumentnotvalidforlighty'); + } + } + } + return $errdoc; +} diff --git a/lib/functions/froxlor/function.CronjobFunctions.php b/lib/functions/froxlor/function.CronjobFunctions.php index 7bfdda2f..ca911ec4 100644 --- a/lib/functions/froxlor/function.CronjobFunctions.php +++ b/lib/functions/froxlor/function.CronjobFunctions.php @@ -22,50 +22,49 @@ * * @return array array of cron-files which are to be executed */ -function getNextCronjobs() -{ - global $db, $theme; +function getNextCronjobs() { $query = "SELECT `id`, `cronfile` FROM `".TABLE_PANEL_CRONRUNS."` WHERE `interval` <> '0' AND `isactive` = '1' AND ("; $intervals = getIntervalOptions(); - $x = 0; - foreach($intervals as $name => $ival) - { + + foreach($intervals as $name => $ival) { + if($name == '0') continue; if($x == 0) { - $query.= '(UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL '.$ival.')) <= UNIX_TIMESTAMP() AND `interval`=\''.$ival.'\')'; + $query.= "(UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL ".$ival.")) <= UNIX_TIMESTAMP() AND `interval` = '".$ival."')"; } else { - $query.= ' OR (UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL '.$ival.')) <= UNIX_TIMESTAMP() AND `interval`=\''.$ival.'\')'; + $query.= " OR (UNIX_TIMESTAMP(DATE_ADD(FROM_UNIXTIME(`lastrun`), INTERVAL ".$ival.")) <= UNIX_TIMESTAMP() AND `interval` = '".$ival."')"; } $x++; } - $query.= ');'; - $result = $db->query($query); + $result = Database::query($query); $cron_files = array(); - while($row = $db->fetch_array($result)) - { + // Update lastrun-timestamp + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { $cron_files[] = $row['cronfile']; - $db->query("UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = UNIX_TIMESTAMP() WHERE `id` ='".(int)$row['id']."';"); + $upd_stmt = Database::prepare(" + UPDATE `".TABLE_PANEL_CRONRUNS."` SET `lastrun` = UNIX_TIMESTAMP() WHERE `id` = :id;" + ); + Database::pexecute($upd_stmt, array('id' => $row['id'])); } return $cron_files; } +function includeCronjobs($debugHandler) { -function includeCronjobs($debugHandler, $pathtophpfiles) -{ - global $settings, $theme, $cronlog; + global $cronlog; $cronjobs = getNextCronjobs(); $jobs_to_run = array(); - $cron_path = makeCorrectDir($pathtophpfiles.'/scripts/jobs/'); + $cron_path = makeCorrectDir(FROXLOR_INSTALL_DIR.'/scripts/jobs/'); if ($cronjobs !== false && is_array($cronjobs) @@ -85,24 +84,21 @@ function includeCronjobs($debugHandler, $pathtophpfiles) } -function getIntervalOptions() -{ - global $db, $lng, $cronlog, $theme; +function getIntervalOptions() { + + global $lng, $cronlog; $query = "SELECT DISTINCT `interval` FROM `" . TABLE_PANEL_CRONRUNS . "` ORDER BY `interval` ASC;"; - $result = $db->query($query); - $cron_intervals = array(); + $result = Database::query($query); + $cron_intervals = array(); $cron_intervals['0'] = $lng['panel']['off']; - while($row = $db->fetch_array($result)) - { - if(validateSqlInterval($row['interval'])) - { + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + + if (validateSqlInterval($row['interval'])) { $cron_intervals[$row['interval']] = $row['interval']; - } - else - { + } else { $cronlog->logAction(CRON_ACTION, LOG_ERROR, "Invalid SQL-Interval ".$row['interval']." detected. Please fix this in the database."); } } @@ -111,19 +107,18 @@ function getIntervalOptions() } -function getCronjobsLastRun() -{ - global $db, $lng, $theme; +function getCronjobsLastRun() { + + global $lng; $query = "SELECT `lastrun`, `desc_lng_key` FROM `".TABLE_PANEL_CRONRUNS."` WHERE `isactive` = '1' ORDER BY `cronfile` ASC"; - $result = $db->query($query); + $result = Database::query($query); $cronjobs_last_run = ''; + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - while($row = $db->fetch_array($result)) - { $lastrun = $lng['cronjobs']['notyetrun']; - if($row['lastrun'] > 0) { + if ($row['lastrun'] > 0) { $lastrun = date('d.m.Y H:i:s', $row['lastrun']); } @@ -136,97 +131,74 @@ function getCronjobsLastRun() return $cronjobs_last_run; } -function toggleCronStatus($module = null, $isactive = 0) -{ - global $db, $theme; +function toggleCronStatus($module = null, $isactive = 0) { if($isactive != 1) { $isactive = 0; } - $query = "UPDATE `".TABLE_PANEL_CRONRUNS."` SET `isactive` = '".(int)$isactive."' WHERE `module` = '".$module."'"; - $db->query($query); - + $upd_stmt = Database::prepare(" + UPDATE `".TABLE_PANEL_CRONRUNS."` SET `isactive` = :active WHERE `module` = :module" + ); + Database::pexecute($upd_stmt, array('active' => $isactive, 'module' => $module)); } -function getOutstandingTasks() -{ - global $db, $lng, $theme; +function getOutstandingTasks() { + + global $lng; $query = "SELECT * FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC"; - $result = $db->query($query); + $result = Database::query($query); $value = '
    '; $tasks = ''; - while($row = $db->fetch_array($result)) - { - if($row['data'] != '') - { + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + + if ($row['data'] != '') { $row['data'] = unserialize($row['data']); } - /* - * rebuilding webserver-configuration - */ - if($row['type'] == '1') - { + // rebuilding webserver-configuration + if ($row['type'] == '1') { $task_desc = $lng['tasks']['rebuild_webserverconfig']; } - /* - * adding new user - */ - elseif($row['type'] == '2') - { + // adding new user/ + elseif ($row['type'] == '2') { $loginname = ''; - if(is_array($row['data'])) - { + if (is_array($row['data'])) { $loginname = $row['data']['loginname']; } $task_desc = $lng['tasks']['adding_customer']; $task_desc = str_replace('%loginname%', $loginname, $task_desc); } - /* - * rebuilding bind-configuration - */ - elseif($row['type'] == '4') - { + // rebuilding bind-configuration + elseif ($row['type'] == '4') { $task_desc = $lng['tasks']['rebuild_bindconfig']; } - /* - * creating ftp-user directory - */ - elseif($row['type'] == '5') - { + // creating ftp-user directory + elseif ($row['type'] == '5') { $task_desc = $lng['tasks']['creating_ftpdir']; } - /* - * deleting user-files - */ - elseif($row['type'] == '6') - { + // deleting user-files + elseif ($row['type'] == '6') { $loginname = ''; - if(is_array($row['data'])) - { + if (is_array($row['data'])) { $loginname = $row['data']['loginname']; } $task_desc = $lng['tasks']['deleting_customerfiles']; $task_desc = str_replace('%loginname%', $loginname, $task_desc); } - elseif($row['type'] == '7') - { + // deleteing email-account + elseif ($row['type'] == '7') { $task_desc = $lng['tasks']['remove_emailacc_files']; } - /* - * Set FS - quota - */ - elseif($row['type'] == '10') - { + // Set FS - quota + elseif ($row['type'] == '10') { $task_desc = $lng['tasks']['diskspace_set_quota']; } - else - { - $task_desc = "ERROR: Unknown task type '".$row['type']. - "'"; + // unknown + else { + $task_desc = "ERROR: Unknown task type '".$row['type']."'"; } if($task_desc != '') { @@ -235,50 +207,31 @@ function getOutstandingTasks() } $query2 = "SELECT DISTINCT `Task` FROM `".TABLE_APS_TASKS."` ORDER BY `Task` ASC"; - $result2 = $db->query($query2); + $result2 = Database::query($query2); - while($row2 = $db->fetch_array($result2)) - { - /* - * install - */ - if($row2['Task'] == '1') - { + while ($row2 = $result2->fetch(PDO::FETCH_ASSOC)) { + // install + if ($row2['Task'] == '1') { $task_desc = $lng['tasks']['aps_task_install']; } - /* - * remove - */ - elseif($row2['Task'] == '2') - { + // remove + elseif ($row2['Task'] == '2') { $task_desc = $lng['tasks']['aps_task_remove']; } - /* - * reconfigure - */ - elseif($row2['Task'] == '3') - { + // reconfigure + elseif ($row2['Task'] == '3') { $task_desc = $lng['tasks']['aps_task_reconfigure']; } - /* - * upgrade - */ - elseif($row2['Task'] == '4') - { + // upgrade + elseif ($row2['Task'] == '4') { $task_desc = $lng['tasks']['aps_task_upgrade']; } - /* - * system update - */ - elseif($row2['Task'] == '5') - { + // system update + elseif ($row2['Task'] == '5') { $task_desc = $lng['tasks']['aps_task_sysupdate']; } - /* - * system download - */ - elseif($row2['Task'] == '6') - { + // system download + elseif ($row2['Task'] == '6') { $task_desc = $lng['tasks']['aps_task_sysdownload']; } @@ -287,7 +240,7 @@ function getOutstandingTasks() } } - if(trim($tasks) == '') { + if (trim($tasks) == '') { $value .= '
  • '.$lng['tasks']['noneoutstanding'].'
    • '; } else { $value .= $tasks; diff --git a/lib/functions/froxlor/function.createAWStatsConf.php b/lib/functions/froxlor/function.createAWStatsConf.php index 53444aee..2338ebe9 100644 --- a/lib/functions/froxlor/function.createAWStatsConf.php +++ b/lib/functions/froxlor/function.createAWStatsConf.php @@ -26,13 +26,11 @@ * @param hostAliases * @return null */ +function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot, $awstats_params = array()) { -function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot, $awstats_params = array()) -{ - global $pathtophpfiles, $settings, $theme; + global $settings; // Generation header - $header = "## GENERATED BY FROXLOR\n"; $header2 = "## Do not remove the line above! This tells Froxlor to update this configuration\n## If you wish to manually change this configuration file, remove the first line to make sure Froxlor won't rebuild this file\n## Generated for domain {SITE_DOMAIN} on " . date('l dS \of F Y h:i:s A') . "\n"; @@ -49,7 +47,6 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot } // These are the variables we will replace - $regex = array( '/\{LOG_FILE\}/', '/\{SITE_DOMAIN\}/', @@ -67,9 +64,7 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot // File names $domain_file = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $siteDomain . '.conf'); - $model_file = dirname(dirname(dirname(dirname(__FILE__)))); - $model_file.= '/templates/misc/awstatsmodel/awstats.froxlor.model.conf'; - + $model_file = FROXLOR_INSTALL_DIR.'/templates/misc/awstatsmodel/awstats.froxlor.model.conf'; $model_file = makeCorrectFile($model_file); // Test if the file exists diff --git a/lib/functions/froxlor/function.createAWStatsVhost.php b/lib/functions/froxlor/function.createAWStatsVhost.php index 682dcc01..55713bb9 100644 --- a/lib/functions/froxlor/function.createAWStatsVhost.php +++ b/lib/functions/froxlor/function.createAWStatsVhost.php @@ -20,27 +20,29 @@ /** * This function generates the VHost configuration for AWStats * This will enable the /awstats url and enable security on these folders - * @param siteDomain Name of the domain we want stats for - * @return String with configuration for use in vhost file * @author Berend Dekens + * + * @param siteDomain Name of the domain we want stats for + * + * @return String with configuration for use in vhost file */ +function createAWStatsVhost($siteDomain, $settings = null) { + + if ($settings['system']['mod_fcgid'] != '1') { -function createAWStatsVhost($siteDomain, $settings = null) -{ - if($settings['system']['mod_fcgid'] != '1') - { $vhosts_file = ' # AWStats statistics' . "\n"; $vhosts_file.= ' RewriteEngine On' . "\n"; $vhosts_file.= ' RewriteRule ^/awstats(/.*)?$ /awstats/awstats.pl?config=' . $siteDomain . ' [L,PT]' . "\n"; $vhosts_file.= ' RewriteRule ^/awstats.pl(.*)$ /awstats/awstats.pl$1 [QSA,L,PT]' . "\n"; - } - else - { + + } else { + $vhosts_file = ' ' . "\n"; $vhosts_file.= ' RewriteEngine On' . "\n"; $vhosts_file.= ' RewriteRule awstats.pl(.*)$ http://' . $settings['system']['hostname'] . '/cgi-bin/awstats.pl$1 [R,P]' . "\n"; $vhosts_file.= ' RewriteRule awstats$ http://' . $settings['system']['hostname'] . '/cgi-bin/awstats.pl?config=' . $siteDomain . ' [R,P]' . "\n"; $vhosts_file.= ' ' . "\n"; + } return $vhosts_file; diff --git a/lib/functions/froxlor/function.customerHasPerlEnabled.php b/lib/functions/froxlor/function.customerHasPerlEnabled.php index 207a7f4c..67dec86d 100644 --- a/lib/functions/froxlor/function.customerHasPerlEnabled.php +++ b/lib/functions/froxlor/function.customerHasPerlEnabled.php @@ -15,25 +15,27 @@ * */ -/* +/** * Function customerHasPerlEnabled * * returns true or false whether perl is * enabled for the given customer * - * @param int customer-id + * @param int customer-id * - * @return boolean + * @return boolean */ -function customerHasPerlEnabled($cid = 0) -{ - global $db, $theme; +function customerHasPerlEnabled($cid = 0) { - if($cid > 0) - { - $result = $db->query_first("SELECT `perlenabled` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid` = '".(int)$cid."'"); - if(is_array($result) - && isset($result['perlenabled']) + if ($cid > 0) { + $result_stmt = Database::prepare(" + SELECT `perlenabled` FROM `".TABLE_PANEL_CUSTOMERS."` WHERE `customerid` = :cid" + ); + Database::pexecute($result_stmt, array('cid' => $cid)); + $result = $result_stmt->fetch(PDO::FETCH_ASSOC); + + if (is_array($result) + && isset($result['perlenabled']) ) { return ($result['perlenabled'] == '1') ? true : false; } diff --git a/lib/functions/froxlor/function.domainHasMainSubDomains.php b/lib/functions/froxlor/function.domainHasMainSubDomains.php index 22a78bdf..62295a43 100644 --- a/lib/functions/froxlor/function.domainHasMainSubDomains.php +++ b/lib/functions/froxlor/function.domainHasMainSubDomains.php @@ -23,13 +23,16 @@ * * @return boolean */ -function domainHasMainSubDomains($id = 0) -{ - global $db, $theme; +function domainHasMainSubDomains($id = 0) { - $sql = "SELECT COUNT(`id`) as `mainsubs` FROM `".TABLE_PANEL_DOMAINS."` WHERE `ismainbutsubto` = '".(int)$id."'"; - $result = $db->query_first($sql); - if(isset($result['mainsubs']) + $result_stmt = Database::prepare(" + SELECT COUNT(`id`) as `mainsubs` FROM `".TABLE_PANEL_DOMAINS."` + WHERE `ismainbutsubto` = :id" + ); + Database::pexecute($result_stmt, array('id' => $id)); + $result = $result_stmt->fetch(PDO::FETCH_ASSOC); + + if (isset($result['mainsubs']) && $result['mainsubs'] > 0 ) { return true; @@ -45,13 +48,15 @@ function domainHasMainSubDomains($id = 0) * * @return boolean */ -function domainMainToSubExists($id = 0) -{ - global $db, $theme; +function domainMainToSubExists($id = 0) { - $sql = "SELECT `id` FROM `".TABLE_PANEL_DOMAINS."` WHERE `id` = '".(int)$id."'"; - $result = $db->query_first($sql); - if(isset($result['id']) + $result_stmt = Database::prepare(" + SELECT `id` FROM `".TABLE_PANEL_DOMAINS."` WHERE `id` = :id" + ); + Database::pexecute($result_stmt, array('id' => $id)); + $result = $result_stmt->fetch(PDO::FETCH_ASSOC); + + if (isset($result['id']) && $result['id'] > 0 ) { return true; diff --git a/lib/functions/froxlor/function.domainHasSslIpPort.php b/lib/functions/froxlor/function.domainHasSslIpPort.php index c8f2daf0..790af7cd 100644 --- a/lib/functions/froxlor/function.domainHasSslIpPort.php +++ b/lib/functions/froxlor/function.domainHasSslIpPort.php @@ -18,15 +18,25 @@ * */ +/** + * Check whether a given domain has an ssl-ip/port assigned + * + * @param int $domainid + * + * @return boolean + */ function domainHasSslIpPort($domainid = 0) { - global $db; - - $result = $db->query_first(" - SELECT `dt`.* FROM `".TABLE_DOMAINTOIP."` `dt`, `".TABLE_PANEL_IPSANDPORTS."` `iap` - WHERE `dt`.`id_ipandports` = `iap`.`id` AND `iap`.`ssl` = '1' AND `dt`.`id_domain` = '".(int)$domainid."'; - "); - if (is_array($result) && isset($result['id_ipandports'])) { + $result_stmt = Database::prepare(" + SELECT `dt`.* FROM `".TABLE_DOMAINTOIP."` `dt`, `".TABLE_PANEL_IPSANDPORTS."` `iap` + WHERE `dt`.`id_ipandports` = `iap`.`id` AND `iap`.`ssl` = '1' AND `dt`.`id_domain` = :domainid;" + ); + Database::pexecute($result_stmt, array('domainid' => $domainid)); + $result = $result_stmt->fetch(PDO::FETCH_ASSOC); + + if (is_array($result) + && isset($result['id_ipandports']) + ) { return true; } return false; diff --git a/lib/functions/froxlor/function.getAdmins.php b/lib/functions/froxlor/function.getAdmins.php index 8c940e6d..38e40cbd 100644 --- a/lib/functions/froxlor/function.getAdmins.php +++ b/lib/functions/froxlor/function.getAdmins.php @@ -17,8 +17,8 @@ * */ -function getAdmins($limit_resource = '') -{ +function getAdmins($limit_resource = '') { + global $db, $theme; $additional_conditions = ''; diff --git a/lib/functions/system/function.makeCryptPassword.php b/lib/functions/system/function.makeCryptPassword.php index 1f345f24..521de619 100644 --- a/lib/functions/system/function.makeCryptPassword.php +++ b/lib/functions/system/function.makeCryptPassword.php @@ -10,6 +10,8 @@ * * @copyright (c) the authors * @author Michal Wojcik + * @author Michael Kaufmann + * @author Froxlor team (2010-) * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt * @package Functions * @@ -21,6 +23,8 @@ * @return string encrypted password * * @author Michal Wojcik + * @author Michael Kaufmann + * @author Froxlor team (2010-) * * 0 - default crypt (depenend on system configuration) * 1 - MD5 $1$ diff --git a/scripts/froxlor_master_cronjob.php b/scripts/froxlor_master_cronjob.php index c71a324d..2515295b 100644 --- a/scripts/froxlor_master_cronjob.php +++ b/scripts/froxlor_master_cronjob.php @@ -19,7 +19,7 @@ define('MASTER_CRONJOB', 1); include_once(dirname(__FILE__) . '/../lib/cron_init.php'); -$jobs_to_run = includeCronjobs($debugHandler, $pathtophpfiles); +$jobs_to_run = includeCronjobs($debugHandler); /** * check for --help