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

fix axfr-server-stuff (and close allow-transfer block), let updater and settings validate ipv4/ipv6 via function validate_ip

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-22 16:39:35 +02:00
parent ce9c8a766f
commit f2d10046b6
4 changed files with 236 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/160.nameserver.php
View File

@@ -73,7 +73,7 @@ return array(
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'axfrservers', 'varname' => 'axfrservers',
'type' => 'string', 'type' => 'string',
'string_regexp' => '/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(, ?(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3}))*$/i', 'string_type' => 'validate_ip',
'string_emptyallowed' => true, 'string_emptyallowed' => true,
'default' => '', 'default' => '',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',

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

@@ -21,7 +21,7 @@ if(isFroxlorVersion('0.9-r0'))
showUpdateStep("Performing database updates"); showUpdateStep("Performing database updates");
/* /*
* add missing database-updates if necessary (old: update/update_database.php) * add missing database-updates if necessary (old: update/update_database.php)
*/ */
if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 1) if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 1)
{ {
$db->query("ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';"); $db->query("ALTER TABLE `panel_databases` ADD `dbserver` INT( 11 ) UNSIGNED NOT NULL default '0';");
@@ -29,9 +29,9 @@ if(isFroxlorVersion('0.9-r0'))
if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 2) if(isset($settings['system']['dbversion']) && (int)$settings['system']['dbversion'] < 2)
{ {
$db->query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL, $db->query("ALTER TABLE `panel_ipsandports` CHANGE `ssl_cert` `ssl_cert_file` VARCHAR( 255 ) NOT NULL,
ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL, ADD `ssl_key_file` VARCHAR( 255 ) NOT NULL,
ADD `ssl_ca_file` VARCHAR( 255 ) NOT NULL, ADD `ssl_ca_file` VARCHAR( 255 ) NOT NULL,
ADD `default_vhostconf_domain` TEXT NOT NULL;"); ADD `default_vhostconf_domain` TEXT NOT NULL;");
$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_key_file', `value` = '';"); $db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_key_file', `value` = '';");
$db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_ca_file', `value` = '';"); $db->query("INSERT INTO `panel_settings` SET `settinggroup` = 'system', `varname` = 'ssl_ca_file', `value` = '';");
@@ -40,7 +40,7 @@ if(isFroxlorVersion('0.9-r0'))
/* /*
* remove billing tables in database * remove billing tables in database
*/ */
define('TABLE_BILLING_INVOICES', 'billing_invoices'); define('TABLE_BILLING_INVOICES', 'billing_invoices');
define('TABLE_BILLING_INVOICES_ADMINS', 'billing_invoices_admins'); define('TABLE_BILLING_INVOICES_ADMINS', 'billing_invoices_admins');
define('TABLE_BILLING_INVOICE_CHANGES', 'billing_invoice_changes'); define('TABLE_BILLING_INVOICE_CHANGES', 'billing_invoice_changes');
@@ -67,116 +67,116 @@ if(isFroxlorVersion('0.9-r0'))
/* /*
* update panel_domains, panel_customers, panel_admins * update panel_domains, panel_customers, panel_admins
*/ */
$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "`
DROP `firstname`, DROP `firstname`,
DROP `title`, DROP `title`,
DROP `company`, DROP `company`,
DROP `street`, DROP `street`,
DROP `zipcode`, DROP `zipcode`,
DROP `city`, DROP `city`,
DROP `country`, DROP `country`,
DROP `phone`, DROP `phone`,
DROP `fax`, DROP `fax`,
DROP `taxid`, DROP `taxid`,
DROP `contract_date`, DROP `contract_date`,
DROP `contract_number`, DROP `contract_number`,
DROP `contract_details`, DROP `contract_details`,
DROP `included_domains_qty`, DROP `included_domains_qty`,
DROP `included_domains_tld`, DROP `included_domains_tld`,
DROP `additional_traffic_fee`, DROP `additional_traffic_fee`,
DROP `additional_traffic_unit`, DROP `additional_traffic_unit`,
DROP `additional_diskspace_fee`, DROP `additional_diskspace_fee`,
DROP `additional_diskspace_unit`, DROP `additional_diskspace_unit`,
DROP `taxclass`, DROP `taxclass`,
DROP `setup_fee`, DROP `setup_fee`,
DROP `interval_fee`, DROP `interval_fee`,
DROP `interval_length`, DROP `interval_length`,
DROP `interval_type`, DROP `interval_type`,
DROP `interval_payment`, DROP `interval_payment`,
DROP `calc_tax`, DROP `calc_tax`,
DROP `term_of_payment`, DROP `term_of_payment`,
DROP `payment_every`, DROP `payment_every`,
DROP `payment_method`, DROP `payment_method`,
DROP `bankaccount_holder`, DROP `bankaccount_holder`,
DROP `bankaccount_number`, DROP `bankaccount_number`,
DROP `bankaccount_blz`, DROP `bankaccount_blz`,
DROP `bankaccount_bank`, DROP `bankaccount_bank`,
DROP `service_active`, DROP `service_active`,
DROP `servicestart_date`, DROP `servicestart_date`,
DROP `serviceend_date`, DROP `serviceend_date`,
DROP `lastinvoiced_date`, DROP `lastinvoiced_date`,
DROP `lastinvoiced_date_traffic`, DROP `lastinvoiced_date_traffic`,
DROP `lastinvoiced_date_diskspace`, DROP `lastinvoiced_date_diskspace`,
DROP `customer_categories_once`, DROP `customer_categories_once`,
DROP `customer_categories_period`, DROP `customer_categories_period`,
DROP `invoice_fee`, DROP `invoice_fee`,
DROP `invoice_fee_hosting`, DROP `invoice_fee_hosting`,
DROP `invoice_fee_hosting_customers`, DROP `invoice_fee_hosting_customers`,
DROP `invoice_fee_domains`, DROP `invoice_fee_domains`,
DROP `invoice_fee_traffic`, DROP `invoice_fee_traffic`,
DROP `invoice_fee_diskspace`, DROP `invoice_fee_diskspace`,
DROP `invoice_fee_other`, DROP `invoice_fee_other`,
DROP `edit_billingdata`;"); DROP `edit_billingdata`;");
$db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "`
DROP `taxid`, DROP `taxid`,
DROP `title`, DROP `title`,
DROP `country`, DROP `country`,
DROP `additional_service_description`, DROP `additional_service_description`,
DROP `contract_date`, DROP `contract_date`,
DROP `contract_number`, DROP `contract_number`,
DROP `contract_details`, DROP `contract_details`,
DROP `included_domains_qty`, DROP `included_domains_qty`,
DROP `included_domains_tld`, DROP `included_domains_tld`,
DROP `additional_traffic_fee`, DROP `additional_traffic_fee`,
DROP `additional_traffic_unit`, DROP `additional_traffic_unit`,
DROP `additional_diskspace_fee`, DROP `additional_diskspace_fee`,
DROP `additional_diskspace_unit`, DROP `additional_diskspace_unit`,
DROP `taxclass`, DROP `taxclass`,
DROP `setup_fee`, DROP `setup_fee`,
DROP `interval_fee`, DROP `interval_fee`,
DROP `interval_length`, DROP `interval_length`,
DROP `interval_type`, DROP `interval_type`,
DROP `interval_payment`, DROP `interval_payment`,
DROP `calc_tax`, DROP `calc_tax`,
DROP `term_of_payment`, DROP `term_of_payment`,
DROP `payment_every`, DROP `payment_every`,
DROP `payment_method`, DROP `payment_method`,
DROP `bankaccount_holder`, DROP `bankaccount_holder`,
DROP `bankaccount_number`, DROP `bankaccount_number`,
DROP `bankaccount_blz`, DROP `bankaccount_blz`,
DROP `bankaccount_bank`, DROP `bankaccount_bank`,
DROP `service_active`, DROP `service_active`,
DROP `servicestart_date`, DROP `servicestart_date`,
DROP `serviceend_date`, DROP `serviceend_date`,
DROP `lastinvoiced_date`, DROP `lastinvoiced_date`,
DROP `lastinvoiced_date_traffic`, DROP `lastinvoiced_date_traffic`,
DROP `lastinvoiced_date_diskspace`, DROP `lastinvoiced_date_diskspace`,
DROP `invoice_fee`, DROP `invoice_fee`,
DROP `invoice_fee_hosting`, DROP `invoice_fee_hosting`,
DROP `invoice_fee_domains`, DROP `invoice_fee_domains`,
DROP `invoice_fee_traffic`, DROP `invoice_fee_traffic`,
DROP `invoice_fee_diskspace`, DROP `invoice_fee_diskspace`,
DROP `invoice_fee_other`;"); DROP `invoice_fee_other`;");
$db->query("ALTER TABLE `panel_domains` $db->query("ALTER TABLE `panel_domains`
DROP `taxclass`, DROP `taxclass`,
DROP `setup_fee`, DROP `setup_fee`,
DROP `interval_fee`, DROP `interval_fee`,
DROP `interval_length`, DROP `interval_length`,
DROP `interval_type`, DROP `interval_type`,
DROP `interval_payment`, DROP `interval_payment`,
DROP `service_active`, DROP `service_active`,
DROP `servicestart_date`, DROP `servicestart_date`,
DROP `serviceend_date`, DROP `serviceend_date`,
DROP `lastinvoiced_date`;"); DROP `lastinvoiced_date`;");
$db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` $db->query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "`
WHERE `settinggroup` = 'billing';"); WHERE `settinggroup` = 'billing';");
$db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "` $db->query("ALTER TABLE `" . TABLE_PANEL_ADMINS . "`
MODIFY `traffic` BIGINT(30), MODIFY `traffic` BIGINT(30),
MODIFY `traffic_used` BIGINT(30)"); MODIFY `traffic_used` BIGINT(30)");
lastStepStatus(0); lastStepStatus(0);
@@ -192,7 +192,7 @@ if(isFroxlorVersion('0.9-r1'))
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@ IN TXT \"v=spf1 a mx -all\"');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('spf', 'spf_entry', '@ IN TXT \"v=spf1 a mx -all\"');");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'"); $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'froxlor_graphic' WHERE `varname` = 'syscp_graphic'");
if(isset($settings['admin']['syscp_graphic']) if(isset($settings['admin']['syscp_graphic'])
&& $settings['admin']['syscp_graphic'] != '' && $settings['admin']['syscp_graphic'] != ''
){ ){
$settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic']; $settings['admin']['froxlor_graphic'] = $settings['admin']['syscp_graphic'];
} }
@@ -226,15 +226,15 @@ if(isFroxlorVersion('0.9-r3'))
showUpdateStep("Creating new table 'cronjobs_run'"); showUpdateStep("Creating new table 'cronjobs_run'");
$db->query("CREATE TABLE IF NOT EXISTS `cronjobs_run` ( $db->query("CREATE TABLE IF NOT EXISTS `cronjobs_run` (
`id` bigint(20) NOT NULL auto_increment, `id` bigint(20) NOT NULL auto_increment,
`module` varchar(250) NOT NULL, `module` varchar(250) NOT NULL,
`cronfile` varchar(250) NOT NULL, `cronfile` varchar(250) NOT NULL,
`lastrun` int(15) NOT NULL DEFAULT '0', `lastrun` int(15) NOT NULL DEFAULT '0',
`interval` varchar(100) NOT NULL DEFAULT '5 MINUTE', `interval` varchar(100) NOT NULL DEFAULT '5 MINUTE',
`isactive` tinyint(1) DEFAULT '1', `isactive` tinyint(1) DEFAULT '1',
`desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc', `desc_lng_key` varchar(100) NOT NULL DEFAULT 'cron_unknown_desc',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM;"); ) ENGINE=MyISAM;");
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Inserting new values into table"); showUpdateStep("Inserting new values into table");
@@ -305,8 +305,8 @@ if(isFroxlorVersion('0.9.1'))
$result = $db->query_first("SELECT MAX(`guid`) as `latestguid` FROM `".TABLE_PANEL_CUSTOMERS."`"); $result = $db->query_first("SELECT MAX(`guid`) as `latestguid` FROM `".TABLE_PANEL_CUSTOMERS."`");
if (isset($result['latestguid']) if (isset($result['latestguid'])
&& (int)$result['latestguid'] > 0 && (int)$result['latestguid'] > 0
&& $result['latestguid'] != $settings['system']['lastguid'] && $result['latestguid'] != $settings['system']['lastguid']
) { ) {
checkLastGuid(); checkLastGuid();
lastStepStatus(1, 'fixed'); lastStepStatus(1, 'fixed');
@@ -409,9 +409,9 @@ if(isFroxlorVersion('0.9.4'))
* some users might still have the setting in their database * some users might still have the setting in their database
* because we already had this back in older versions. * because we already had this back in older versions.
* To not confuse Froxlor, we just update old settings. * To not confuse Froxlor, we just update old settings.
*/ */
if(isset($settings['system']['awstats_path']) if(isset($settings['system']['awstats_path'])
&& $settings['system']['awstats_path'] != '' && $settings['system']['awstats_path'] != ''
) { ) {
showUpdateStep("Updating awstats path setting"); showUpdateStep("Updating awstats path setting");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';"); $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/usr/bin/' WHERE `settinggroup` = 'system' AND `varname` = 'awstats_path';");
@@ -425,7 +425,7 @@ if(isFroxlorVersion('0.9.4'))
} }
if(isset($settings['system']['awstats_domain_file']) if(isset($settings['system']['awstats_domain_file'])
&& $settings['system']['awstats_domain_file'] != '' && $settings['system']['awstats_domain_file'] != ''
) { ) {
showUpdateStep("Updating awstats configuration path setting"); showUpdateStep("Updating awstats configuration path setting");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';"); $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `varname` = 'awstats_conf' WHERE `varname` = 'awstats_domain_file';");
@@ -543,28 +543,28 @@ if(isFroxlorVersion('0.9.6-svn2'))
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '1');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'enabled', '1');");
if(isset($_POST['update_deferr_500']) if(isset($_POST['update_deferr_500'])
&& trim($_POST['update_deferr_500']) != '' && trim($_POST['update_deferr_500']) != ''
) { ) {
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err500', '".$db->escape($_POST['update_deferr_500'])."');");
$err500 = true; $err500 = true;
} }
if(isset($_POST['update_deferr_401']) if(isset($_POST['update_deferr_401'])
&& trim($_POST['update_deferr_401']) != '' && trim($_POST['update_deferr_401']) != ''
) { ) {
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '".$db->escape($_POST['update_deferr_401'])."');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err401', '".$db->escape($_POST['update_deferr_401'])."');");
$err401 = true; $err401 = true;
} }
if(isset($_POST['update_deferr_403']) if(isset($_POST['update_deferr_403'])
&& trim($_POST['update_deferr_403']) != '' && trim($_POST['update_deferr_403']) != ''
) { ) {
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '".$db->escape($_POST['update_deferr_403'])."');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err403', '".$db->escape($_POST['update_deferr_403'])."');");
$err403 = true; $err403 = true;
} }
if(isset($_POST['update_deferr_404']) if(isset($_POST['update_deferr_404'])
&& trim($_POST['update_deferr_404']) != '' && trim($_POST['update_deferr_404']) != ''
) { ) {
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '".$db->escape($_POST['update_deferr_404'])."');"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('defaultwebsrverrhandler', 'err404', '".$db->escape($_POST['update_deferr_404'])."');");
$err404 = true; $err404 = true;
@@ -672,17 +672,17 @@ if(isFroxlorVersion('0.9.6'))
showUpdateStep("Adding new tables to database"); showUpdateStep("Adding new tables to database");
$db->query("CREATE TABLE IF NOT EXISTS `redirect_codes` ( $db->query("CREATE TABLE IF NOT EXISTS `redirect_codes` (
`id` int(5) NOT NULL auto_increment, `id` int(5) NOT NULL auto_increment,
`code` varchar(3) NOT NULL, `code` varchar(3) NOT NULL,
`enabled` tinyint(1) DEFAULT '1', `enabled` tinyint(1) DEFAULT '1',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM;"); ) ENGINE=MyISAM;");
$db->query("CREATE TABLE IF NOT EXISTS `domain_redirect_codes` ( $db->query("CREATE TABLE IF NOT EXISTS `domain_redirect_codes` (
`rid` int(5) NOT NULL, `rid` int(5) NOT NULL,
`did` int(11) unsigned NOT NULL, `did` int(11) unsigned NOT NULL,
UNIQUE KEY `rc` (`rid`, `did`) UNIQUE KEY `rc` (`rid`, `did`)
) ENGINE=MyISAM;"); ) ENGINE=MyISAM;");
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Filling new tables with default data"); showUpdateStep("Filling new tables with default data");
@@ -1202,8 +1202,8 @@ if(isFroxlorVersion('0.9.14-svn6'))
/* /*
* revert database changes we did for multiserver-support * revert database changes we did for multiserver-support
* before branching - sorry guys :/ * before branching - sorry guys :/
*/ */
if(isFroxlorVersion('0.9.14-svn9')) if(isFroxlorVersion('0.9.14-svn9'))
{ {
showUpdateStep("Reverting multiserver-patches (svn)", false); showUpdateStep("Reverting multiserver-patches (svn)", false);
@@ -1396,17 +1396,17 @@ if(isFroxlorVersion('0.9.17-svn1'))
showUpdateStep("Adding new tables to database"); showUpdateStep("Adding new tables to database");
$db->query("CREATE TABLE IF NOT EXISTS `ipsandports_docrootsettings` ( $db->query("CREATE TABLE IF NOT EXISTS `ipsandports_docrootsettings` (
`id` int(5) NOT NULL auto_increment, `id` int(5) NOT NULL auto_increment,
`fid` int(11) NOT NULL, `fid` int(11) NOT NULL,
`docrootsettings` text NOT NULL, `docrootsettings` text NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM;"); ) ENGINE=MyISAM;");
$db->query("CREATE TABLE IF NOT EXISTS `domain_docrootsettings` ( $db->query("CREATE TABLE IF NOT EXISTS `domain_docrootsettings` (
`id` int(5) NOT NULL auto_increment, `id` int(5) NOT NULL auto_increment,
`fid` int(11) NOT NULL, `fid` int(11) NOT NULL,
`docrootsettings` text NOT NULL, `docrootsettings` text NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM;"); ) ENGINE=MyISAM;");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.17-svn2'); updateToVersion('0.9.17-svn2');
@@ -1553,7 +1553,7 @@ if(isFroxlorVersion('0.9.20.1'))
// The customer-table may miss the columns, if installed a fresh 0.9.20 or 0.9.20.1 - add them // The customer-table may miss the columns, if installed a fresh 0.9.20 or 0.9.20.1 - add them
$result = $db->query("DESCRIBE `" . TABLE_PANEL_CUSTOMERS . "`"); $result = $db->query("DESCRIBE `" . TABLE_PANEL_CUSTOMERS . "`");
$columnfound = 0; $columnfound = 0;
while($row = $db->fetch_array($result)) while($row = $db->fetch_array($result))
{ {
if($row['Field'] == 'backup_allowed') if($row['Field'] == 'backup_allowed')
{ {
@@ -1832,8 +1832,8 @@ if(isFroxlorVersion('0.9.27')) {
if ($db->num_rows($handle) < 1) { if ($db->num_rows($handle) < 1) {
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');");
} }
updateToVersion('0.9.28-svn1'); updateToVersion('0.9.28-svn1');
} }
if(isFroxlorVersion('0.9.28-svn1')) { if(isFroxlorVersion('0.9.28-svn1')) {
@@ -1844,9 +1844,9 @@ if(isFroxlorVersion('0.9.28-svn1')) {
$db->query("ALTER TABLE `panel_languages` ADD `iso` CHAR( 3 ) NOT NULL DEFAULT 'foo' AFTER `language`"); $db->query("ALTER TABLE `panel_languages` ADD `iso` CHAR( 3 ) NOT NULL DEFAULT 'foo' AFTER `language`");
$handle = $db->query("SELECT `language` FROM `panel_languages` WHERE `iso`='foo'"); $handle = $db->query("SELECT `language` FROM `panel_languages` WHERE `iso`='foo'");
$langauges = $db->fetch_array($handle); $langauges = $db->fetch_array($handle);
foreach($languages as $language){ foreach($languages as $language){
switch ($language) { switch ($language) {
case "Deutsch": case "Deutsch":
$db->query("UPDATE `panel_languages` SET `iso`='de' WHERE `language` = 'Deutsch'"); $db->query("UPDATE `panel_languages` SET `iso`='de' WHERE `language` = 'Deutsch'");
@@ -1910,10 +1910,10 @@ if(isFroxlorVersion('0.9.28-svn1')) {
if(isFroxlorVersion('0.9.28-svn2')) { if(isFroxlorVersion('0.9.28-svn2')) {
showUpdateStep("Updating from 0.9.28-svn2 to 0.9.28-svn3"); showUpdateStep("Updating from 0.9.28-svn2 to 0.9.28-svn3");
lastStepStatus(0); lastStepStatus(0);
// change lenght of passwd column // change lenght of passwd column
$db->query("ALTER TABLE `" . TABLE_FTP_USERS . "` MODIFY `password` varchar(128) NOT NULL default ''"); $db->query("ALTER TABLE `" . TABLE_FTP_USERS . "` MODIFY `password` varchar(128) NOT NULL default ''");
// Add default setting for vmail_maildirname if not already in place // Add default setting for vmail_maildirname if not already in place
$handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' AND `varname` = 'vmail_maildirname';"); $handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'system' AND `varname` = 'vmail_maildirname';");
if ($db->num_rows($handle) < 1) { if ($db->num_rows($handle) < 1) {
@@ -2092,9 +2092,16 @@ if (isFroxlorVersion('0.9.29-dev2')) {
showUpdateStep("Updating from 0.9.29-dev2 to 0.9.29-dev3", true); showUpdateStep("Updating from 0.9.29-dev2 to 0.9.29-dev3", true);
lastStepStatus(0); lastStepStatus(0);
$system_afxrservers = isset($_POST['system_afxrservers']) ? $_POST['system_afxrservers'] : ''; $system_afxrservers = isset($_POST['system_afxrservers']) ? trim($_POST['system_afxrservers']) : '';
if (!preg_match('/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})(, ?(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3}))*$/i', $system_afxrservers)) { if ($system_afxrservers != '') {
$system_afxrservers = ''; $axfrservers = explode(',', $system_afxrservers);
$newaxfrserver = array();
foreach ($axfrservers as $index => $axfrserver) {
if (validate_ip($axfrserver, true) !== false) {
$newaxfrserver[] = $axfrserver;
}
}
$system_afxrservers = implode(", ", $newaxfrserver);
} }
showUpdateStep("Inserting new setting for AFXR server", true); showUpdateStep("Inserting new setting for AFXR server", true);
$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'axfrservers', '".$db->escape($system_afxrservers)."');"); $db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'axfrservers', '".$db->escape($system_afxrservers)."');");

7
lib/functions/formfields/string/function.validateFormFieldString.php
View File

@@ -86,6 +86,13 @@ function validateFormFieldString($fieldname, $fielddata, $newfieldvalue)
$returnvalue = (($newfieldvalue == makeCorrectDir($newfieldvalue)) || ($newfieldvalue == makeCorrectFile($newfieldvalue))); $returnvalue = (($newfieldvalue == makeCorrectDir($newfieldvalue)) || ($newfieldvalue == makeCorrectFile($newfieldvalue)));
} }
} }
elseif (isset($fielddata['string_type']) && $fielddata['string_type'] == 'validate_ip') {
$newfieldvalue = validate_ip($newfieldvalue, true);
if ($newfieldvalue === false) {
$newfieldvalue = '';
}
$returnvalue = false;
}
elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) { elseif (preg_match('/^[^\r\n\t\f\0]*$/D', $newfieldvalue)) {
$returnvalue = true; $returnvalue = true;
} }

121
scripts/jobs/cron_tasks.inc.dns.10.bind.php
View File

@@ -19,11 +19,11 @@
/* /*
* This script creates the php.ini's used by mod_suPHP+php-cgi * This script creates the php.ini's used by mod_suPHP+php-cgi
*/ */
if(@php_sapi_name() != 'cli' if(@php_sapi_name() != 'cli'
&& @php_sapi_name() != 'cgi' && @php_sapi_name() != 'cgi'
&& @php_sapi_name() != 'cgi-fcgi') && @php_sapi_name() != 'cgi-fcgi')
{ {
die('This script only works in the shell.'); die('This script only works in the shell.');
} }
@@ -53,8 +53,8 @@ class bind
$nameserver.= '.'; $nameserver.= '.';
} }
$this->nameservers[] = array( $this->nameservers[] = array(
'hostname' => trim($nameserver), 'hostname' => trim($nameserver),
'ip' => trim($nameserver_ip) 'ip' => trim($nameserver_ip)
); );
} }
} }
@@ -73,7 +73,7 @@ class bind
if ($this->settings['system']['axfrservers'] != '') { if ($this->settings['system']['axfrservers'] != '') {
$axfrservers = explode(',', $this->settings['system']['axfrservers']); $axfrservers = explode(',', $this->settings['system']['axfrservers']);
foreach ($axfrservers as $axfrserver) { foreach ($axfrservers as $axfrserver) {
$this->axfrservers[] = trim($axfrservers); $this->axfrservers[] = trim($axfrserver);
} }
} }
} }
@@ -117,20 +117,27 @@ class bind
$bindconf_file.= ' file "' . makeCorrectFile($this->settings['system']['bindconf_directory'] . '/' . $domain['zonefile']) . '";' . "\n"; $bindconf_file.= ' file "' . makeCorrectFile($this->settings['system']['bindconf_directory'] . '/' . $domain['zonefile']) . '";' . "\n";
$bindconf_file.= ' allow-query { any; };' . "\n"; $bindconf_file.= ' allow-query { any; };' . "\n";
if (count($this->nameservers) > 0) { if (count($this->nameservers) > 0
|| count($this->axfrservers) > 0
) {
// open allow-transfer
$bindconf_file.= ' allow-transfer {' . "\n"; $bindconf_file.= ' allow-transfer {' . "\n";
foreach ($this->nameservers as $ns) { // put nameservers in allow-transfer
$bindconf_file.= ' ' . $ns['ip'] . ';' . "\n"; if (count($this->nameservers) > 0) {
} foreach ($this->nameservers as $ns) {
} $bindconf_file.= ' ' . $ns['ip'] . ';' . "\n";
// AXFR server #100
if (count($this->axfrservers) > 0) {
foreach ($this->axfrservers as $axfrserver) {
if (validate_ip($axfrserver, true) !== false) {
$bindconf_file.= ' ' . $axfrserver . ';' . "\n";
} }
} }
// AXFR server #100
if (count($this->axfrservers) > 0) {
foreach ($this->axfrservers as $axfrserver) {
if (validate_ip($axfrserver, true) !== false) {
$bindconf_file.= ' ' . $axfrserver . ';' . "\n";
}
}
}
// close allow-transfer
$bindconf_file.= '};' . "\n";
} }
$bindconf_file.= '};' . "\n"; $bindconf_file.= '};' . "\n";
@@ -148,7 +155,7 @@ class bind
$domains_dir = makeCorrectDir($this->settings['system']['bindconf_directory'] . '/domains/'); $domains_dir = makeCorrectDir($this->settings['system']['bindconf_directory'] . '/domains/');
if(file_exists($domains_dir) if(file_exists($domains_dir)
&& is_dir($domains_dir)) && is_dir($domains_dir))
{ {
$domain_file_dirhandle = opendir($domains_dir); $domain_file_dirhandle = opendir($domains_dir);
@@ -157,10 +164,10 @@ class bind
$full_filename = makeCorrectFile($domains_dir . '/' . $domain_filename); $full_filename = makeCorrectFile($domains_dir . '/' . $domain_filename);
if($domain_filename != '.' if($domain_filename != '.'
&& $domain_filename != '..' && $domain_filename != '..'
&& !in_array($domain_filename, $known_filenames) && !in_array($domain_filename, $known_filenames)
&& is_file($full_filename) && is_file($full_filename)
&& file_exists($full_filename)) && file_exists($full_filename))
{ {
fwrite($this->debugHandler, ' cron_tasks: Task4 - unlinking ' . $domain_filename . "\n"); fwrite($this->debugHandler, ' cron_tasks: Task4 - unlinking ' . $domain_filename . "\n");
$this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename); $this->logger->logAction(CRON_ACTION, LOG_WARNING, 'Deleting ' . $domain_filename);
@@ -230,7 +237,7 @@ class bind
{ {
$zonefile.= '@ IN MX ' . trim($mxserver) . "\n"; $zonefile.= '@ IN MX ' . trim($mxserver) . "\n";
} }
if($this->settings['system']['dns_createmailentry'] == '1') if($this->settings['system']['dns_createmailentry'] == '1')
{ {
$zonefile.= 'mail IN ' . $ip_a_record . "\n"; $zonefile.= 'mail IN ' . $ip_a_record . "\n";
@@ -245,9 +252,9 @@ class bind
/* /*
* @TODO domain-based spf-settings * @TODO domain-based spf-settings
*/ */
if($this->settings['spf']['use_spf'] == '1' if($this->settings['spf']['use_spf'] == '1'
/*&& $domain['spf'] == '1' */) /*&& $domain['spf'] == '1' */)
{ {
$zonefile.= $this->settings['spf']['spf_entry'] . "\n"; $zonefile.= $this->settings['spf']['spf_entry'] . "\n";
} }
@@ -291,38 +298,38 @@ class bind
while($subdomain = $this->db->fetch_array($subdomains)) while($subdomain = $this->db->fetch_array($subdomains))
{ {
if(filter_var($subdomain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) if(filter_var($subdomain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
{ {
$zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . ' IN A ' . $subdomain['ip'] . "\n"; $zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . ' IN A ' . $subdomain['ip'] . "\n";
/* Check whether to add a www.-prefix */ /* Check whether to add a www.-prefix */
if($domain['wwwserveralias'] == '1') if($domain['wwwserveralias'] == '1')
{ {
$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . ' IN A ' . $subdomain['ip'] . "\n"; $zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . ' IN A ' . $subdomain['ip'] . "\n";
} }
} }
elseif(filter_var($domain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) elseif(filter_var($domain['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
{ {
$zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . ' IN AAAA ' . $subdomain['ip'] . "\n"; $zonefile.= str_replace('.' . $domain['domain'], '', $subdomain['domain']) . ' IN AAAA ' . $subdomain['ip'] . "\n";
/* Check whether to add a www.-prefix */ /* Check whether to add a www.-prefix */
if($domain['wwwserveralias'] == '1') if($domain['wwwserveralias'] == '1')
{ {
$zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . ' IN AAAA ' . $subdomain['ip'] . "\n"; $zonefile.= str_replace('www.' . $domain['domain'], '', $subdomain['domain']) . ' IN AAAA ' . $subdomain['ip'] . "\n";
} }
} }
} }
return $zonefile; return $zonefile;
} }
private function generateDkim($domain) private function generateDkim($domain)
{ {
$zone_dkim = ''; $zone_dkim = '';
if($this->settings['dkim']['use_dkim'] == '1' if($this->settings['dkim']['use_dkim'] == '1'
&& $domain['dkim'] == '1' && $domain['dkim'] == '1'
&& $domain['dkim_pubkey'] != '') && $domain['dkim_pubkey'] != '')
{ {
// start // start
$dkim_txt = 'v=DKIM1;'; $dkim_txt = 'v=DKIM1;';
@@ -341,12 +348,12 @@ class bind
$alg.=$a.':'; $alg.=$a.':';
} }
} }
if($alg != '') if($alg != '')
{ {
$alg = substr($alg, 0, -1); $alg = substr($alg, 0, -1);
$dkim_txt.= 'h='.$alg.';'; $dkim_txt.= 'h='.$alg.';';
} }
// notes // notes
if(trim($this->settings['dkim']['dkim_notes'] != '')) if(trim($this->settings['dkim']['dkim_notes'] != ''))
{ {
@@ -355,16 +362,16 @@ class bind
// key // key
$dkim_txt.= 'k=rsa;p='.trim(preg_replace('/-----BEGIN PUBLIC KEY-----(.+)-----END PUBLIC KEY-----/s', '$1', str_replace("\n", '', $domain['dkim_pubkey']))).';'; $dkim_txt.= 'k=rsa;p='.trim(preg_replace('/-----BEGIN PUBLIC KEY-----(.+)-----END PUBLIC KEY-----/s', '$1', str_replace("\n", '', $domain['dkim_pubkey']))).';';
// service-type // service-type
if($this->settings['dkim']['dkim_servicetype'] == '1') if($this->settings['dkim']['dkim_servicetype'] == '1')
{ {
$dkim_txt.= 's=email;'; $dkim_txt.= 's=email;';
} }
// end-part // end-part
$dkim_txt.='t=s'; $dkim_txt.='t=s';
// split if necessary // split if necessary
$txt_record_split=''; $txt_record_split='';
$lbr=50; $lbr=50;
@@ -375,7 +382,7 @@ class bind
// dkim-entry // dkim-entry
$zone_dkim .= 'dkim_' . $domain['dkim_id'] . '._domainkey IN TXT ' . $txt_record_split; $zone_dkim .= 'dkim_' . $domain['dkim_id'] . '._domainkey IN TXT ' . $txt_record_split;
// adsp-entry // adsp-entry
if($this->settings['dkim']['dkim_add_adsp'] == "1") if($this->settings['dkim']['dkim_add_adsp'] == "1")
{ {
@@ -418,7 +425,7 @@ class bind
$pubkey_filename = makeCorrectFile($this->settings['dkim']['dkim_prefix'] . '/dkim_' . $domain['dkim_id'] . '.public'); $pubkey_filename = makeCorrectFile($this->settings['dkim']['dkim_prefix'] . '/dkim_' . $domain['dkim_id'] . '.public');
if($domain['dkim_privkey'] == '' if($domain['dkim_privkey'] == ''
|| $domain['dkim_pubkey'] == '') || $domain['dkim_pubkey'] == '')
{ {
$max_dkim_id = $this->db->query_first("SELECT MAX(`dkim_id`) as `max_dkim_id` FROM `" . TABLE_PANEL_DOMAINS . "`"); $max_dkim_id = $this->db->query_first("SELECT MAX(`dkim_id`) as `max_dkim_id` FROM `" . TABLE_PANEL_DOMAINS . "`");
$domain['dkim_id'] = (int)$max_dkim_id['max_dkim_id'] + 1; $domain['dkim_id'] = (int)$max_dkim_id['max_dkim_id'] + 1;
@@ -434,7 +441,7 @@ class bind
} }
if(!file_exists($privkey_filename) if(!file_exists($privkey_filename)
&& $domain['dkim_privkey'] != '') && $domain['dkim_privkey'] != '')
{ {
$privkey_file_handler = fopen($privkey_filename, "w"); $privkey_file_handler = fopen($privkey_filename, "w");
fwrite($privkey_file_handler, $domain['dkim_privkey']); fwrite($privkey_file_handler, $domain['dkim_privkey']);
@@ -443,7 +450,7 @@ class bind
} }
if(!file_exists($pubkey_filename) if(!file_exists($pubkey_filename)
&& $domain['dkim_pubkey'] != '') && $domain['dkim_pubkey'] != '')
{ {
$pubkey_file_handler = fopen($pubkey_filename, "w"); $pubkey_file_handler = fopen($pubkey_filename, "w");
fwrite($pubkey_file_handler, $domain['dkim_pubkey']); fwrite($pubkey_file_handler, $domain['dkim_pubkey']);