From 447f61ba78ea2c8c6455ef74a8236e3a93bbac85 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 5 Mar 2013 10:29:06 +0100 Subject: [PATCH] settings are not available when reading them from the database, let admin set the php-reload command and the php-backend for nginx even if php-fpm is disabled. Added a note to the description, fixes #1075 Signed-off-by: Michael Kaufmann (d00p) --- actions/admin/settings/130.webserver.php | 4 ++-- lng/english.lng.php | 4 ++-- lng/german.lng.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actions/admin/settings/130.webserver.php b/actions/admin/settings/130.webserver.php index 61695f40..241dd423 100644 --- a/actions/admin/settings/130.webserver.php +++ b/actions/admin/settings/130.webserver.php @@ -133,7 +133,7 @@ return array( 'label' => $lng['serversettings']['phpreload_command'], 'settinggroup' => 'system', 'varname' => 'phpreload_command', - 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string', + 'type' => 'string', 'default' => '', 'save_method' => 'storeSettingField', 'websrv_avail' => array('nginx') @@ -142,7 +142,7 @@ return array( 'label' => $lng['serversettings']['nginx_php_backend'], 'settinggroup' => 'system', 'varname' => 'nginx_php_backend', - 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string', + 'type' => '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 e7e6ebc7..ed32a83a 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1516,9 +1516,9 @@ $lng['question']['customer_reallyunlock'] = 'Do you really want to unlock custom $lng['serversettings']['perl_server']['title'] = 'Perl server location'; $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']['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
*only used with php-fpm'; $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
Default: blank'; +$lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the PHP backend if any is used
Default: blank
*only used with php-fpm'; // 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 9c272ac4..84fcddcb 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1498,9 +1498,9 @@ $lng['question']['customer_reallyunlock'] = 'Wollen Sie den Kunden %s wirklich e $lng['serversettings']['perl_server']['title'] = 'Perl Server Ort'; $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']['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
*nur relevant bei php-fpm'; $lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl'; -$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird benötigt, um das PHP Backend 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)
*nur relevant bei php-fpm'; // ADDED IN FROXLOR 0.9.16 $lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)';