diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php index 782de254..047cba97 100644 --- a/actions/admin/settings/130.webserver.php +++ b/actions/admin/settings/130.webserver.php @@ -76,38 +76,6 @@ return array( 'default' => '/etc/apache2/htpasswd/', 'save_method' => 'storeSettingField', ), - 'system_apachereload_command' => array( - 'label' => $lng['serversettings']['apachereload_command'], - 'settinggroup' => 'system', - 'varname' => 'apachereload_command', - 'type' => 'string', - 'default' => '/etc/init.d/apache2 reload', - 'save_method' => 'storeSettingField', - ), - 'system_phpreload_command' => array( - 'label' => $lng['serversettings']['phpreload_command'], - 'settinggroup' => 'system', - 'varname' => 'phpreload_command', - 'type' => 'string', - 'default' => '', - 'save_method' => 'storeSettingField', - ), - 'system_nginx_php_backend' => array( - 'label' => $lng['serversettings']['nginx_php_backend'], - 'settinggroup' => 'system', - 'varname' => 'nginx_php_backend', - 'type' => 'string', - 'default' => '127.0.0.1:8888', - 'save_method' => 'storeSettingField', - ), - 'system_mod_log_sql' => array( - 'label' => $lng['serversettings']['mod_log_sql'], - 'settinggroup' => 'system', - 'varname' => 'mod_log_sql', - 'type' => 'bool', - 'default' => false, - 'save_method' => 'storeSettingField', - ), 'system_logfiles_directory' => array( 'label' => $lng['serversettings']['logfiles_directory'], 'settinggroup' => 'system', @@ -144,6 +112,40 @@ return array( 'default' => '', 'save_method' => 'storeSettingField', ), + 'system_apachereload_command' => array( + 'label' => $lng['serversettings']['apachereload_command'], + 'settinggroup' => 'system', + 'varname' => 'apachereload_command', + 'type' => 'string', + 'default' => '/etc/init.d/apache2 reload', + 'save_method' => 'storeSettingField', + ), + 'system_phpreload_command' => array( + 'label' => $lng['serversettings']['phpreload_command'], + 'settinggroup' => 'system', + 'varname' => 'phpreload_command', + 'type' => 'string', + 'default' => '', + 'save_method' => 'storeSettingField', + ), + 'system_nginx_php_backend' => array( + 'label' => $lng['serversettings']['nginx_php_backend'], + 'settinggroup' => 'system', + 'varname' => 'nginx_php_backend', + 'type' => 'string', + 'default' => '127.0.0.1:8888', + 'save_method' => 'storeSettingField', + 'websrv_avail' => array('nginx') + ), + 'system_mod_log_sql' => array( + 'label' => $lng['serversettings']['mod_log_sql'], + 'settinggroup' => 'system', + 'varname' => 'mod_log_sql', + 'type' => 'bool', + 'default' => false, + 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2') + ), 'defaultwebsrverrhandler_enabled' => array( 'label' => $lng['serversettings']['defaultwebsrverrhandler_enabled'], 'settinggroup' => 'defaultwebsrverrhandler', @@ -159,6 +161,7 @@ return array( 'type' => 'string', 'default' => '', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2', 'nginx') ), 'defaultwebsrverrhandler_err403' => array( 'label' => $lng['serversettings']['defaultwebsrverrhandler_err403'], @@ -167,6 +170,7 @@ return array( 'type' => 'string', 'default' => '', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2', 'nginx') ), 'defaultwebsrverrhandler_err404' => array( 'label' => $lng['serversettings']['defaultwebsrverrhandler_err404'], @@ -183,6 +187,7 @@ return array( 'type' => 'string', 'default' => '', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2', 'nginx') ), 'customredirect_enabled' => array( 'label' => $lng['serversettings']['customredirect_enabled'], @@ -191,6 +196,7 @@ return array( 'type' => 'bool', 'default' => false, 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2', 'lighttpd') ), 'customredirect_default' => array( 'label' => $lng['serversettings']['customredirect_default'], @@ -201,6 +207,7 @@ return array( 'option_mode' => 'one', 'option_options_method' => 'getRedirectCodes', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2', 'lighttpd') ), ), ), diff --git a/actions/admin/settings/135.fcgid.php b/actions/admin/settings/135.fcgid.php index 982288e8..46d0fd3b 100644 --- a/actions/admin/settings/135.fcgid.php +++ b/actions/admin/settings/135.fcgid.php @@ -19,6 +19,7 @@ return array( 'groups' => array( 'fcgid' => array( 'title' => $lng['admin']['fcgid_settings'], + 'websrv_avail' => array('apache2'), 'fields' => array( 'system_mod_fcgid_enabled' => array( 'label' => $lng['serversettings']['mod_fcgid'], diff --git a/actions/admin/settings/137.perl.php b/actions/admin/settings/137.perl.php index c7a8d462..eefda5da 100644 --- a/actions/admin/settings/137.perl.php +++ b/actions/admin/settings/137.perl.php @@ -27,6 +27,7 @@ return array( 'type' => 'string', 'default' => '/usr/bin/perl', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('lighttpd') ), 'system_perl_suexecworkaround' => array( 'label' => $lng['serversettings']['perl']['suexecworkaround'], @@ -35,6 +36,7 @@ return array( 'type' => 'bool', 'default' => false, 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2') ), 'system_perl_suexeccgipath' => array( 'label' => $lng['serversettings']['perl']['suexeccgipath'], @@ -43,6 +45,7 @@ return array( 'type' => 'string', 'default' => '/var/www/cgi-bin/', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('apache2') ), 'perl_server' => array( 'label' => $lng['serversettings']['perl_server'], @@ -51,6 +54,7 @@ return array( 'type' => 'string', 'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('nginx') ), ), ), diff --git a/lib/functions/formfields/function.buildFormEx.php b/lib/functions/formfields/function.buildFormEx.php index f898a440..2b043b73 100644 --- a/lib/functions/formfields/function.buildFormEx.php +++ b/lib/functions/formfields/function.buildFormEx.php @@ -17,6 +17,7 @@ function buildFormEx($form, $part = '') { + global $settings; $fields = ''; if(validateFormDefinition($form)) @@ -34,24 +35,42 @@ function buildFormEx($form, $part = '') // only show one section elseif($part != '' && ($groupname == $part || $part == 'all')) { - if(isset($groupdetails['title']) && $groupdetails['title'] != '') + /** + * this part checks for the 'websrv_avail' entry in the settings-array + * if found, we check if the current webserver is in the array. If this + * is not the case, we change the setting type to "hidden", #502 + */ + $do_show = true; + if(isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail'])) { - $fields .= getFormGroupOutput($groupname, $groupdetails); - } - - if(validateFieldDefinition($groupdetails)) - { - // Prefetch form fields - foreach($groupdetails['fields'] as $fieldname => $fielddetails) + $websrv = $settings['system']['webserver']; + if(!in_array($websrv, $groupdetails['websrv_avail'])) { - $groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails)); - $form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname]; + $do_show = false; } - - // Collect form field output - foreach($groupdetails['fields'] as $fieldname => $fielddetails) + } + + if($do_show) + { + if(isset($groupdetails['title']) && $groupdetails['title'] != '') { - $fields .= getFormFieldOutput($fieldname, $fielddetails); + $fields .= getFormGroupOutput($groupname, $groupdetails); + } + + if(validateFieldDefinition($groupdetails)) + { + // Prefetch form fields + foreach($groupdetails['fields'] as $fieldname => $fielddetails) + { + $groupdetails['fields'][$fieldname] = array_merge_prefix($fielddetails, $fielddetails['type'], prefetchFormFieldData($fieldname, $fielddetails)); + $form['groups'][$groupname]['fields'][$fieldname] = $groupdetails['fields'][$fieldname]; + } + + // Collect form field output + foreach($groupdetails['fields'] as $fieldname => $fielddetails) + { + $fields .= getFormFieldOutput($fieldname, $fielddetails); + } } } } diff --git a/lib/functions/formfields/function.getFormFieldOutput.php b/lib/functions/formfields/function.getFormFieldOutput.php index 25288e28..2d26fa11 100644 --- a/lib/functions/formfields/function.getFormFieldOutput.php +++ b/lib/functions/formfields/function.getFormFieldOutput.php @@ -19,6 +19,8 @@ function getFormFieldOutput($fieldname, $fielddata) { + global $settings; + $returnvalue = ''; if(is_array($fielddata) && isset($fielddata['type']) && $fielddata['type'] != '' && function_exists('getFormFieldOutput' . ucfirst($fielddata['type']))) { @@ -44,7 +46,26 @@ function getFormFieldOutput($fieldname, $fielddata) $fielddata['value'] = null; } } - $returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata); + + /** + * this part checks for the 'websrv_avail' entry in the settings-array + * if found, we check if the current webserver is in the array. If this + * is not the case, we change the setting type to "hidden", #502 + */ + $do_show = true; + if(isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) + { + $websrv = $settings['system']['webserver']; + if(!in_array($websrv, $fielddata['websrv_avail'])) + { + $do_show = false; + } + } + + if($do_show) + { + $returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata); + } } return $returnvalue; } diff --git a/lib/functions/formfields/function.getFormGroupOutput.php b/lib/functions/formfields/function.getFormGroupOutput.php index 782784ad..20302047 100644 --- a/lib/functions/formfields/function.getFormGroupOutput.php +++ b/lib/functions/formfields/function.getFormGroupOutput.php @@ -71,6 +71,24 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) } } - eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";"); + /** + * this part checks for the 'websrv_avail' entry in the settings-array + * if found, we check if the current webserver is in the array. If this + * is not the case, we change the setting type to "hidden", #502 + */ + $do_show = true; + if(isset($groupdetails['websrv_avail']) && is_array($groupdetails['websrv_avail'])) + { + $websrv = $settings['system']['webserver']; + if(!in_array($websrv, $groupdetails['websrv_avail'])) + { + $do_show = false; + } + } + + if($do_show) + { + eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";"); + } return $group; } diff --git a/lng/english.lng.php b/lng/english.lng.php index 19e7c520..549ceb9c 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -547,8 +547,8 @@ $lng['panel']['back'] = 'Back'; $lng['serversettings']['mod_log_sql']['title'] = 'Temporary save logs in the database'; $lng['serversettings']['mod_log_sql']['description'] = 'Use mod_log_sql to save webrequests temporarily
This needs a special apache-configuration!'; -$lng['serversettings']['mod_fcgid']['title'] = 'Include PHP via mod_fcgid/suexec'; -$lng['serversettings']['mod_fcgid']['description'] = 'Use mod_fcgid/suexec/libnss_mysql to run PHP with the corresponding useraccount.
This needs a special webserver configuration, see http://wiki.froxlor.org/contrib/fcgid-handbook

NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
'; +$lng['serversettings']['mod_fcgid']['title'] = 'Enable FCGID'; +$lng['serversettings']['mod_fcgid']['description'] = 'Use this to run PHP with the corresponding useraccount.

This needs a special webserver configuration for Apache, see http://wiki.froxlor.org/contrib/fcgid-handbook'; $lng['serversettings']['sendalternativemail']['title'] = 'Use alternative email-address'; $lng['serversettings']['sendalternativemail']['description'] = 'Send the password-email to a different address during email-account-creation'; $lng['emails']['alternative_emailaddress'] = 'Alternative e-mail-address'; @@ -708,7 +708,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'Ticket e-mail sendername'; // ADDED IN 1.2.19-svn1 $lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Configuration directory'; -$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/'; +$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/

NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
'; $lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Temp directory'; // ADDED IN 1.2.19-svn3 @@ -1442,7 +1442,7 @@ $lng['admin']['perlenabled'] = 'Perl enabled'; // ADDED IN FROXLOR 0.9.11-svn3 $lng['serversettings']['perl_path']['title'] = 'Path to perl'; -$lng['serversettings']['perl_path']['description'] = 'Only relevant if you use lighttpd. Default is /usr/bin/perl'; +$lng['serversettings']['perl_path']['description'] = 'Default is /usr/bin/perl'; // ADDED IN FROXLOR 0.9.12-svn1 $lng['admin']['fcgid_settings'] = 'FCGID'; @@ -1453,7 +1453,7 @@ $lng['admin']['mod_fcgid_group'] = 'Local group to use for FCGID (Froxlor vHost) // ADDED IN FROXLOR 0.9.12-svn2 $lng['admin']['perl_settings'] = 'Perl/CGI'; -$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Enable SuExec workaround (Apache only)'; +$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Enable SuExec workaround'; $lng['serversettings']['perl']['suexecworkaround']['description'] = 'Enable only if customer docroots are not within the apache suexec path.
If enabled, Froxlor will generate a symlink from the customers perl-enabled directory + /cgi-bin/ to the given path.
Note that perl will then only work in the folders subdirectory /cgi-bin/ and not in the folder itself (as it does without this fix!)'; $lng['serversettings']['perl']['suexeccgipath']['title'] = 'Path for customer perl-enabled directory symlinks'; $lng['serversettings']['perl']['suexeccgipath']['description'] = 'You only need to set this if the SuExec-workaround is enabled.
ATTENTION: Be sure this path is within the suexec path or else this workaround is uselsess'; @@ -1517,8 +1517,8 @@ $lng['question']['customer_reallyunlock'] = 'Do you really want to unlock custom // ADDED IN FROXLOR 0.9.15-svn1 $lng['serversettings']['perl_server']['title'] = 'Perl server location'; -$lng['serversettings']['perl_server']['description'] = 'This is only used for Nginx
default is set for using the guide found at: http://wiki.nginx.org/SimpleCGI'; -$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx php backend'; +$lng['serversettings']['perl_server']['description'] = 'Default is set for using the guide found at: http://wiki.nginx.org/SimpleCGI'; +$lng['serversettings']['nginx_php_backend']['title'] = 'Nginx PHP backend'; $lng['serversettings']['nginx_php_backend']['description'] = 'this is where the PHP process is listening for requests from nginx, can be a unix socket of ip:port combination'; $lng['serversettings']['phpreload_command']['title'] = 'PHP reload command'; -$lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the Php backend if any is used (this is required to be set for Nginx) Default: Blank'; +$lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the PHP backend if any is used (e.g. php-fpm or nginx)
Default: blank'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 940e80de..74671226 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -547,7 +547,7 @@ $lng['panel']['back'] = 'Zurück'; $lng['serversettings']['mod_log_sql']['title'] = 'Logs in Datenbank zwischenspeichern'; $lng['serversettings']['mod_log_sql']['description'] = 'mod_log_sql benutzen um die Webzugriffe temporär zu speichern
Dies benötigt eine spezielle Apache-Konfiguration'; $lng['serversettings']['mod_fcgid']['title'] = 'PHP über mod_fcgid/suexec einbinden'; -$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen
Dies benötigt eine spezielle Apache-Konfiguration

ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten keinerlei Daten dort manuell abgelegt werden.
'; +$lng['serversettings']['mod_fcgid']['description'] = 'PHP unter dem jeweiligen Useraccount laufen lassen.

Dies benötigt eine spezielle Webserver-Konfiguration für Apache, siehe http://wiki.froxlor.org/contrib/fcgid-handbook.'; $lng['serversettings']['sendalternativemail']['title'] = 'Alternative E-Mail-Adresse benutzen'; $lng['serversettings']['sendalternativemail']['description'] = 'Während des Erstellens eines Accounts das Passwort an eine andere E-Mail-Adresse senden'; $lng['emails']['alternative_emailaddress'] = 'Alternative E-Mail-Adresse'; @@ -578,7 +578,6 @@ $lng['serversettings']['mysql_access_host']['description'] = 'Eine durch Komma g // CHANGED IN 1.2.18 $lng['serversettings']['mod_log_sql']['description'] = 'mod_log_sql benutzen um die Webzugriffe temporär zu speichern
Dies benötigt eine spezielle Apache-Konfiguration'; -$lng['serversettings']['mod_fcgid']['description'] = 'mod_fcgid/suexec/libnss_mysql benutzen um PHP unter dem jeweiligen Useraccount laufen zu lassen
Dies benötigt eine spezielle Webserver-Konfiguration, siehe http://wiki.froxlor.org/contrib/fcgid-handbook.'; // ADDED IN 1.2.18-svn1 @@ -712,7 +711,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'Ticket E-Mail Absendername'; // ADDED IN 1.2.19-svn $lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Konfigurations-Verzeichnis'; -$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.'; +$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.

ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten keinerlei Daten dort manuell abgelegt werden.
'; $lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Temporäres Verzeichnis'; // ADDED IN 1.2.19-svn3 @@ -1425,7 +1424,7 @@ $lng['admin']['perlenabled'] = 'Perl verfügbar'; // ADDED IN FROXLOR 0.9.11-svn3 $lng['serversettings']['perl_path']['title'] = 'Pfad zu Perl'; -$lng['serversettings']['perl_path']['description'] = 'Nur nötig für lighttpd-Nutzer. Standard ist /usr/bin/perl'; +$lng['serversettings']['perl_path']['description'] = 'Standard ist /usr/bin/perl'; // ADDED IN FROXLOR 0.9.12-svn1 $lng['admin']['fcgid_settings'] = 'FCGID'; @@ -1436,7 +1435,7 @@ $lng['admin']['mod_fcgid_group'] = 'Lokale Gruppe für FCGID (Froxlor Vhost) // ADDED IN FROXLOR 0.9.12-svn2 $lng['admin']['perl_settings'] = 'Perl/CGI'; -$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec Workaround (nur für Apache)'; +$lng['serversettings']['perl']['suexecworkaround']['title'] = 'Aktiviere SuExec Workaround'; $lng['serversettings']['perl']['suexecworkaround']['description'] = 'Aktivieren Sie den Workaround nur, wenn die Kunden-Heimatverzeichnisse sich nicht unterhalb des suexec-Pfades liegen.
Wenn aktiviert erstellt Froxlor eine Verknüpfung des vom Kunden für Perl aktiviertem Pfad + /cgi-bin/ im angegebenen suexec-Pfad.
Bitte beachten Sie, dass Perl dann nur im Unterordner /cgi-bin/ des Kunden-Ordners funktioniert und nicht direkt in diesem Ordner (wie es ohne den Workaround wäre!)'; $lng['serversettings']['perl']['suexeccgipath']['title'] = 'Pfad für Verknüpfungen zu Kunden-Perl-Verzeichnis'; $lng['serversettings']['perl']['suexeccgipath']['description'] = 'Diese Einstellung wird nur benötigt, wenn der SuExec-Workaround aktiviert ist.
ACHTUNG: Stellen Sie sicher, dass sich der angegebene Pfad innerhalb des Suexec-Pfades befindet ansonsten ist der Workaround nutzlos'; @@ -1500,8 +1499,8 @@ $lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden %s wirklich e // ADDED IN FROXLOR 0.9.15-svn1 $lng['serversettings']['perl_server']['title'] = 'Perl Server Ort'; -$lng['serversettings']['perl_server']['description'] = 'Nur für nginx
Der Standardwert ist diesem Guide entnommen: http://wiki.nginx.org/SimpleCGI'; +$lng['serversettings']['perl_server']['description'] = 'Der Standardwert ist diesem Guide entnommen: http://wiki.nginx.org/SimpleCGI'; $lng['serversettings']['nginx_php_backend']['title'] = 'Nginx PHP Backend'; $lng['serversettings']['nginx_php_backend']['description'] = 'Dies ist das Backend, auf dem PHP auf Anfragen von Nginx hört. Kann ein UNIX Socket oder eine IP:Port Kombination sein'; $lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl'; -$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP Backend für Nginx bei Bedarf durch den Cronjob neu zu laden. (Nur für Nginx, Standard: leer)'; +$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP Backend (z.B. PHP-Fpm oder für Nginx) bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)';