clean up lighttpd bits

4 files changed, 4 insertions, 99 deletions

diff --git a/src/usr/local/www/license.php b/src/usr/local/www/license.php
index 255f0ed..8a25e9d 100644
--- a/src/usr/local/www/license.php
+++ b/src/usr/local/www/license.php
@@ -118,11 +118,11 @@ include("head.inc");
 			FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br />
 			<?=gettext("Copyright")?> &copy;<?=gettext("1992-2015 The FreeBSD Project. All rights reserved")?>.<br />
 			<br />
-			<?=gettext("This product includes PHP, freely available from")?><a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br />
-			<?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2015 The PHP Group. All rights reserved.")?>.<br />
+			<?=gettext("This product includes PHP, freely available from")?> <a href="http://www.php.net/" target="_blank">http://www.php.net</a>.<br />
+			<?=gettext("Copyright"); ?> &copy; <?=gettext("1999-2015 The PHP Group. All rights reserved.")?><br />
 			<br />
-			<?=gettext("LightTPD"); ?> (<a href="http://www.lighttpd.net" target="_blank">http://www.lighttpd.net)</a><br />
-			<?=gettext("Copyright"); ?> &copy;<?=gettext("2004, Jan Knescke, incremental")?><jan@kneschke.de>
+			<?=gettext("nginx"); ?> (<a href="http://www.nginx.org" target="_blank">http://www.nginx.org)</a><br />
+			<?=gettext("Copyright"); ?> &copy;<?=gettext("2011-2015 Nginx, Inc.")?>
 			<?=gettext("All rights reserved.")?><br />
 			<br />
 			<?=gettext("ISC DHCP server ")?>(<a href="http://www.isc.org/products/DHCP/" target="_blank">http://www.isc.org/products/DHCP</a>)<br />
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index adf5ecc..5a30753 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -156,8 +156,6 @@ $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize'];
 $pconfig['format'] = $config['syslog'][$specific_log]['format'];
 
 # System General (main) Specific
-$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']);
-
 $save_settings = getGETPOSTsettingvalue('save_settings', null);
 
 if ($save_settings) {
@@ -168,9 +166,6 @@ if ($save_settings) {
 	$logfilesize = getGETPOSTsettingvalue('logfilesize', null);
 	$format  = getGETPOSTsettingvalue('format',  null);
 
-	# System General (main) Specific
-	$loglighttpd  = getGETPOSTsettingvalue('loglighttpd',  null);
-
 	unset($input_errors);
 	$pconfig = $_POST;
 
@@ -212,17 +207,6 @@ if ($save_settings) {
 			$config['syslog'][$specific_log]['format'] = $format;
 		}
 
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			$oldnologlighttpd = isset($config['syslog']['nologlighttpd']);
-			$config['syslog']['nologlighttpd'] = $loglighttpd ? false : true;
-
-			if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) {
-				$logging_changed = $lighttpd_logging_changed = true;
-			}
-		}
-
-
 		// If any of the logging settings were changed then backup and sync (standard write_config).  Otherwise only write config (don't backup, don't sync).
 		if ($logging_changed) {
 			write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"]), $backup = true, $write_config_only = false);
@@ -234,16 +218,6 @@ if ($save_settings) {
 
 		$savemsg = gettext("The changes have been applied successfully.");
 
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			if ($lighttpd_logging_changed) {
-				ob_flush();
-				flush();
-				log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
-				send_event("service restart webgui");
-				$savemsg .= "<br />" . gettext("WebGUI process is restarting.");
-			}
-		}
 	}
 }
 
@@ -633,18 +607,6 @@ $group->add(new Form_Checkbox(
 $group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.');
 $section->add($group);
 
-
-# System General (main) Specific
-if ($logfile == 'system') {
-	$section->addInput(new Form_Checkbox(
-		'loglighttpd',
-		'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.');
-}
-
-
 $group = new Form_Group('Action');
 
 $btnsavesettings = new Form_Button(
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index cd3117e..7ff5efb 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -164,9 +164,6 @@ $pconfig['nentries'] = $config['syslog'][$specific_log]['nentries'];
 $pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize'];
 $pconfig['format'] = $config['syslog'][$specific_log]['format'];
 
-# System General (main) Specific
-$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']);
-
 # Firewall Specific
 $pconfig['logdefaultblock'] = !isset($config['syslog']['nologdefaultblock']);
 $pconfig['logdefaultpass'] = isset($config['syslog']['nologdefaultpass']);
@@ -184,9 +181,6 @@ if ($save_settings) {
 	$logfilesize = getGETPOSTsettingvalue('logfilesize', null);
 	$format  = getGETPOSTsettingvalue('format',  null);
 
-	# System General (main) Specific
-	$loglighttpd  = getGETPOSTsettingvalue('loglighttpd',  null);
-
 	# Firewall Specific
 	$logdefaultblock = getGETPOSTsettingvalue('logdefaultblock',  null);
 	$logdefaultpass = getGETPOSTsettingvalue('logdefaultpass', null);
@@ -234,16 +228,6 @@ if ($save_settings) {
 			$config['syslog'][$specific_log]['format'] = $format;
 		}
 
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			$oldnologlighttpd = isset($config['syslog']['nologlighttpd']);
-			$config['syslog']['nologlighttpd'] = $loglighttpd ? false : true;
-
-			if ($oldnologlighttpd !== $config['syslog']['nologlighttpd']) {
-				$logging_changed = $lighttpd_logging_changed = true;
-			}
-		}
-
 	# Firewall Specific
 		if ($logfile == 'filter') {
 			$oldnologdefaultblock = isset($config['syslog']['nologdefaultblock']);
@@ -283,17 +267,6 @@ if ($save_settings) {
 
 		$savemsg = gettext("The changes have been applied successfully.");
 
-	# System General (main) Specific
-		if ($logfile == 'system') {
-			if ($lighttpd_logging_changed) {
-				ob_flush();
-				flush();
-				log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
-				send_event("service restart webgui");
-				$savemsg .= "<br />" . gettext("WebGUI process is restarting.");
-			}
-		}
-
 	# Firewall Specific
 		if ($logfile == 'filter') {
 			if ($firewall_logging_changed) {
@@ -886,18 +859,6 @@ $group->add(new Form_Checkbox(
 $group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.');
 $section->add($group);
 
-
-# System General (main) Specific
-if ($logfile == 'system') {
-	$section->addInput(new Form_Checkbox(
-		'loglighttpd',
-		'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.');
-}
-
-
 # Firewall Specific
 if ($logfile == 'filter') {
 $section->addInput(new Form_Checkbox(
diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php
index 8fa193a..384917f 100644
--- a/src/usr/local/www/status_logs_settings.php
+++ b/src/usr/local/www/status_logs_settings.php
@@ -89,7 +89,6 @@ $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['rawfilter'] = isset($config['syslog']['rawfilter']);
 $pconfig['filterdescriptions'] = $config['syslog']['filterdescriptions'];
 $pconfig['disablelocallogging'] = isset($config['syslog']['disablelocallogging']);
@@ -163,12 +162,10 @@ 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']);
 		$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']['rawfilter'] = $_POST['rawfilter'] ? true : false;
 		if (is_numeric($_POST['filterdescriptions']) && $_POST['filterdescriptions'] > 0) {
 			$config['syslog']['filterdescriptions'] = $_POST['filterdescriptions'];
@@ -194,14 +191,6 @@ if ($_POST['resetlogs'] == gettext("Reset Log Files")) {
 
 		$savemsg = get_std_save_message($retval);
 
-		if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) {
-			ob_flush();
-			flush();
-			log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator."));
-			send_event("service restart webgui");
-			$savemsg .= "<br />" . gettext("WebGUI process is restarting.");
-		}
-
 		filter_pflog_start(true);
 	}
 }
@@ -299,13 +288,6 @@ $section->addInput(new Form_Checkbox(
 ));
 
 $section->addInput(new Form_Checkbox(
-	'loglighttpd',
-	'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');
-
-$section->addInput(new Form_Checkbox(
 	'rawfilter',
 	'Raw Logs',
 	'Show raw filter logs',