Allow use of automatic 'all' ACL type

https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3198123&group_id=17457

diff --git a/squid/always.cgi b/squid/always.cgi
index 346daf5..cfe6379 100755 (executable)
--- a/squid/always.cgi
+++ b/squid/always.cgi
@@ -33,6 +33,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=1; $i<@always; $i++) { $match{$always[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";

diff --git a/squid/edit_cache.cgi b/squid/edit_cache.cgi
index eada6cc..f682cc6 100755 (executable)
--- a/squid/edit_cache.cgi
+++ b/squid/edit_cache.cgi
@@ -131,6 +131,7 @@ if ($squid_version < 2) {
 print "<tr> <td valign=top><b>$text{'ec_ncua'}</b></td> <td>\n";
 print "<table>\n";
 @acls = grep { !$acldone{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 if ($squid_version >= 2.6) {
        # 2.6+ plus uses "cache deny"
        @v = &find_config("cache", $conf);

diff --git a/squid/edit_headeracc.cgi b/squid/edit_headeracc.cgi
index c76e80c..8575788 100755 (executable)
--- a/squid/edit_headeracc.cgi
+++ b/squid/edit_headeracc.cgi
@@ -38,6 +38,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=2; $i<@v; $i++) { $match{$v[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";

diff --git a/squid/edit_logs.cgi b/squid/edit_logs.cgi
index 5c25f0d..32b395a 100755 (executable)
--- a/squid/edit_logs.cgi
+++ b/squid/edit_logs.cgi
@@ -116,6 +116,8 @@ if ($squid_version >= 2.2) {
        if (!$bad_ident) {
                print "<tr><td valign=top><b>$text{'elogs_prilfa'}</b></td> <td colspan=3>\n";
                @acls = &find_config("acl", $conf);
+               unshift(@acls, { 'values' => [ 'all' ] })
+                       if ($squid_version >= 3);
                foreach $acl (@acls) {
                        $aclv = $acl->{'values'}->[0];
                        next if ($doneacl{$aclv}++);

diff --git a/squid/http_access.cgi b/squid/http_access.cgi
index 080d7e0..1aebb2a 100755 (executable)
--- a/squid/http_access.cgi
+++ b/squid/http_access.cgi
@@ -33,6 +33,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=1; $i<@http; $i++) { $match{$http[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";

diff --git a/squid/http_reply_access.cgi b/squid/http_reply_access.cgi
index af0c30b..152f0a5 100755 (executable)
--- a/squid/http_reply_access.cgi
+++ b/squid/http_reply_access.cgi
@@ -33,6 +33,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=1; $i<@http; $i++) { $match{$http[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";

diff --git a/squid/icp_access.cgi b/squid/icp_access.cgi
index 3eb34aa..fd6eae6 100755 (executable)
--- a/squid/icp_access.cgi
+++ b/squid/icp_access.cgi
@@ -33,6 +33,7 @@ printf "<input type=radio name=action value=deny %s> $text{'aicp_d'}</td> </tr>\
 
 for($i=1; $i<@icp; $i++) { $match{$icp[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'aicp_ma'}</b></td>\n";

diff --git a/squid/never.cgi b/squid/never.cgi
index c71f963..5d6bfbf 100755 (executable)
--- a/squid/never.cgi
+++ b/squid/never.cgi
@@ -33,6 +33,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=1; $i<@never; $i++) { $match{$never[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";

diff --git a/squid/pool_access.cgi b/squid/pool_access.cgi
index 0ac6579..d88996e 100755 (executable)
--- a/squid/pool_access.cgi
+++ b/squid/pool_access.cgi
@@ -34,6 +34,7 @@ printf "<input type=radio name=action value=deny %s> $text{'ahttp_d'}</td> </tr>
 
 for($i=2; $i<@delay; $i++) { $match{$delay[$i]}++; }
 @acls = grep { !$done{$_->{'values'}->[0]}++ } &find_config("acl", $conf);
+unshift(@acls, { 'values' => [ 'all' ] }) if ($squid_version >= 3);
 $r = @acls; $r = 10 if ($r > 10);
 
 print "<tr> <td valign=top><b>$text{'ahttp_ma'}</b></td>\n";