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

- possibility to specify perl path (only necessary on lighttpd)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-07-22 06:56:17 +00:00
parent 9191bc6c08
commit eaf70765d5
8 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -909,3 +909,17 @@ if(isFroxlorVersion('0.9.11-svn1'))
updateToVersion('0.9.11-svn2');
}
if(isFroxlorVersion('0.9.11-svn2'))
{
showUpdateStep("Updating from 0.9.11-svn2 to 0.9.11-svn3", false);
$update_perlpath = isset($_POST['update_perlpath']) ? $_POST['update_perlpath'] : '/usr/bin/perl';
showUpdateStep("Adding new settings");
$db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'perl_path', '".$db->escape($update_perlpath)."');");
lastStepStatus(0);
updateToVersion('0.9.11-svn3');
}

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

@@ -229,4 +229,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
$question.= '<input type="text" class="text" name="update_pwdregex" value="" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if(versionInUpdate($current_version, '0.9.11-svn3'))
{
$has_preconfig = true;
$description = 'As Froxlor can now handle perl, you have to specify where the perl executable is (only if you\'re running lighttpd, else just leave empty).';
$question = '<strong>Path to perl (default \'/usr/bin/perl\'):</strong>&nbsp;';
$question.= '<input type="text" class="text" name="update_perlpath" value="/usr/bin/perl" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}