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

- hide php-reload and php-backend-server setting if nginx is used with php-fpm (useless settings)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-12-03 10:20:49 +00:00
parent 0271ccfc28
commit 93abbf4a10
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actions/admin/settings/130.webserver.php
View File

@@ -124,15 +124,16 @@ return array(
'label' => $lng['serversettings']['phpreload_command'], 'label' => $lng['serversettings']['phpreload_command'],
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'phpreload_command', 'varname' => 'phpreload_command',
'type' => 'string', 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
'default' => '', 'default' => '',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('nginx')
), ),
'system_nginx_php_backend' => array( 'system_nginx_php_backend' => array(
'label' => $lng['serversettings']['nginx_php_backend'], 'label' => $lng['serversettings']['nginx_php_backend'],
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'nginx_php_backend', 'varname' => 'nginx_php_backend',
'type' => 'string', 'type' => (getSetting('phpfpm', 'enabled') == '1') ? 'hidden' : 'string',
'default' => '127.0.0.1:8888', 'default' => '127.0.0.1:8888',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('nginx') 'websrv_avail' => array('nginx')

2
lng/english.lng.php
View File

@@ -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']['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';
$lng['serversettings']['phpreload_command']['title'] = 'PHP reload command'; $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)<br />Default: blank'; $lng['serversettings']['phpreload_command']['description'] = 'this is used to reload the PHP backend if any is used<br />Default: blank';
// ADDED IN FROXLOR 0.9.16 // ADDED IN FROXLOR 0.9.16
$lng['error']['intvaluetoolow'] = 'The given number is too low (field %s)'; $lng['error']['intvaluetoolow'] = 'The given number is too low (field %s)';

2
lng/german.lng.php
View File

@@ -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']['title'] = 'Nginx PHP Backend';
$lng['serversettings']['nginx_php_backend']['description'] = 'Dies ist das Backend, auf dem PHP auf Anfragen von Nginx h&ouml;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&ouml;rt. Kann ein UNIX Socket oder eine IP:Port Kombination sein';
$lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl'; $lng['serversettings']['phpreload_command']['title'] = 'PHP Reload Befehl';
$lng['serversettings']['phpreload_command']['description'] = 'Dieser wird ben&ouml;tigt, um das PHP Backend (z.B. PHP-Fpm oder f&uuml;r Nginx) bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)'; $lng['serversettings']['phpreload_command']['description'] = 'Dieser wird ben&ouml;tigt, um das PHP Backend bei Bedarf durch den Cronjob neu zu laden. (Standard: leer)';
// ADDED IN FROXLOR 0.9.16 // ADDED IN FROXLOR 0.9.16
$lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)'; $lng['error']['intvaluetoolow'] = 'Die angegebene Zahl ist zu klein (Feld %s)';