diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-02-02 09:05:49 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-02-02 09:05:49 -0200 |
| commit | 25de0dbe59fe76d7d53eb99bdc565649fdf253af (patch) | |
| tree | f43fcff9baf4956032b985531d71e0cb1edee3ad /config | |
| parent | 6c5118cee992894c14e11ee706207c90695da20d (diff) | |
| parent | 15137ab13aad99d98f3aec5905626a7125064d6d (diff) | |
| download | pfsense-packages-25de0dbe59fe76d7d53eb99bdc565649fdf253af.tar.gz pfsense-packages-25de0dbe59fe76d7d53eb99bdc565649fdf253af.tar.bz2 pfsense-packages-25de0dbe59fe76d7d53eb99bdc565649fdf253af.zip | |
Merge pull request #776 from SunStroke74/patch-1
Diffstat (limited to 'config')
| -rw-r--r-- | config/havp/antivirus.php | 2 | ||||
| -rw-r--r-- | config/havp/havp.inc | 2 | ||||
| -rw-r--r-- | config/havp/havp.xml | 10 | ||||
| -rw-r--r-- | config/havp/havp_avset.xml | 2 | ||||
| -rw-r--r-- | config/havp/havp_log.php | 2 |
5 files changed, 9 insertions, 9 deletions
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); ?> 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]}"; diff --git a/config/havp/havp.xml b/config/havp/havp.xml index 51356862..f5afc2fe 100644 --- a/config/havp/havp.xml +++ b/config/havp/havp.xml @@ -56,7 +56,7 @@ <url>/pkg_edit.php?xml=havp_avset.xml&id=0</url> </tab> <tab> - <text>Log</text> + <text>HAVP Log</text> <url>/havp_log.php</url> </tab> </tabs> @@ -293,16 +293,16 @@ <default_value>on</default_value> </field> <field> - <fielddescr>Log</fielddescr> + <fielddescr>HAVP Log</fielddescr> <fieldname>log</fieldname> - <description>Check this for enable log.</description> + <description>Check this for enable HAVP log.</description> <type>checkbox</type> <enablefields>syslog</enablefields> </field> <field> - <fielddescr>Syslog</fielddescr> + <fielddescr>HAVP Syslog</fielddescr> <fieldname>syslog</fieldname> - <description>Check this for enable Syslog.</description> + <description>Check this for enable HAVP Syslog.</description> <type>checkbox</type> </field> </fields> 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 @@ <active/> </tab> <tab> - <text>Log</text> + <text>HAVP Log</text> <url>/havp_log.php</url> </tab> </tabs> 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); ?> </td></tr> |