From 05f9712de1136cea2ce8bf3adbd576e152deeb2d Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 30 Dec 2015 21:19:33 -0600 Subject: clean up lighttpd --- .../local/share/locale/en/LC_MESSAGES/pfSense.pot | 6 +----- src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po | 4 ---- .../local/share/locale/pt_BR/LC_MESSAGES/pfSense.po | 10 +++------- src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po | 10 +++------- src/usr/local/www/status_logs.php | 20 ++++++++++---------- src/usr/local/www/status_logs_filter.php | 20 ++++++++++---------- src/usr/local/www/status_logs_settings.php | 14 +++++++------- 7 files changed, 34 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index 7342e22..e786d02 100644 --- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -8260,7 +8260,7 @@ msgstr "" #: usr/local/www/diag_logs_settings.php:333 msgid "" -"Hint: If this is checked, errors from the lighttpd web server process for " +"Hint: If this is checked, errors from the web server process for " "the GUI or Captive Portal will appear in the main system log." msgstr "" @@ -16466,10 +16466,6 @@ msgstr "" msgid "1999-2014 The PHP Group. All rights reserved." msgstr "" -#: usr/local/www/license.php:96 -msgid "LightTPD" -msgstr "" - #: usr/local/www/license.php:97 msgid "2004, Jan Knescke, incremental" msgstr "" diff --git a/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po index b9d66c6..8539301 100644 --- a/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/ja/LC_MESSAGES/pfSense.po @@ -24029,10 +24029,6 @@ msgstr "本製品は、から無料で入手PHPを含み" msgid "1999 - 2003 The PHP Group. All rights reserved" msgstr "1999 - 2003ザ· PHPのグループ。無断複写·転載を禁じます" -#: usr/local/www/license.php:163 usr/local/www/license.php:163 -msgid "LightTPD" -msgstr "lighttpdの" - #: usr/local/www/license.php:164 msgid " 2004 by Jan Kneschke " msgstr "2004ヤンKneschkeによる" diff --git a/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po index b013681..82e25c5 100644 --- a/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/pt_BR/LC_MESSAGES/pfSense.po @@ -2843,8 +2843,8 @@ msgstr "configuração ssl" #: etc/inc/system.inc:1161 etc/inc/system.inc:1213 etc/inc/system.inc:1193 #: etc/inc/system.inc:1142 etc/inc/system.inc:1169 #, php-format -msgid "Error: cannot open %s in system_generate_lighty_config().%s" -msgstr "Erro: não pôde abrir %s em system_generate_lighty_config().%s" +msgid "Error: cannot open %s in system_generate_nginx_config().%s" +msgstr "Erro: não pôde abrir %s em system_generate_nginx_config().%s" #: etc/inc/system.inc:1181 etc/inc/system.inc:1233 etc/inc/system.inc:1213 #: etc/inc/system.inc:1162 etc/inc/system.inc:1189 @@ -20496,10 +20496,6 @@ msgstr "Esse produto inclui PHP, disponível de graça por" msgid "1999 - 2003 The PHP Group. All rights reserved" msgstr "1999 - 2003 The PHP Group. Todos os direitos reservados" -#: usr/local/www/license.php:163 -msgid "LightTPD" -msgstr "LightTPD" - #: usr/local/www/license.php:164 msgid " 2004 by Jan Kneschke " msgstr " 2004 por Jan Kneschke " @@ -40785,7 +40781,7 @@ msgid "Log errors from the web server process." msgstr "" #: usr/local/www/diag_logs_settings.php:291 -msgid "Hint: If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log." +msgid "Hint: If this is checked, errors from the web server process for the GUI or Captive Portal will appear in the main system log." msgstr "" #: usr/local/www/interfaces_gre_edit.php:216 diff --git a/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po b/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po index 07b6eac..162f41c 100644 --- a/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po +++ b/src/usr/local/share/locale/tr/LC_MESSAGES/pfSense.po @@ -5293,8 +5293,8 @@ msgstr "ssl yapılandırması" #: etc/inc/system.inc:1360 #, php-format -msgid "Error: cannot open %s in system_generate_lighty_config().%s" -msgstr "Hata: system_generate_lighty_config().%s içindeki %s açılamadı" +msgid "Error: cannot open %s in system_generate_nginx_config().%s" +msgstr "Hata: system_generate_nginx_config().%s içindeki %s açılamadı" #: etc/inc/system.inc:1380 msgid "Setting timezone..." @@ -8531,7 +8531,7 @@ msgstr "" #: usr/local/www/diag_logs_settings.php:333 msgid "" -"Hint: If this is checked, errors from the lighttpd web server process for " +"Hint: If this is checked, errors from the web server process for " "the GUI or Captive Portal will appear in the main system log." msgstr "" @@ -17311,10 +17311,6 @@ msgstr "Bu ürün PHP içerir, ücretsiz olarak" msgid "1999-2014 The PHP Group. All rights reserved." msgstr "" -#: usr/local/www/license.php:96 -msgid "LightTPD" -msgstr "LightTPD" - #: usr/local/www/license.php:97 msgid "2004, Jan Knescke, incremental" msgstr "2004, Jan Knescke, incremental" diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index adf5ecc..9d14c8b 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -156,7 +156,7 @@ $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize']; $pconfig['format'] = $config['syslog'][$specific_log]['format']; # System General (main) Specific -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); +$pconfig['lognginx'] = !isset($config['syslog']['nolognginx']); $save_settings = getGETPOSTsettingvalue('save_settings', null); @@ -169,7 +169,7 @@ if ($save_settings) { $format = getGETPOSTsettingvalue('format', null); # System General (main) Specific - $loglighttpd = getGETPOSTsettingvalue('loglighttpd', null); + $lognginx = getGETPOSTsettingvalue('lognginx', null); unset($input_errors); $pconfig = $_POST; @@ -214,11 +214,11 @@ if ($save_settings) { # System General (main) Specific if ($logfile == 'system') { - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); - $config['syslog']['nologlighttpd'] = $loglighttpd ? false : true; + $oldnolognginx = isset($config['syslog']['nolognginx']); + $config['syslog']['nolognginx'] = $lognginx ? false : true; - if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) { - $logging_changed = $lighttpd_logging_changed = true; + if ($oldnolognginx !== $config['syslog']['nolognginx']) { + $logging_changed = $nginx_logging_changed = true; } } @@ -236,7 +236,7 @@ if ($save_settings) { # System General (main) Specific if ($logfile == 'system') { - if ($lighttpd_logging_changed) { + if ($nginx_logging_changed) { ob_flush(); flush(); log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); @@ -637,11 +637,11 @@ $section->add($group); # System General (main) Specific if ($logfile == 'system') { $section->addInput(new Form_Checkbox( - 'loglighttpd', + 'lognginx', 'Web Server Log', 'Log errors from the web server process', - $pconfig['loglighttpd'] - ))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.'); + $pconfig['lognginx'] + ))->setHelp('If this is checked, errors from the web server process for the GUI or Captive Portal will appear in the system log.'); } diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index cd3117e..625e732 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -165,7 +165,7 @@ $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize']; $pconfig['format'] = $config['syslog'][$specific_log]['format']; # System General (main) Specific -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); +$pconfig['lognginx'] = !isset($config['syslog']['nolognginx']); # Firewall Specific $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']); @@ -185,7 +185,7 @@ if ($save_settings) { $format = getGETPOSTsettingvalue('format', null); # System General (main) Specific - $loglighttpd = getGETPOSTsettingvalue('loglighttpd', null); + $lognginx = getGETPOSTsettingvalue('lognginx', null); # Firewall Specific $logdefaultblock = getGETPOSTsettingvalue('logdefaultblock', null); @@ -236,11 +236,11 @@ if ($save_settings) { # System General (main) Specific if ($logfile == 'system') { - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); - $config['syslog']['nologlighttpd'] = $loglighttpd ? false : true; + $oldnolognginx = isset($config['syslog']['nolognginx']); + $config['syslog']['nolognginx'] = $lognginx ? false : true; - if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) { - $logging_changed = $lighttpd_logging_changed = true; + if ($oldnolognginx !== $config['syslog']['nolognginx']) { + $logging_changed = $nginx_logging_changed = true; } } @@ -285,7 +285,7 @@ if ($save_settings) { # System General (main) Specific if ($logfile == 'system') { - if ($lighttpd_logging_changed) { + if ($nginx_logging_changed) { ob_flush(); flush(); log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); @@ -890,11 +890,11 @@ $section->add($group); # System General (main) Specific if ($logfile == 'system') { $section->addInput(new Form_Checkbox( - 'loglighttpd', + 'lognginx', 'Web Server Log', 'Log errors from the web server process', - $pconfig['loglighttpd'] - ))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.'); + $pconfig['lognginx'] + ))->setHelp('If this is checked, errors from the web server process for the GUI or Captive Portal will appear in the system log.'); } diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index 8fa193a..bc43592 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -89,7 +89,7 @@ $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']); $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']); $pconfig['logbogons'] = !isset($config['syslog']['nologbogons']); $pconfig['logprivatenets'] = !isset($config['syslog']['nologprivatenets']); -$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); +$pconfig['lognginx'] = !isset($config['syslog']['nolognginx']); $pconfig['rawfilter'] = isset($config['syslog']['rawfilter']); $pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions']; $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']); @@ -163,12 +163,12 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $oldnologdefaultpass = isset($config['syslog']['nologdefaultpass']); $oldnologbogons = isset($config['syslog']['nologbogons']); $oldnologprivatenets = isset($config['syslog']['nologprivatenets']); - $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); + $oldnolognginx = isset($config['syslog']['nolognginx']); $config['syslog']['nologdefaultblock'] = $_POST['logdefaultblock'] ? false : true; $config['syslog']['nologdefaultpass'] = $_POST['logdefaultpass'] ? true : false; $config['syslog']['nologbogons'] = $_POST['logbogons'] ? false : true; $config['syslog']['nologprivatenets'] = $_POST['logprivatenets'] ? false : true; - $config['syslog']['nologlighttpd'] = $_POST['loglighttpd'] ? false : true; + $config['syslog']['nolognginx'] = $_POST['lognginx'] ? false : true; $config['syslog']['rawfilter'] = $_POST['rawfilter'] ? true : false; if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0) { $config['syslog']['filterdescriptions'] = $_POST['filterdescriptions']; @@ -194,7 +194,7 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) { $savemsg = get_std_save_message($retval); - if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) { + if ($oldnolognginx !== isset($config['syslog']['nolognginx'])) { ob_flush(); flush(); log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); @@ -299,11 +299,11 @@ $section->addInput(new Form_Checkbox( )); $section->addInput(new Form_Checkbox( - 'loglighttpd', + 'lognginx', 'Web Server Log', 'Log errors from the web server process', - $pconfig['loglighttpd'] -))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the main system log'); + $pconfig['lognginx'] +))->setHelp('If this is checked, errors from the web server process for the GUI or Captive Portal will appear in the main system log'); $section->addInput(new Form_Checkbox( 'rawfilter', -- cgit v1.1