diff options
| -rw-r--r-- | config/avahi/avahi.inc | 4 | ||||
| -rwxr-xr-x | config/squid3/34/squid.inc | 4 | ||||
| -rw-r--r-- | config/squid3/34/squid_antivirus_status.widget.php | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/avahi/avahi.inc b/config/avahi/avahi.inc index ba89676f..04f3b343 100644 --- a/config/avahi/avahi.inc +++ b/config/avahi/avahi.inc @@ -82,8 +82,8 @@ function avahi_write_config() { // Wide Area $widearea = ($avahi_config['enable_wide_area']) ? "yes" : "no"; // Publishing Options - $publish = ($avahi_config['disable_publishing']) ? "no" : "yes"; - $userpublish = ($avahi_config['disable_user_service_publishing']) ? "no" : "yes"; + $publish = ($avahi_config['disable_publishing']) ? "yes" : "no"; + $userpublish = ($avahi_config['disable_user_service_publishing']) ? "yes" : "no"; $addresspublish = ($avahi_config['publish_addresses']) ? "yes" : "no"; $cookie = ($avahi_config['add_service_cookie']) ? "yes" : "no"; $hinfopublish = ($avahi_config['publish_hinfo']) ? "yes" : "no"; diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc index 3dafded6..f4be3ee3 100755 --- a/config/squid3/34/squid.inc +++ b/config/squid3/34/squid.inc @@ -894,8 +894,8 @@ function squid_validate_nac($post, &$input_errors) { $allowed_subnets = explode("\n", $post['allowed_subnets']); foreach ($allowed_subnets as $subnet) { $subnet = trim($subnet); - if (!empty($subnet) && !is_subnet($subnet)) { - $input_errors[] = "The subnet '$subnet' is not a valid CIDR range."; + if (!empty($subnet) && !is_subnet($subnet) && $subnet != "all") { + $input_errors[] = "'Allowed Subnets' must be a valid CIDR range or 'all'. The subnet '$subnet' is not valid."; } } diff --git a/config/squid3/34/squid_antivirus_status.widget.php b/config/squid3/34/squid_antivirus_status.widget.php index 377b51f2..d739da33 100644 --- a/config/squid3/34/squid_antivirus_status.widget.php +++ b/config/squid3/34/squid_antivirus_status.widget.php @@ -71,7 +71,7 @@ function squid_avdb_info($filename) { function squid_antivirus_bases_info() { $db = '<table width="100%" border="0" cellspacing="0" cellpadding="1"><tbody>'; $db .= '<tr class="vncellt" ><td>Database</td><td>Date</td><td>Version</td><td>Builder</td></tr>'; - $avdbs = array("daily.cvd", "daily.cld", "bytecode.cvd", "bytecode.cld", "main.cvd", "main.cld", "safebrowing.cvd", "safebrowing.cld"); + $avdbs = array("daily.cvd", "daily.cld", "bytecode.cvd", "bytecode.cld", "main.cvd", "main.cld", "safebrowsing.cvd", "safebrowsing.cld"); foreach ($avdbs as $avdb) { $db .= squid_avdb_info($avdb); } |