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

fixed last remaining function calls which are class-methods now

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-23 19:34:32 +01:00
parent e1987af34d
commit 4cd005051b
13 changed files with 128 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_domains.php
View File

@@ -608,7 +608,7 @@ if ($page == 'domains' || $page == 'overview') {
FROM `" . TABLE_PANEL_PHPCONFIGS . "` c FROM `" . TABLE_PANEL_PHPCONFIGS . "` c
LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid LEFT JOIN `" . TABLE_PANEL_FPMDAEMONS . "` fc ON fc.id = c.fpmsettingid
"); ");
$c_allowed_configs = getCustomerDetail($result['customerid'], 'allowed_phpconfigs'); $c_allowed_configs = \Froxlor\Customer\Customer::getCustomerDetail($result['customerid'], 'allowed_phpconfigs');
if (! empty($c_allowed_configs)) { if (! empty($c_allowed_configs)) {
$c_allowed_configs = json_decode($c_allowed_configs, true); $c_allowed_configs = json_decode($c_allowed_configs, true);
} else { } else {
@@ -640,7 +640,7 @@ if ($page == 'domains' || $page == 'overview') {
} elseif ($action == 'jqGetCustomerPHPConfigs') { } elseif ($action == 'jqGetCustomerPHPConfigs') {
$customerid = intval($_POST['customerid']); $customerid = intval($_POST['customerid']);
$allowed_phpconfigs = getCustomerDetail($customerid, 'allowed_phpconfigs'); $allowed_phpconfigs = \Froxlor\Customer\Customer::getCustomerDetail($customerid, 'allowed_phpconfigs');
echo ! empty($allowed_phpconfigs) ? $allowed_phpconfigs : json_encode(array()); echo ! empty($allowed_phpconfigs) ? $allowed_phpconfigs : json_encode(array());
exit(); exit();
} elseif ($action == 'import') { } elseif ($action == 'import') {

2
admin_index.php
View File

@@ -179,7 +179,7 @@ if ($page == 'overview') {
if (isset($_POST['send']) && $_POST['send'] == 'send') { if (isset($_POST['send']) && $_POST['send'] == 'send') {
$old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password'); $old_password = \Froxlor\Validate\Validate::validate($_POST['old_password'], 'old password');
if (! validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) { if (! \Froxlor\System\Crypt::validatePasswordLogin($userinfo, $old_password, TABLE_PANEL_ADMINS, 'adminid')) {
\Froxlor\UI\Response::standard_error('oldpasswordnotcorrect'); \Froxlor\UI\Response::standard_error('oldpasswordnotcorrect');
} }

2
customer_index.php
View File

@@ -125,7 +125,7 @@ if ($page == 'overview') {
} }
$new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password'); $new_password = \Froxlor\System\Crypt::validatePassword($_POST['new_password'], 'new password');
$new_password_confirm = validatePassword($_POST['new_password_confirm'], 'new password confirm'); $new_password_confirm = \Froxlor\System\Crypt::validatePassword($_POST['new_password_confirm'], 'new password confirm');
if ($old_password == '') { if ($old_password == '') {
\Froxlor\UI\Response::standard_error(array( \Froxlor\UI\Response::standard_error(array(

2
index.php
View File

@@ -134,7 +134,7 @@ if ($action == '2fa_entercode') {
$row2 = $stmt->fetch(PDO::FETCH_ASSOC); $row2 = $stmt->fetch(PDO::FETCH_ASSOC);
if (isset($row2['customerid']) && $row2['customerid'] > 0) { if (isset($row2['customerid']) && $row2['customerid'] > 0) {
$loginname = getCustomerDetail($row2['customerid'], 'loginname'); $loginname = \Froxlor\Customer\Customer::getCustomerDetail($row2['customerid'], 'loginname');
if ($loginname !== false) { if ($loginname !== false) {
$stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "` $stmt = Database::prepare("SELECT `loginname` AS `customer` FROM `" . TABLE_PANEL_CUSTOMERS . "`
WHERE `loginname`= :loginname"); WHERE `loginname`= :loginname");

3
install/install.php
View File

@@ -15,7 +15,8 @@
* @package Install * @package Install
* *
*/ */
require 'lib/class.FroxlorInstall.php'; require dirname(__DIR__) . '/vendor/autoload.php';
require __DIR__ . '/lib/class.FroxlorInstall.php';
$frxinstall = new FroxlorInstall(); $frxinstall = new FroxlorInstall();
$frxinstall->run(); $frxinstall->run();

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

@@ -477,7 +477,7 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.9.6-svn1')) {
showUpdateStep("Updating from 0.9.6-svn1 to 0.9.6-svn2", false); showUpdateStep("Updating from 0.9.6-svn1 to 0.9.6-svn2", false);
$update_adminmail = isset($_POST['update_adminmail']) ? validate($_POST['update_adminmail'], 'update_adminmail') : false; $update_adminmail = isset($_POST['update_adminmail']) ? Froxlor\Validate\Validate::validate($_POST['update_adminmail'], 'update_adminmail') : false;
$do_update = true; $do_update = true;
if ($update_adminmail !== false) { if ($update_adminmail !== false) {

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

@@ -42,7 +42,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question = '<strong>Do you want to use wildcard-entries for existing domains?:</strong>&nbsp;'; $question = '<strong>Do you want to use wildcard-entries for existing domains?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_domainwildcardentry', '1', '0', '1'); $question .= \Froxlor\UI\HTML::makeyesno('update_domainwildcardentry', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.6-svn2')) { if (versionInUpdate($current_version, '0.9.6-svn2')) {
@@ -50,7 +50,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true; $has_preconfig = true;
$description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.'; $description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
$question = '<strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" class="text" name="update_adminmail" value="' . Settings::Get('panel.adminmail') . '" />'; $question = '<strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" class="text" name="update_adminmail" value="' . Settings::Get('panel.adminmail') . '" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -65,7 +65,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= 'Path/URL for error 403:&nbsp;<input type="text" class="text" name="update_deferr_403" /><br /><br />'; $question .= 'Path/URL for error 403:&nbsp;<input type="text" class="text" name="update_deferr_403" /><br /><br />';
} }
$question .= 'Path/URL for error 404:&nbsp;<input type="text" class="text" name="update_deferr_404" />'; $question .= 'Path/URL for error 404:&nbsp;<input type="text" class="text" name="update_deferr_404" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.6-svn4')) { if (versionInUpdate($current_version, '0.9.6-svn4')) {
@@ -73,11 +73,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.'; $description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
$question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;'; $question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;';
$question .= '<select name="update_deftic_priority">'; $question .= '<select name="update_deftic_priority">';
$priorities = makeoption($lng['ticket']['high'], '1', '2'); $priorities = \Froxlor\UI\HTML::makeoption($lng['ticket']['high'], '1', '2');
$priorities .= makeoption($lng['ticket']['normal'], '2', '2'); $priorities .= \Froxlor\UI\HTML::makeoption($lng['ticket']['normal'], '2', '2');
$priorities .= makeoption($lng['ticket']['low'], '3', '2'); $priorities .= \Froxlor\UI\HTML::makeoption($lng['ticket']['low'], '3', '2');
$question .= $priorities . '</select>'; $question .= $priorities . '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.6-svn5')) { if (versionInUpdate($current_version, '0.9.6-svn5')) {
@@ -88,10 +88,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs(); $configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs();
$configs = ''; $configs = '';
foreach ($configs_array as $idx => $desc) { foreach ($configs_array as $idx => $desc) {
$configs .= makeoption($desc, $idx, '1'); $configs .= \Froxlor\UI\HTML::makeoption($desc, $idx, '1');
} }
$question .= $configs . '</select>'; $question .= $configs . '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.6-svn6')) { if (versionInUpdate($current_version, '0.9.6-svn6')) {
@@ -99,10 +99,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.'; $description = 'For the new FTP-quota feature, you can now chose the currently used ftpd-software.';
$question = '<strong>Used FTPd-software:</strong>&nbsp;'; $question = '<strong>Used FTPd-software:</strong>&nbsp;';
$question .= '<select name="update_defsys_ftpserver">'; $question .= '<select name="update_defsys_ftpserver">';
$question .= makeoption('ProFTPd', 'proftpd', 'proftpd'); $question .= \Froxlor\UI\HTML::makeoption('ProFTPd', 'proftpd', 'proftpd');
$question .= makeoption('PureFTPd', 'pureftpd', 'proftpd'); $question .= \Froxlor\UI\HTML::makeoption('PureFTPd', 'pureftpd', 'proftpd');
$question .= '</select>'; $question .= '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.7-svn1')) { if (versionInUpdate($current_version, '0.9.7-svn1')) {
@@ -112,13 +112,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= \Froxlor\UI\HTML::makeyesno('update_customredirect_enable', '1', '0', '1') . '<br /><br />'; $question .= \Froxlor\UI\HTML::makeyesno('update_customredirect_enable', '1', '0', '1') . '<br /><br />';
$question .= '<strong>Select default redirect code (default: empty):</strong>&nbsp;'; $question .= '<strong>Select default redirect code (default: empty):</strong>&nbsp;';
$question .= '<select name="update_customredirect_default">'; $question .= '<select name="update_customredirect_default">';
$redirects = makeoption('--- (' . $lng['redirect_desc']['rc_default'] . ')', 1, '1'); $redirects = \Froxlor\UI\HTML::makeoption('--- (' . $lng['redirect_desc']['rc_default'] . ')', 1, '1');
$redirects .= makeoption('301 (' . $lng['redirect_desc']['rc_movedperm'] . ')', 2, '1'); $redirects .= \Froxlor\UI\HTML::makeoption('301 (' . $lng['redirect_desc']['rc_movedperm'] . ')', 2, '1');
$redirects .= makeoption('302 (' . $lng['redirect_desc']['rc_found'] . ')', 3, '1'); $redirects .= \Froxlor\UI\HTML::makeoption('302 (' . $lng['redirect_desc']['rc_found'] . ')', 3, '1');
$redirects .= makeoption('303 (' . $lng['redirect_desc']['rc_seeother'] . ')', 4, '1'); $redirects .= \Froxlor\UI\HTML::makeoption('303 (' . $lng['redirect_desc']['rc_seeother'] . ')', 4, '1');
$redirects .= makeoption('307 (' . $lng['redirect_desc']['rc_tempred'] . ')', 5, '1'); $redirects .= \Froxlor\UI\HTML::makeoption('307 (' . $lng['redirect_desc']['rc_tempred'] . ')', 5, '1');
$question .= $redirects . '</select>'; $question .= $redirects . '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.7-svn2')) { if (versionInUpdate($current_version, '0.9.7-svn2')) {
@@ -138,7 +138,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<li>' . $idna_convert->decode($domain) . '</li>'; $question .= '<li>' . $idna_convert->decode($domain) . '</li>';
} }
$question .= '</ul>'; $question .= '</ul>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -147,7 +147,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.'; $description = 'When entering MX servers to Froxlor there was no mail-, imap-, pop3- and smtp-"A record" created. You can now chose whether this should be done or not.';
$question = '<strong>Do you want these A-records to be created even with MX servers given?:</strong>&nbsp;'; $question = '<strong>Do you want these A-records to be created even with MX servers given?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_defdns_mailentry', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_defdns_mailentry', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.10-svn1')) { if (versionInUpdate($current_version, '0.9.10-svn1')) {
@@ -192,7 +192,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question = $question2; $question = $question2;
} }
} }
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -201,7 +201,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'you can now decide whether Froxlor should be reached via hostname/froxlor or directly via the hostname.'; $description = 'you can now decide whether Froxlor should be reached via hostname/froxlor or directly via the hostname.';
$question = '<strong>Do you want Froxlor to be reached directly via the hostname?:</strong>&nbsp;'; $question = '<strong>Do you want Froxlor to be reached directly via the hostname?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_directlyviahostname', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_directlyviahostname', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.11-svn1')) { if (versionInUpdate($current_version, '0.9.11-svn1')) {
@@ -209,7 +209,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'It is possible to enhance security with setting a regular expression to force your customers to enter more complex passwords.'; $description = 'It is possible to enhance security with setting a regular expression to force your customers to enter more complex passwords.';
$question = '<strong>Enter a regular expression to force a higher password complexity (leave empty for none):</strong>&nbsp;'; $question = '<strong>Enter a regular expression to force a higher password complexity (leave empty for none):</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_pwdregex" value="" />'; $question .= '<input type="text" class="text" name="update_pwdregex" value="" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.11-svn3')) { if (versionInUpdate($current_version, '0.9.11-svn3')) {
@@ -217,7 +217,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$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).'; $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 = '<strong>Path to perl (default \'/usr/bin/perl\'):</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_perlpath" value="/usr/bin/perl" />'; $question .= '<input type="text" class="text" name="update_perlpath" value="/usr/bin/perl" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.12-svn1')) { if (versionInUpdate($current_version, '0.9.12-svn1')) {
@@ -231,7 +231,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="update_fcgid_httpuser" value="froxlorlocal" /><br /><br />'; $question .= '<input type="text" class="text" name="update_fcgid_httpuser" value="froxlorlocal" /><br /><br />';
$question .= 'Local group:&nbsp;'; $question .= 'Local group:&nbsp;';
$question .= '<input type="text" class="text" name="update_fcgid_httpgroup" value="froxlorlocal" /><br />'; $question .= '<input type="text" class="text" name="update_fcgid_httpgroup" value="froxlorlocal" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -243,7 +243,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<strong>If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:</strong><br /><br />'; $question .= '<strong>If \'yes\', please specify a path within the suexec path where Froxlor will create symlinks to customer perl-enabled paths:</strong><br /><br />';
$question .= 'Path for symlinks (must be within suexec path):&nbsp;'; $question .= 'Path for symlinks (must be within suexec path):&nbsp;';
$question .= '<input type="text" class="text" name="update_perl_suexecpath" value="/var/www/cgi-bin/" /><br />'; $question .= '<input type="text" class="text" name="update_perl_suexecpath" value="/var/www/cgi-bin/" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.12-svn4')) { if (versionInUpdate($current_version, '0.9.12-svn4')) {
@@ -252,7 +252,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.'; $description = 'Due to different paths of awstats_buildstaticpages.pl and awstats.pl you can set a different path for awstats.pl now.';
$question = '<strong>Path to \'awstats.pl\'?:</strong>&nbsp;'; $question = '<strong>Path to \'awstats.pl\'?:</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_awstats_awstatspath" value="' . Settings::Get('system.awstats_path') . '" /><br />'; $question .= '<input type="text" class="text" name="update_awstats_awstatspath" value="' . Settings::Get('system.awstats_path') . '" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -262,7 +262,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).'; $description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).';
$question = '<strong>How many autoresponders should your customers be able to add?:</strong>&nbsp;'; $question = '<strong>How many autoresponders should your customers be able to add?:</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_autoresponder_default" value="0" />&nbsp;' . \Froxlor\UI\HTML::makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true) . '<br />'; $question .= '<input type="text" class="text" name="update_autoresponder_default" value="0" />&nbsp;' . \Froxlor\UI\HTML::makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true) . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -275,10 +275,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs(); $configs_array = \Froxlor\Http\PhpConfig::getPhpConfigs();
$configs = ''; $configs = '';
foreach ($configs_array as $idx => $desc) { foreach ($configs_array as $idx => $desc) {
$configs .= makeoption($desc, $idx, '1'); $configs .= \Froxlor\UI\HTML::makeoption($desc, $idx, '1');
} }
$question .= $configs . '</select>'; $question .= $configs . '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -288,7 +288,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.'; $description = 'To have icons in AWStats statistic-pages please enter the path to AWStats icons folder.';
$question = '<strong>Path to AWSTats icons folder:</strong>&nbsp;'; $question = '<strong>Path to AWSTats icons folder:</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_awstats_icons" value="' . Settings::Get('system.awstats_icons') . '" />'; $question .= '<input type="text" class="text" name="update_awstats_icons" value="' . Settings::Get('system.awstats_icons') . '" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -298,7 +298,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Froxlor now has the possibility to set \'SSLCertificateChainFile\' for the apache webserver.'; $description = 'Froxlor now has the possibility to set \'SSLCertificateChainFile\' for the apache webserver.';
$question = '<strong>Enter filename (leave empty for none):</strong>&nbsp;'; $question = '<strong>Enter filename (leave empty for none):</strong>&nbsp;';
$question .= '<input type="text" class="text" name="update_ssl_cert_chainfile" value="' . Settings::Get('system.ssl_cert_chainfile') . '" />'; $question .= '<input type="text" class="text" name="update_ssl_cert_chainfile" value="' . Settings::Get('system.ssl_cert_chainfile') . '" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -307,14 +307,14 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can now allow customers to use any of their domains as username for the login.'; $description = 'You can now allow customers to use any of their domains as username for the login.';
$question = '<strong>Do you want to enable domain-login for all customers?:</strong>&nbsp;'; $question = '<strong>Do you want to enable domain-login for all customers?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_allow_domain_login', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_allow_domain_login', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.14-svn10')) { if (versionInUpdate($current_version, '0.9.14-svn10')) {
$has_preconfig = true; $has_preconfig = true;
$description = '<strong>This update removes the unsupported real-time option. Additionally the deprecated tables for navigation and cronscripts are removed, any modules using these tables need to be updated to the new structure!</strong>'; $description = '<strong>This update removes the unsupported real-time option. Additionally the deprecated tables for navigation and cronscripts are removed, any modules using these tables need to be updated to the new structure!</strong>';
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.16-svn1')) { if (versionInUpdate($current_version, '0.9.16-svn1')) {
@@ -332,8 +332,8 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="update_phpfpm_reload" value="/etc/init.d/php-fpm restart" /><br /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_reload" value="/etc/init.d/php-fpm restart" /><br /><br />';
$question .= 'Please specify the php-fpm rocess manager control:&nbsp;'; $question .= 'Please specify the php-fpm rocess manager control:&nbsp;';
$question .= '<select name="update_phpfpm_pm">'; $question .= '<select name="update_phpfpm_pm">';
$redirects = makeoption('static', 'static', 'static'); $redirects = \Froxlor\UI\HTML::makeoption('static', 'static', 'static');
$redirects .= makeoption('dynamic', 'dynamic', 'static'); $redirects .= \Froxlor\UI\HTML::makeoption('dynamic', 'dynamic', 'static');
$question .= $redirects . '</select><br /><br />'; $question .= $redirects . '</select><br /><br />';
$question .= 'Please specify the number of child processes:&nbsp;'; $question .= 'Please specify the number of child processes:&nbsp;';
$question .= '<input type="text" class="text" name="update_phpfpm_max_children" value="1" /><br /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_max_children" value="1" /><br /><br />';
@@ -346,7 +346,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="update_phpfpm_min_spare_servers" value="5" /><br /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_min_spare_servers" value="5" /><br /><br />';
$question .= 'Please specify the desired maximum number of idle server processes:&nbsp;'; $question .= 'Please specify the desired maximum number of idle server processes:&nbsp;';
$question .= '<input type="text" class="text" name="update_phpfpm_max_spare_servers" value="35" /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_max_spare_servers" value="35" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.16-svn2')) { if (versionInUpdate($current_version, '0.9.16-svn2')) {
@@ -360,7 +360,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="update_phpfpm_httpuser" value="' . Settings::Get('system.mod_fcgid_httpuser') . '" /><br /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_httpuser" value="' . Settings::Get('system.mod_fcgid_httpuser') . '" /><br /><br />';
$question .= 'Local group:&nbsp;'; $question .= 'Local group:&nbsp;';
$question .= '<input type="text" class="text" name="update_phpfpm_httpgroup" value="' . Settings::Get('system.mod_fcgid_httpgroup') . '" /><br />'; $question .= '<input type="text" class="text" name="update_phpfpm_httpgroup" value="' . Settings::Get('system.mod_fcgid_httpgroup') . '" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -374,7 +374,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="update_system_report_webmax" value="90" /><br /><br />'; $question .= '<input type="text" class="text" name="update_system_report_webmax" value="90" /><br /><br />';
$question .= 'Traffic warning level:&nbsp;'; $question .= 'Traffic warning level:&nbsp;';
$question .= '<input type="text" class="text" name="update_system_report_trafficmax" value="90" /><br />'; $question .= '<input type="text" class="text" name="update_system_report_trafficmax" value="90" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.18-svn2')) { if (versionInUpdate($current_version, '0.9.18-svn2')) {
@@ -385,10 +385,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$themes = \Froxlor\UI\Template::getThemes(); $themes = \Froxlor\UI\Template::getThemes();
foreach ($themes as $cur_theme) // $theme is already in use foreach ($themes as $cur_theme) // $theme is already in use
{ {
$question .= makeoption($cur_theme, $cur_theme, 'Froxlor'); $question .= \Froxlor\UI\HTML::makeoption($cur_theme, $cur_theme, 'Froxlor');
} }
$question .= '</select>'; $question .= '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.28-svn4')) { if (versionInUpdate($current_version, '0.9.28-svn4')) {
@@ -403,11 +403,11 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<select name="classic_theme_replacement">'; $question .= '<select name="classic_theme_replacement">';
$themes = \Froxlor\UI\Template::getThemes(); $themes = \Froxlor\UI\Template::getThemes();
foreach ($themes as $cur_theme) { foreach ($themes as $cur_theme) {
$question .= makeoption($cur_theme, $cur_theme, 'Froxlor'); $question .= \Froxlor\UI\HTML::makeoption($cur_theme, $cur_theme, 'Froxlor');
} }
$question .= '</select>'; $question .= '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.28-svn6')) { if (versionInUpdate($current_version, '0.9.28-svn6')) {
@@ -419,13 +419,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
LoadModule authz_host_module modules/mod_authz_host.so</pre><br />'; LoadModule authz_host_module modules/mod_authz_host.so</pre><br />';
$question = '<strong>Do you want to enable the Apache-2.4 modification?:</strong>&nbsp;'; $question = '<strong>Do you want to enable the Apache-2.4 modification?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_system_apache24', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_system_apache24', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} elseif (Settings::Get('system.webserver') == 'nginx') { } elseif (Settings::Get('system.webserver') == 'nginx') {
$has_preconfig = true; $has_preconfig = true;
$description = 'The path to nginx\'s fastcgi_params file is now customizable.<br /><br />'; $description = 'The path to nginx\'s fastcgi_params file is now customizable.<br /><br />';
$question = '<strong>Please enter full path to you nginx/fastcgi_params file (including filename):</strong>&nbsp;'; $question = '<strong>Please enter full path to you nginx/fastcgi_params file (including filename):</strong>&nbsp;';
$question .= '<input type="text" class="text" name="nginx_fastcgi_params" value="/etc/nginx/fastcgi_params" />'; $question .= '<input type="text" class="text" name="nginx_fastcgi_params" value="/etc/nginx/fastcgi_params" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -439,7 +439,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question = '<strong>Do you want to automatically append the domain-name to the documentroot of newly created domains?:</strong>&nbsp;'; $question = '<strong>Do you want to automatically append the domain-name to the documentroot of newly created domains?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_system_documentroot_use_default_value', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_system_documentroot_use_default_value', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.28')) { if (versionInUpdate($current_version, '0.9.28')) {
@@ -457,7 +457,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
} }
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.29-dev1')) { if (versionInUpdate($current_version, '0.9.29-dev1')) {
@@ -467,7 +467,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Standard-subdomains can now be hidden from the php-configuration overview.<br />'; $description = 'Standard-subdomains can now be hidden from the php-configuration overview.<br />';
$question = '<strong>Do you want to hide the standard-subdomains (this can be changed in the settings any time)?:</strong>&nbsp;'; $question = '<strong>Do you want to hide the standard-subdomains (this can be changed in the settings any time)?:</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('hide_stdsubdomains', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('hide_stdsubdomains', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -477,7 +477,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question = '<strong>If you want to disallow theme-changing, select "no" from the dropdowns:</strong>&nbsp;'; $question = '<strong>If you want to disallow theme-changing, select "no" from the dropdowns:</strong>&nbsp;';
$question .= "Admins: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_a', '1', '0', '1') . '&nbsp;&nbsp;'; $question .= "Admins: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_a', '1', '0', '1') . '&nbsp;&nbsp;';
$question .= "Customers: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_c', '1', '0', '1'); $question .= "Customers: " . \Froxlor\UI\HTML::makeyesno('allow_themechange_c', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.29-dev3')) { if (versionInUpdate($current_version, '0.9.29-dev3')) {
@@ -485,7 +485,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'There is now a possibility to specify AXFR 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 AXFR 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.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.29-dev4')) { if (versionInUpdate($current_version, '0.9.29-dev4')) {
@@ -493,14 +493,14 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored<br />'; $description = 'As customers can now specify ssl-certificate data for their domains, you need to specify where the generated files are stored<br />';
$question = '<strong>Specify the directory for customer ssl-certificates:</strong>&nbsp;'; $question = '<strong>Specify the directory for customer ssl-certificates:</strong>&nbsp;';
$question .= '<input type="text" class="text" name="system_customersslpath" value="/etc/ssl/froxlor-custom/" />'; $question .= '<input type="text" class="text" name="system_customersslpath" value="/etc/ssl/froxlor-custom/" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.29.1-dev3')) { if (versionInUpdate($current_version, '0.9.29.1-dev3')) {
$has_preconfig = true; $has_preconfig = true;
$description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.'; $description = 'The build in logrotation-feature has been removed. Please follow the configuration-instructions for your system to enable logrotating again.';
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
// let the apache+fpm users know that they MUST change their config // let the apache+fpm users know that they MUST change their config
@@ -519,7 +519,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
&lt;/Location&gt; &lt;/Location&gt;
&lt;/IfModule&gt;</pre>'; &lt;/IfModule&gt;</pre>';
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -528,7 +528,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true; $has_preconfig = true;
$description = 'The FPM socket directory is now a setting in froxlor. Its default is <b>/var/lib/apache2/fastcgi/</b>.<br/>If you are using <b>/var/run/apache2</b> in the "<b>fastcgi.conf</b>" (Debian/Ubuntu) or "<b>70_fastcgi.conf</b>" (Gentoo) please correct this path accordingly<br />'; $description = 'The FPM socket directory is now a setting in froxlor. Its default is <b>/var/lib/apache2/fastcgi/</b>.<br/>If you are using <b>/var/run/apache2</b> in the "<b>fastcgi.conf</b>" (Debian/Ubuntu) or "<b>70_fastcgi.conf</b>" (Gentoo) please correct this path accordingly<br />';
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -536,7 +536,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$has_preconfig = true; $has_preconfig = true;
$description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates!<br />'; $description = 'The template-variable {PASSWORD} has been replaced with {LINK}. Please update your password reset templates!<br />';
$question = ''; $question = '';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.31-dev5')) { if (versionInUpdate($current_version, '0.9.31-dev5')) {
@@ -546,7 +546,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= \Froxlor\UI\HTML::makeyesno('update_error_report_admin', '1', '0', '1') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('update_error_report_admin', '1', '0', '1') . '<br />';
$question .= '<strong>Do you want to enable error-reporting for customers? (default: no):</strong>&nbsp;'; $question .= '<strong>Do you want to enable error-reporting for customers? (default: no):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_error_report_customer', '1', '0', '0'); $question .= \Froxlor\UI\HTML::makeyesno('update_error_report_customer', '1', '0', '0');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.31-rc2')) { if (versionInUpdate($current_version, '0.9.31-rc2')) {
@@ -554,7 +554,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can enable/disable the display/usage of the news-feed for admins<br /><br />'; $description = 'You can enable/disable the display/usage of the news-feed for admins<br /><br />';
$question = '<strong>Do you want to enable the news-feed for admins? (default: yes):</strong>&nbsp;'; $question = '<strong>Do you want to enable the news-feed for admins? (default: yes):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('update_admin_news_feed', '1', '0', '1') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('update_admin_news_feed', '1', '0', '1') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.32-dev2')) { if (versionInUpdate($current_version, '0.9.32-dev2')) {
@@ -565,20 +565,20 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<strong>Mail Transfer Agent</strong><br />'; $question .= '<strong>Mail Transfer Agent</strong><br />';
$question .= 'Type of your MTA:&nbsp;'; $question .= 'Type of your MTA:&nbsp;';
$question .= '<select name="mtaserver">'; $question .= '<select name="mtaserver">';
$question .= makeoption('Postfix', 'postfix', 'postfix'); $question .= \Froxlor\UI\HTML::makeoption('Postfix', 'postfix', 'postfix');
$question .= makeoption('Exim4', 'exim4', 'postfix'); $question .= \Froxlor\UI\HTML::makeoption('Exim4', 'exim4', 'postfix');
$question .= '</select><br />'; $question .= '</select><br />';
$question .= 'Logfile for your MTA:&nbsp;'; $question .= 'Logfile for your MTA:&nbsp;';
$question .= '<input type="text" class="text" name="mtalog" value="/var/log/mail.log" /><br />'; $question .= '<input type="text" class="text" name="mtalog" value="/var/log/mail.log" /><br />';
$question .= '<strong>Mail Delivery Agent</strong><br />'; $question .= '<strong>Mail Delivery Agent</strong><br />';
$question .= 'Type of your MDA:&nbsp;'; $question .= 'Type of your MDA:&nbsp;';
$question .= '<select name="mdaserver">'; $question .= '<select name="mdaserver">';
$question .= makeoption('Dovecot', 'dovecot', 'dovecot'); $question .= \Froxlor\UI\HTML::makeoption('Dovecot', 'dovecot', 'dovecot');
$question .= makeoption('Courier', 'courier', 'dovecot'); $question .= \Froxlor\UI\HTML::makeoption('Courier', 'courier', 'dovecot');
$question .= '</select><br /><br />'; $question .= '</select><br /><br />';
$question .= 'Logfile for your MDA:&nbsp;'; $question .= 'Logfile for your MDA:&nbsp;';
$question .= '<input type="text" class="text" name="mdalog" value="/var/log/mail.log" /><br />'; $question .= '<input type="text" class="text" name="mdalog" value="/var/log/mail.log" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.32-dev5')) { if (versionInUpdate($current_version, '0.9.32-dev5')) {
@@ -586,7 +586,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Froxlor now generates a cron-configuration file for the cron-daemon. Please set a filename which will be included automatically by your crond (e.g. files in /etc/cron.d/)<br /><br />'; $description = 'Froxlor now generates a cron-configuration file for the cron-daemon. Please set a filename which will be included automatically by your crond (e.g. files in /etc/cron.d/)<br /><br />';
$question = '<strong>Path to the cron-service configuration-file.</strong> This file will be updated regularly and automatically by froxlor.<br />Note: please <b>be sure</b> to use the same filename as for the main froxlor cronjob (default: /etc/cron.d/froxlor)!<br />'; $question = '<strong>Path to the cron-service configuration-file.</strong> This file will be updated regularly and automatically by froxlor.<br />Note: please <b>be sure</b> to use the same filename as for the main froxlor cronjob (default: /etc/cron.d/froxlor)!<br />';
$question .= '<input type="text" class="text" name="crondfile" value="/etc/cron.d/froxlor" /><br />'; $question .= '<input type="text" class="text" name="crondfile" value="/etc/cron.d/froxlor" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.32-dev6')) { if (versionInUpdate($current_version, '0.9.32-dev6')) {
@@ -594,7 +594,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'In order for the new cron.d file to work properly, we need to know about the cron-service reload command.<br /><br />'; $description = 'In order for the new cron.d file to work properly, we need to know about the cron-service reload command.<br /><br />';
$question = '<strong>Please specify the reload-command of your cron-daemon</strong> (default: /etc/init.d/cron reload)<br />'; $question = '<strong>Please specify the reload-command of your cron-daemon</strong> (default: /etc/init.d/cron reload)<br />';
$question .= '<input type="text" class="text" name="crondreload" value="/etc/init.d/cron reload" /><br />'; $question .= '<input type="text" class="text" name="crondreload" value="/etc/init.d/cron reload" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.32-rc2')) { if (versionInUpdate($current_version, '0.9.32-rc2')) {
@@ -602,7 +602,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'To customize the command which executes the cronjob (php - basically) change the path below according to your system.<br /><br />'; $description = 'To customize the command which executes the cronjob (php - basically) change the path below according to your system.<br /><br />';
$question = '<strong>Please specify the command to execute cronscripts</strong> (default: "/usr/bin/nice -n 5 /usr/bin/php5 -q")<br />'; $question = '<strong>Please specify the command to execute cronscripts</strong> (default: "/usr/bin/nice -n 5 /usr/bin/php5 -q")<br />';
$question .= '<input type="text" class="text" name="croncmdline" value="/usr/bin/nice -n 5 /usr/bin/php5 -q" /><br />'; $question .= '<input type="text" class="text" name="croncmdline" value="/usr/bin/nice -n 5 /usr/bin/php5 -q" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.33-dev1')) { if (versionInUpdate($current_version, '0.9.33-dev1')) {
@@ -612,7 +612,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= \Froxlor\UI\HTML::makeyesno('customer_show_news_feed', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('customer_show_news_feed', '1', '0', '0') . '<br />';
$question .= '<strong>You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard:</strong>&nbsp;'; $question .= '<strong>You have to set the URL for your RSS-feed here, if you have chosen to enable the custom newsfeed on the customer-dashboard:</strong>&nbsp;';
$question .= '<input type="text" class="text" name="customer_news_feed_url" value="" /><br />'; $question .= '<input type="text" class="text" name="customer_news_feed_url" value="" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.33-dev2')) { if (versionInUpdate($current_version, '0.9.33-dev2')) {
@@ -622,7 +622,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.<br /><br />'; $description = 'You can enable/disable the generation of the bind-zone / config for the system hostname.<br /><br />';
$question = '<strong>Do you want to generate a bind-zone for the system-hostname? (default: no):</strong>&nbsp;'; $question = '<strong>Do you want to generate a bind-zone for the system-hostname? (default: no):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('dns_createhostnameentry', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('dns_createhostnameentry', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -631,7 +631,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.<br /><br />'; $description = 'You can chose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes.<br /><br />';
$question = '<strong>Do you want to receive cron-errors via mail? (default: no):</strong>&nbsp;'; $question = '<strong>Do you want to receive cron-errors via mail? (default: no):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('system_send_cron_errors', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('system_send_cron_errors', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_version, '0.9.34-dev3')) { if (versionInUpdate($current_version, '0.9.34-dev3')) {
@@ -645,7 +645,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<span class="green">installed/loaded</span>'; $question .= '<span class="green">installed/loaded</span>';
} }
$question .= '<br>'; $question .= '<br>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201603070')) { if (versionInUpdate($current_db_version, '201603070')) {
@@ -653,7 +653,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.<br />Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.<br /><br />'; $description = 'You can chose whether you want to enable or disable our Let\'s Encrypt implementation.<br />Please remember that you need to go through the webserver-configuration when enabled because this feature needs a special configuration.<br /><br />';
$question = '<strong>Do you want to enable Let\'s Encrypt? (default: yes):</strong>&nbsp;'; $question = '<strong>Do you want to enable Let\'s Encrypt? (default: yes):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('enable_letsencrypt', '1', '0', '1') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('enable_letsencrypt', '1', '0', '1') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201604270')) { if (versionInUpdate($current_db_version, '201604270')) {
@@ -661,7 +661,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can chose whether you want to enable or disable our backup function.<br /><br />'; $description = 'You can chose whether you want to enable or disable our backup function.<br /><br />';
$question = '<strong>Do you want to enable Backup? (default: no):</strong>&nbsp;'; $question = '<strong>Do you want to enable Backup? (default: no):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('enable_backup', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('enable_backup', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201605090')) { if (versionInUpdate($current_db_version, '201605090')) {
@@ -669,7 +669,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can chose whether you want to enable or disable our DNS editor<br /><br />'; $description = 'You can chose whether you want to enable or disable our DNS editor<br /><br />';
$question = '<strong>Do you want to enable the DNS editor? (default: no):</strong>&nbsp;'; $question = '<strong>Do you want to enable the DNS editor? (default: no):</strong>&nbsp;';
$question .= \Froxlor\UI\HTML::makeyesno('enable_dns', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('enable_dns', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201605170')) { if (versionInUpdate($current_db_version, '201605170')) {
@@ -677,10 +677,10 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Froxlor now supports the dns-daemon Power-DNS, you can chose between bind and powerdns now.'; $description = 'Froxlor now supports the dns-daemon Power-DNS, you can chose between bind and powerdns now.';
$question = '<strong>Select dns-daemon you want to use:</strong>&nbsp;'; $question = '<strong>Select dns-daemon you want to use:</strong>&nbsp;';
$question .= '<select name="new_dns_daemon">'; $question .= '<select name="new_dns_daemon">';
$dnsdaemons = makeoption('Bind9', 'bind', 'bind'); $dnsdaemons = \Froxlor\UI\HTML::makeoption('Bind9', 'bind', 'bind');
$dnsdaemons .= makeoption('PowerDNS', 'pdns', 'bind'); $dnsdaemons .= \Froxlor\UI\HTML::makeoption('PowerDNS', 'pdns', 'bind');
$question .= $dnsdaemons . '</select>'; $question .= $dnsdaemons . '</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201609120')) { if (versionInUpdate($current_db_version, '201609120')) {
@@ -689,7 +689,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'You can now customize the path to your acme.conf file (global alias for Let\'s Encrypt). If you already set up Let\'s Encrypt and the acme.conf file, please set this to the complete path to the file!<br /><br />'; $description = 'You can now customize the path to your acme.conf file (global alias for Let\'s Encrypt). If you already set up Let\'s Encrypt and the acme.conf file, please set this to the complete path to the file!<br /><br />';
$question = '<strong>Path to the acme.conf alias-file.</strong><br />'; $question = '<strong>Path to the acme.conf alias-file.</strong><br />';
$question .= '<input type="text" class="text" name="acmeconffile" value="/etc/apache2/conf-enabled/acme.conf" /><br />'; $question .= '<input type="text" class="text" name="acmeconffile" value="/etc/apache2/conf-enabled/acme.conf" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
@@ -710,7 +710,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$question .= '<input type="text" class="text" name="smtp_user" value="" /><br />'; $question .= '<input type="text" class="text" name="smtp_user" value="" /><br />';
$question .= '<strong>SMTP password?</strong><br />'; $question .= '<strong>SMTP password?</strong><br />';
$question .= '<input type="password" class="text" name="smtp_passwd" value="" /><br />'; $question .= '<input type="password" class="text" name="smtp_passwd" value="" /><br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201705050')) { if (versionInUpdate($current_db_version, '201705050')) {
@@ -718,7 +718,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'DEBIAN/UBUNTU ONLY: Enable usage of libnss-extrausers as alternative to libnss-mysql (NOTE: if enabled, go through the configuration steps right after the update!!!)<br /><br />'; $description = 'DEBIAN/UBUNTU ONLY: Enable usage of libnss-extrausers as alternative to libnss-mysql (NOTE: if enabled, go through the configuration steps right after the update!!!)<br /><br />';
$question = '<strong>Enable usage of libnss-extrausers?</strong><br />'; $question = '<strong>Enable usage of libnss-extrausers?</strong><br />';
$question .= \Froxlor\UI\HTML::makeyesno('system_nssextrausers', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('system_nssextrausers', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
if (versionInUpdate($current_db_version, '201712310')) { if (versionInUpdate($current_db_version, '201712310')) {
@@ -727,7 +727,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version, $c
$description = 'Chose whether you want to disable the Let\'s Encrypt selfcheck as it causes false positives for some configurations.<br /><br />'; $description = 'Chose whether you want to disable the Let\'s Encrypt selfcheck as it causes false positives for some configurations.<br /><br />';
$question = '<strong>Disable Let\'s Encrypt self-check?</strong><br />'; $question = '<strong>Disable Let\'s Encrypt self-check?</strong><br />';
$question .= \Froxlor\UI\HTML::makeyesno('system_disable_le_selfcheck', '1', '0', '0') . '<br />'; $question .= \Froxlor\UI\HTML::makeyesno('system_disable_le_selfcheck', '1', '0', '0') . '<br />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); eval("\$return.=\"" . \Froxlor\UI\Template::getTemplate("update/preconfigitem") . "\";");
} }
} }
} }

6
lib/Froxlor/Cron/Http/Apache.php
View File

@@ -561,7 +561,7 @@ class Apache extends HttpConfigBase
if ($domain['phpenabled_customer'] == 1 && $domain['phpenabled_vhost'] == '1') { if ($domain['phpenabled_customer'] == 1 && $domain['phpenabled_vhost'] == '1') {
// This vHost has PHP enabled and we are using the regular mod_php // This vHost has PHP enabled and we are using the regular mod_php
$cmail = getCustomerDetail($domain['customerid'], 'email'); $cmail = \Froxlor\Customer\Customer::getCustomerDetail($domain['customerid'], 'email');
$php_options_text .= ' php_admin_value sendmail_path "/usr/sbin/sendmail -t -f ' . $cmail . '"' . PHP_EOL; $php_options_text .= ' php_admin_value sendmail_path "/usr/sbin/sendmail -t -f ' . $cmail . '"' . PHP_EOL;
if ($domain['openbasedir'] == '1') { if ($domain['openbasedir'] == '1') {
@@ -1220,7 +1220,7 @@ class Apache extends HttpConfigBase
// check for suexec-workaround, #319 // check for suexec-workaround, #319
if ((int) Settings::Get('perl.suexecworkaround') == 1) { if ((int) Settings::Get('perl.suexecworkaround') == 1) {
// symlink this directory to suexec-safe-path // symlink this directory to suexec-safe-path
$loginname = getCustomerDetail($row_diroptions['customerid'], 'loginname'); $loginname = \Froxlor\Customer\Customer::getCustomerDetail($row_diroptions['customerid'], 'loginname');
$suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/'); $suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/');
if (! file_exists($suexecpath)) { if (! file_exists($suexecpath)) {
@@ -1240,7 +1240,7 @@ class Apache extends HttpConfigBase
// if no perl-execution is enabled but the workaround is, // if no perl-execution is enabled but the workaround is,
// we have to remove the symlink and folder in suexecpath // we have to remove the symlink and folder in suexecpath
if ((int) Settings::Get('perl.suexecworkaround') == 1) { if ((int) Settings::Get('perl.suexecworkaround') == 1) {
$loginname = getCustomerDetail($row_diroptions['customerid'], 'loginname'); $loginname = \Froxlor\Customer\Customer::getCustomerDetail($row_diroptions['customerid'], 'loginname');
$suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/'); $suexecpath = \Froxlor\FileDir::makeCorrectDir(Settings::Get('perl.suexecpath') . '/' . $loginname . '/' . md5($row_diroptions['path']) . '/');
$perlsymlink = \Froxlor\FileDir::makeCorrectFile($row_diroptions['path'] . '/cgi-bin'); $perlsymlink = \Froxlor\FileDir::makeCorrectFile($row_diroptions['path'] . '/cgi-bin');

4
lib/Froxlor/Cron/Http/Php/Fcgid.php
View File

@@ -96,7 +96,7 @@ class Fcgid
// remove +i attibute, so starter can be overwritten // remove +i attibute, so starter can be overwritten
if (file_exists($this->getStarterFile())) { if (file_exists($this->getStarterFile())) {
removeImmutable($this->getStarterFile()); \Froxlor\FileDir::removeImmutable($this->getStarterFile());
} }
$starter_file_handler = fopen($this->getStarterFile(), 'w'); $starter_file_handler = fopen($this->getStarterFile(), 'w');
@@ -104,7 +104,7 @@ class Fcgid
fclose($starter_file_handler); fclose($starter_file_handler);
\Froxlor\FileDir::safe_exec('chmod 750 ' . escapeshellarg($this->getStarterFile())); \Froxlor\FileDir::safe_exec('chmod 750 ' . escapeshellarg($this->getStarterFile()));
\Froxlor\FileDir::safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($this->getStarterFile())); \Froxlor\FileDir::safe_exec('chown ' . $this->_domain['guid'] . ':' . $this->_domain['guid'] . ' ' . escapeshellarg($this->getStarterFile()));
setImmutable($this->getStarterFile()); \Froxlor\FileDir::setImmutable($this->getStarterFile());
} }
/** /**

2
lib/Froxlor/FileDir.php
View File

@@ -419,7 +419,7 @@ class FileDir
} }
$dir = self::makeCorrectDir($dir); $dir = self::makeCorrectDir($dir);
} }
$_field .= makeoption($dir, $dir, $value); $_field .= \Froxlor\UI\HTML::makeoption($dir, $dir, $value);
} }
$field = array( $field = array(
'type' => 'select', 'type' => 'select',

105
lib/Froxlor/Settings.php
View File

@@ -32,23 +32,10 @@ use Froxlor\Database\Database;
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Classes * @package Classes
* *
* @method static mixed Get ($setting = null) return a setting-value by its group and varname separated by a dot (group.varname)
* @method static boolean Set ($setting = null, $value = null, $instant_save = true) update a setting / set a new value
* @method static boolean IsInList ($setting = null, $entry = null) tests if a setting-value that i s a comma separated list contains an entry
* @method static boolean AddNew ($setting = null, $value = null) add a new setting to the database (mainly used in updater)
* @method static boolean Flush () Store all un-saved changes to the database and re-read in all settings
* @method static void Stash () forget all un-saved changes to settings
*/ */
class Settings class Settings
{ {
/**
* current settings object
*
* @var object
*/
private static $_obj = null;
/** /**
* settings data * settings data
* *
@@ -74,27 +61,30 @@ class Settings
/** /**
* private constructor, reads in all settings * private constructor, reads in all settings
*/ */
private function __construct() private static function init()
{ {
$this->_readSettings(); if (empty(self::$_data)) {
self::$_updatedata = array(); self::_readSettings();
// prepare statement self::$_updatedata = array();
self::$_updstmt = Database::prepare("
// prepare statement
self::$_updstmt = Database::prepare("
UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = :value
WHERE `settinggroup` = :group AND `varname` = :varname WHERE `settinggroup` = :group AND `varname` = :varname
"); ");
}
} }
/** /**
* Read in all settings from the database * Read in all settings from the database
* and set the internal $_data array * and set the internal $_data array
*/ */
private function _readSettings() private static function _readSettings()
{ {
$result_stmt = Database::query(" $result_stmt = Database::query("
SELECT `settingid`, `settinggroup`, `varname`, `value` SELECT `settingid`, `settinggroup`, `varname`, `value`
FROM `" . TABLE_PANEL_SETTINGS . "` FROM `" . TABLE_PANEL_SETTINGS . "`
"); ");
self::$_data = array(); self::$_data = array();
while ($row = $result_stmt->fetch(\PDO::FETCH_ASSOC)) { while ($row = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
self::$_data[$row['settinggroup']][$row['varname']] = $row['value']; self::$_data[$row['settinggroup']][$row['varname']] = $row['value'];
@@ -127,8 +117,9 @@ class Settings
* *
* @return mixed * @return mixed
*/ */
public function pGet($setting = null) public function Get($setting = null)
{ {
self::init();
$sstr = explode(".", $setting); $sstr = explode(".", $setting);
// no separator - do'h // no separator - do'h
if (! isset($sstr[1])) { if (! isset($sstr[1])) {
@@ -151,9 +142,10 @@ class Settings
* *
* @return boolean true, if the list contains $entry * @return boolean true, if the list contains $entry
*/ */
public function pIsInList($setting = null, $entry = null) public function IsInList($setting = null, $entry = null)
{ {
$s = Settings::Get($setting); self::init();
$s = self::Get($setting);
if ($s == null) { if ($s == null) {
return false; return false;
} }
@@ -171,10 +163,11 @@ class Settings
* *
* @return bool * @return bool
*/ */
public function pSet($setting = null, $value = null, $instant_save = true) public function Set($setting = null, $value = null, $instant_save = true)
{ {
self::init();
// check whether the setting exists // check whether the setting exists
if (Settings::Get($setting) !== null) { if (self::Get($setting) !== null) {
// set new value in array // set new value in array
$sstr = explode(".", $setting); $sstr = explode(".", $setting);
if (! isset($sstr[1])) { if (! isset($sstr[1])) {
@@ -183,7 +176,7 @@ class Settings
self::$_data[$sstr[0]][$sstr[1]] = $value; self::$_data[$sstr[0]][$sstr[1]] = $value;
// should we store to db instantly? // should we store to db instantly?
if ($instant_save) { if ($instant_save) {
$this->_storeSetting($sstr[0], $sstr[1], $value); self::_storeSetting($sstr[0], $sstr[1], $value);
} else { } else {
// set temporary data for usage // set temporary data for usage
if (! isset(self::$_data[$sstr[0]]) || ! is_array(self::$_data[$sstr[0]])) { if (! isset(self::$_data[$sstr[0]]) || ! is_array(self::$_data[$sstr[0]])) {
@@ -210,11 +203,11 @@ class Settings
* *
* @return boolean * @return boolean
*/ */
public function pAddNew($setting = null, $value = null) public function AddNew($setting = null, $value = null)
{ {
self::init();
// first check if it doesn't exist // first check if it doesn't exist
if (Settings::Get($setting) === null) { if (self::Get($setting) === null) {
// validate parameter // validate parameter
$sstr = explode(".", $setting); $sstr = explode(".", $setting);
if (! isset($sstr[1])) { if (! isset($sstr[1])) {
@@ -244,19 +237,20 @@ class Settings
* Store all un-saved changes to the database and * Store all un-saved changes to the database and
* re-read in all settings * re-read in all settings
*/ */
public function pFlush() public static function Flush()
{ {
self::init();
if (is_array(self::$_updatedata) && count(self::$_updatedata) > 0) { if (is_array(self::$_updatedata) && count(self::$_updatedata) > 0) {
// save all un-saved changes to the settings // save all un-saved changes to the settings
foreach (self::$_updatedata as $group => $vargroup) { foreach (self::$_updatedata as $group => $vargroup) {
foreach ($vargroup as $varname => $value) { foreach ($vargroup as $varname => $value) {
$this->_storeSetting($group, $varname, $value); self::_storeSetting($group, $varname, $value);
} }
} }
// now empty the array // now empty the array
self::$_updatedata = array(); self::$_updatedata = array();
// re-read in all settings // re-read in all settings
return $this->_readSettings(); return self::_readSettings();
} }
return false; return false;
} }
@@ -264,50 +258,13 @@ class Settings
/** /**
* forget all un-saved changes to settings * forget all un-saved changes to settings
*/ */
public function pStash() public static function Stash()
{ {
self::init();
// empty update array // empty update array
self::$_updatedata = array(); self::$_updatedata = array();
} }
/**
* create new object and return instance
*
* @return object
*/
private static function getInstance()
{
// do we got an object already?
if (self::$_obj == null) {
self::$_obj = new self();
}
// return it
return self::$_obj;
}
/**
* let's us interact with the settings-Object by using static
* call like "Settings::function()"
*
* @param string $name
* @param mixed $args
*
* @return mixed
*/
public static function __callStatic($name, $args)
{
// as our functions are not static and therefore cannot
// be called statically, we prefix a 'p' to all of
// our public functions so we can use Settings::functionname()
// which looks cooler and is easier to use
$callback = array(
self::getInstance(),
"p" . $name
);
$result = call_user_func_array($callback, $args);
return $result;
}
public static function loadSettingsInto(&$settings_data) public static function loadSettingsInto(&$settings_data)
{ {
if (is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups'])) { if (is_array($settings_data) && isset($settings_data['groups']) && is_array($settings_data['groups'])) {

4
lib/Froxlor/UI/Form.php
View File

@@ -173,7 +173,7 @@ class Form
// Save fields // Save fields
foreach ($groupdetails['fields'] as $fieldname => $fielddetails) { foreach ($groupdetails['fields'] as $fieldname => $fielddetails) {
if (isset($changed_fields[$fieldname])) { if (isset($changed_fields[$fieldname])) {
if (($saved_field = self::saveFormField($fieldname, $fielddetails, manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false) { if (($saved_field = self::saveFormField($fieldname, $fielddetails, self::manipulateFormFieldData($fieldname, $fielddetails, $changed_fields[$fieldname]))) !== false) {
$saved_fields = array_merge($saved_fields, $saved_field); $saved_fields = array_merge($saved_fields, $saved_field);
} else { } else {
\Froxlor\UI\Response::standard_error('errorwhensaving', $fieldname); \Froxlor\UI\Response::standard_error('errorwhensaving', $fieldname);
@@ -525,4 +525,4 @@ class Form
return $array1; return $array1;
} }
} }
} }

4
logfiles_viewer.php
View File

@@ -59,8 +59,8 @@ if (function_exists('exec')) {
} }
} }
// The normal access/error - logging is enabled // The normal access/error - logging is enabled
$error_log = \Froxlor\FileDir::makeCorrectFile(Settings::Get('system.logfiles_directory') . getCustomerDetail($domain['customerid'], 'loginname') . $speciallogfile . '-error.log'); $error_log = \Froxlor\FileDir::makeCorrectFile(Settings::Get('system.logfiles_directory') . \Froxlor\Customer\Customer::getCustomerDetail($domain['customerid'], 'loginname') . $speciallogfile . '-error.log');
$access_log = \Froxlor\FileDir::makeCorrectFile(Settings::Get('system.logfiles_directory') . getCustomerDetail($domain['customerid'], 'loginname') . $speciallogfile . '-access.log'); $access_log = \Froxlor\FileDir::makeCorrectFile(Settings::Get('system.logfiles_directory') . \Froxlor\Customer\Customer::getCustomerDetail($domain['customerid'], 'loginname') . $speciallogfile . '-access.log');
// error log // error log
if (file_exists($error_log)) { if (file_exists($error_log)) {