From 93abbf4a104b94f1649a219503756f2f6434e2ad Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 3 Dec 2010 10:20:49 +0000 Subject: [PATCH] - hide php-reload and php-backend-server setting if nginx is used with php-fpm (useless settings) --- actions/admin/settings/130.webserver.php | 5 +++-- lng/english.lng.php | 2 +- lng/german.lng.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php index 047cba97..bc37165c 100644 --- a/actions/admin/settings/130.webserver.php +++ b/actions/admin/settings/130.webserver.php @@ -124,15 +124,16 @@ return array( 'label' => $lng['serversettings']['phpreload_command'], 'settinggroup' => 'system', 'varname' => 'phpreload_command', - 'type' => 'string', + 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string', 'default' => '', 'save_method' => 'storeSettingField', + 'websrv_avail' => array('nginx') ), 'system_nginx_php_backend' => array( 'label' => $lng['serversettings']['nginx_php_backend'], 'settinggroup' => 'system', 'varname' => 'nginx_php_backend', - 'type' => 'string', + 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string', 'default' => '127.0.0.1:8888', 'save_method' => 'storeSettingField', 'websrv_avail' => array('nginx') diff --git a/lng/english.lng.php b/lng/english.lng.php index 860139d3..7ac37e3f 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1521,7 +1521,7 @@ $lng['serversettings']['perl_server']['description'] = 'Default is set for using $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 (e.g. php-fpm or nginx)
Default: blank'; +$lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the PHP backend if any is used
Default: blank'; // ADDED IN FROXLOR 0.9.16 $lng['error']['intvaluetoolow'] = 'The given number is too low (field %s)'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 68234869..80631d41 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1503,7 +1503,7 @@ $lng['serversettings']['perl_server']['description'] = 'Der Standardwert ist die $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 (z.B. PHP-Fpm oder für Nginx) bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)'; +$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP Backend bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)'; // ADDED IN FROXLOR 0.9.16 $lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)';