ACLs

12 files changed, 51 insertions, 56 deletions

diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html
index ccb64e1..736ab9c 100644
--- a/httemplate/browse/access_group.html
+++ b/httemplate/browse/access_group.html
@@ -1,8 +1,6 @@
 <% include( 'elements/browse.html',
                  'title'       => 'Internal Access Groups',
-                 'menubar'     => [ # 'Main menu' => $p,
-                                    'Internal users' => $p.'browse/access_user.html',
-                                  ],
+                 'menubar'     => [ 'Internal users' => $p.'browse/access_user.html', ],
                  'html_init'   => $html_init,
                  'name'        => 'internal access groups',
                  'query'       => { 'table'     => 'access_group',
diff --git a/httemplate/browse/access_user.html b/httemplate/browse/access_user.html
index be2850c..2aa752b 100644
--- a/httemplate/browse/access_user.html
+++ b/httemplate/browse/access_user.html
@@ -1,8 +1,6 @@
 <% include( 'elements/browse.html',
                  'title'              => 'Internal Users',
-                 'menubar'            => [ #'Main menu' => $p,
-                                           'Internal access groups' => $p.'browse/access_group.html',
-                                         ],
+                 'menubar'            => [ 'Internal access groups' => $p.'browse/access_group.html', ],
                  'html_init'          => $html_init,
                  'name'               => 'internal users',
                  'disableable'        => 1,
diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi
index 8bbc5f3..eac7cf7 100644
--- a/httemplate/browse/addr_block.cgi
+++ b/httemplate/browse/addr_block.cgi
@@ -1,12 +1,4 @@
-<% include("/elements/header.html",'Address Blocks', menubar('Main Menu'   => $p)) %>
-
-%use NetAddr::IP;
-%
-%my @addr_block = qsearch('addr_block', {});
-%my @router = qsearch('router', {});
-%my $block;
-%my $p2 = popurl(2);
-%my $path = $p2 . "edit/process/addr_block";
+<% include('/elements/header.html', 'Address Blocks') %>
 
 <% include('/elements/error.html') %>
 
@@ -71,9 +63,18 @@
     </FORM>
   </TR>
 </TABLE>
-</BODY>
-</HTML>
+
+<% include('/elements/footer.html') %>
+
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my @addr_block = qsearch('addr_block', {});
+my @router = qsearch('router', {});
+my $block;
+my $p2 = popurl(2);
+my $path = $p2 . "edit/process/addr_block";
+
 </%init>
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index fdbf0f2..234bfa7 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -1,5 +1,4 @@
 <% include("/elements/header.html",'Agent Listing', menubar(
-  'Main Menu'   => $p,
   'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
 )) %>
diff --git a/httemplate/browse/agent_type.cgi b/httemplate/browse/agent_type.cgi
index b4e4fcf..d64ff18 100755
--- a/httemplate/browse/agent_type.cgi
+++ b/httemplate/browse/agent_type.cgi
@@ -1,8 +1,6 @@
 <% include( 'elements/browse.html',
                  'title'   => 'Agent Types',
-                 'menubar'     => [ #'Main menu' => $p,
-                                    'Agents'    =>"${p}browse/agent.cgi",
-                                  ],
+                 'menubar'     => [ 'Agents'    =>"${p}browse/agent.cgi", ],
                  'html_init'   => $html_init,
                  'name'        => 'agent types',
                  'query'       => { 'table'     => 'agent_type',
diff --git a/httemplate/browse/nas.cgi b/httemplate/browse/nas.cgi
index 022c65e..b5e0ef8 100755
--- a/httemplate/browse/nas.cgi
+++ b/httemplate/browse/nas.cgi
@@ -1,9 +1,4 @@
-<!-- mason kludge -->
-%
-%
-%print header('NAS ports', menubar(
-%  'Main Menu' => $p,
-%));
+%print header('NAS ports');
 %
 %my $now = time;
 %
@@ -79,3 +74,9 @@
 %#  <TH>NAS</
 %
 
+<%init>
+
+#this hasn't been used in ages, and isn't linked from anywhere...
+die 'NAS browse not currently active';
+
+</%init>
diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 7021cb1..78cb77d 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,6 +1,5 @@
 <% include( 'elements/browse.html',
                  'title'              => 'Package Definitions',
-                 'menubar'            => [ 'Main Menu' => $p ],
                  'html_init'          => $html_init,
                  'name'               => 'package definitions',
                  'disableable'        => 1,
diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi
index 95573a0..f1b2836 100755
--- a/httemplate/browse/part_svc.cgi
+++ b/httemplate/browse/part_svc.cgi
@@ -1,4 +1,4 @@
-<% include("/elements/header.html",'Service Definition Listing', menubar( 'Main Menu' => $p) ) %>
+<% include('/elements/header.html', 'Service Definition Listing') %>
 
 <SCRIPT>
 function part_export_areyousure(href) {
diff --git a/httemplate/browse/part_virtual_field.cgi b/httemplate/browse/part_virtual_field.cgi
index 5a1abe2..b184400 100644
--- a/httemplate/browse/part_virtual_field.cgi
+++ b/httemplate/browse/part_virtual_field.cgi
@@ -1,13 +1,4 @@
-<% include("/elements/header.html",'Virtual field definitions', menubar('Main Menu'   => $p)) %>
-
-%my %pvfs;
-%my $block;
-%my $p2 = popurl(2);
-%my $dbtable;
-%
-%foreach (qsearch('part_virtual_field', {})) {
-%  push @{ $pvfs{$_->dbtable} }, $_;
-%}
+<% include('/elements/header.html', 'Virtual field definitions') %>
 
 <% include('/elements/error.html') %>
 
@@ -32,9 +23,20 @@
 </TABLE>
 % } 
 
-</BODY>
-</HTML>
+<% include('/elements/footer.html') %>
+
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my %pvfs;
+my $block;
+my $p2 = popurl(2);
+my $dbtable;
+
+foreach (qsearch('part_virtual_field', {})) {
+  push @{ $pvfs{$_->dbtable} }, $_;
+}
+
 </%init>
diff --git a/httemplate/browse/payment_gateway.html b/httemplate/browse/payment_gateway.html
index 720858e..671f711 100644
--- a/httemplate/browse/payment_gateway.html
+++ b/httemplate/browse/payment_gateway.html
@@ -1,5 +1,4 @@
 <% include("/elements/header.html",'Payment gateways', menubar(
-  'Main Menu' => $p,
   'Agents'    => $p. 'browse/agent.cgi',
 )) %>
 
@@ -62,8 +61,9 @@
 
 
 </TABLE>
-</BODY>
-</HTML>
+
+<% include('/elements/footer.html') %>
+
 <%init>
 
 die "access denied"
diff --git a/httemplate/browse/reason.html b/httemplate/browse/reason.html
index 5b95353..fe285be 100644
--- a/httemplate/browse/reason.html
+++ b/httemplate/browse/reason.html
@@ -1,9 +1,7 @@
 <% include( 'elements/browse.html',
                  'title'       => ucfirst($classname) . ' Reasons',
-                 'menubar'     => [ # 'Main menu' => $p,
-                                    ucfirst($classname) . ' Reason Types' =>
-				       $p.'browse/reason_type.html?class='.
-				       $class,
+                 'menubar'     => [ ucfirst($classname).' Reason Types' =>
+				      $p."browse/reason_type.html?class=$class"
                                   ],
                  'html_init'   => $html_init,
                  'name'        => $classname . ' reasons',
diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 7ed0963..acddf56 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -1,7 +1,4 @@
-<% include("/elements/header.html",'Routers', menubar('Main Menu'   => $p)) %>
-%
-%my @router = qsearch('router', {});
-%my $p2 = popurl(2);
+<% include('/elements/header.html', 'Routers') %>
 
 <% include('/elements/error.html') %>
 
@@ -16,8 +13,6 @@
 %  $cgi->param('hidecustomerrouters', 1);
 %  $hideurl = '<A HREF="' . $cgi->self_url() . '">Hide customer routers</A>';
 %}
-%
-
 
 <A HREF="<%$p2%>edit/router.cgi">Add a new router</A>&nbsp;|&nbsp;<%$hideurl%>
 
@@ -50,9 +45,15 @@
 % } 
 
 </TABLE>
-</BODY>
-</HTML>
+
+<% include('/elements/footer.html') %>
+
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my @router = qsearch('router', {});
+my $p2 = popurl(2);
+
 </%init>