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

fix incorrect strings for AXFR in updater, thx to Max

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-10-03 16:09:59 +02:00
parent b43a55b9b8
commit 0ca935b553
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2092,19 +2092,19 @@ 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']) ? trim($_POST['system_afxrservers']) : ''; $system_axfrservers = isset($_POST['system_afxrservers']) ? trim($_POST['system_afxrservers']) : '';
if ($system_afxrservers != '') { if ($system_axfrservers != '') {
$axfrservers = explode(',', $system_afxrservers); $axfrservers = explode(',', $system_axfrservers);
$newaxfrserver = array(); $newaxfrserver = array();
foreach ($axfrservers as $index => $axfrserver) { foreach ($axfrservers as $index => $axfrserver) {
if (validate_ip($axfrserver, true) !== false) { if (validate_ip($axfrserver, true) !== false) {
$newaxfrserver[] = $axfrserver; $newaxfrserver[] = $axfrserver;
} }
} }
$system_afxrservers = implode(", ", $newaxfrserver); $system_axfrservers = implode(", ", $newaxfrserver);
} }
showUpdateStep("Inserting new setting for AFXR server", true); showUpdateStep("Inserting new setting for AXFR 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_axfrservers)."');");
lastStepStatus(0); lastStepStatus(0);
updateToVersion('0.9.29-dev3'); updateToVersion('0.9.29-dev3');

4
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -528,8 +528,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
if (versionInUpdate($current_version, '0.9.29-dev3')) { if (versionInUpdate($current_version, '0.9.29-dev3')) {
$has_preconfig = true; $has_preconfig = true;
$description = 'There is now a possibility to specify AFXR servers for your bind zone-configuration<br />'; $description = 'There is now a possibility to specify AXFR servers for your bind zone-configuration<br />';
$question = '<strong>Enter a comma-separated list of AFXR servers or leave empty (default):</strong>&nbsp;'; $question = '<strong>Enter a comma-separated list of AXFR servers or leave empty (default):</strong>&nbsp;';
$question.= '<input type="text" class="text" name="system_afxrservers" value="" />'; $question.= '<input type="text" class="text" name="system_afxrservers" value="" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
} }