From a03fd8b8be588789686e92008b8ed80f63340698 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:19:03 +0500 Subject: HAVP configurator "Log" option now really using HAVP webConfigurator "Log" checkbox not using at all. Error logs was written always, regardless of "Log" option. Change this behaviour to reflect configurator option. Note: HAVP access log writes always because of virus attentions. --- config/havp/havp.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/havp/havp.inc b/config/havp/havp.inc index 8118f695..1648bcb0 100644 --- a/config/havp/havp.inc +++ b/config/havp/havp.inc @@ -633,7 +633,7 @@ function havp_config_havp() # log $conf[] = "\n# log "; $conf[] = "ACCESSLOG " . HVDEF_HAVP_ACCESSLOG; - $conf[] = "ERRORLOG " . HVDEF_HAVP_ERRORLOG; + $conf[] = "ERRORLOG " . ($havp_config[F_LOG] === 'true' ? HVDEF_HAVP_ERRORLOG : "/dev/null"); # syslog $conf[] = "\n# syslog"; $conf[] = "USESYSLOG {$havp_config[F_SYSLOG]}"; -- cgit v1.2.3 From b336f0d7193c53d3e3bf10378aa3a8dde776ffa3 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:27:26 +0500 Subject: Explain what "Log" means As clamd may have its own log file, we must explain that "Log" tab contains HAVP log --- config/havp/antivirus.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/havp/antivirus.php b/config/havp/antivirus.php index 0d66a6b3..bf5f1879 100644 --- a/config/havp/antivirus.php +++ b/config/havp/antivirus.php @@ -204,7 +204,7 @@ if (pfsense_version_A() == '1') { $tab_array[] = array(gettext("General page"), true, "antivirus.php"); $tab_array[] = array(gettext("HTTP proxy"), false, "pkg_edit.php?xml=havp.xml&id=0"); $tab_array[] = array(gettext("Settings"), false, "pkg_edit.php?xml=havp_avset.xml&id=0"); - $tab_array[] = array(gettext("Log"), false, "havp_log.php"); + $tab_array[] = array(gettext("HAVP Log"), false, "havp_log.php"); display_top_tabs($tab_array); ?> -- cgit v1.2.3 From 06a8c9d7e5811eb04ddebe42ac9a73bc0d6a0ee7 Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:28:14 +0500 Subject: Explain what "Log" means As clamd may have its own log file, we must explain that "Log" tab contains HAVP log --- config/havp/havp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/havp/havp.xml b/config/havp/havp.xml index 51356862..8a35780b 100644 --- a/config/havp/havp.xml +++ b/config/havp/havp.xml @@ -56,7 +56,7 @@ /pkg_edit.php?xml=havp_avset.xml&id=0 - Log + HAVP Log /havp_log.php -- cgit v1.2.3 From c1325c3910c6963afe45add22472c2030ce5e4cf Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:30:09 +0500 Subject: Explain what "Log" means As clamd may have its own log file, we must explain that "Log" tab contains HAVP log --- config/havp/havp.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/havp/havp.xml b/config/havp/havp.xml index 8a35780b..f5afc2fe 100644 --- a/config/havp/havp.xml +++ b/config/havp/havp.xml @@ -293,16 +293,16 @@ on - Log + HAVP Log log - Check this for enable log. + Check this for enable HAVP log. checkbox syslog - Syslog + HAVP Syslog syslog - Check this for enable Syslog. + Check this for enable HAVP Syslog. checkbox -- cgit v1.2.3 From 00048d58d9c71fa7e00164cad12dc87754db194a Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:31:22 +0500 Subject: Explain what "Log" means As clamd may have its own log file, we must explain that "Log" tab contains HAVP log --- config/havp/havp_avset.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/havp/havp_avset.xml b/config/havp/havp_avset.xml index 1b0d5c5d..041c6f64 100644 --- a/config/havp/havp_avset.xml +++ b/config/havp/havp_avset.xml @@ -24,7 +24,7 @@ - Log + HAVP Log /havp_log.php -- cgit v1.2.3 From 460162da9d25e5e8c9dd6235c5bbee62183d944f Mon Sep 17 00:00:00 2001 From: Andrew Nikitin Date: Fri, 9 Jan 2015 14:32:18 +0500 Subject: Explain what "Log" means As clamd may have its own log file, we must explain that "Log" tab contains HAVP log --- config/havp/havp_log.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/havp/havp_log.php b/config/havp/havp_log.php index 60c02fbf..f4a2dc2e 100644 --- a/config/havp/havp_log.php +++ b/config/havp/havp_log.php @@ -79,7 +79,7 @@ include("head.inc"); $tab_array[] = array(gettext("General page"), false, "antivirus.php"); $tab_array[] = array(gettext("HTTP proxy"), false, "pkg_edit.php?xml=havp.xml&id=0"); $tab_array[] = array(gettext("Settings"), false, "pkg_edit.php?xml=havp_avset.xml&id=0"); - $tab_array[] = array(gettext("Log"), true, "havp_log.php"); + $tab_array[] = array(gettext("HAVP Log"), true, "havp_log.php"); display_top_tabs($tab_array); ?> -- cgit v1.2.3