X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Frouter.cgi;h=85512f8df1a2835b45c6023eb589862118f83d5f;hp=6dcd93a71971bd3b45d529aa0d03f05757f05e73;hb=f32ac83068c6211f829f1688a1a9cdec71bc6ec7;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1

diff --git a/httemplate/browse/router.cgi b/httemplate/browse/router.cgi
index 6dcd93a71..85512f8df 100644
--- a/httemplate/browse/router.cgi
+++ b/httemplate/browse/router.cgi
@@ -1,64 +1,61 @@
-<% include("/elements/header.html",'Routers', menubar('Main Menu'   => $p)) %>
-%
-%
-%my @router = qsearch('router', {});
-%my $p2 = popurl(2);
-%
-%
-% if ($cgi->param('error')) { 
-
-   <FONT SIZE="+1" COLOR="#ff0000">Error: <%$cgi->param('error')%></FONT>
-   <BR><BR>
-% } 
-%
-%my $hidecustomerrouters = 0;
-%my $hideurl = '';
-%if ($cgi->param('hidecustomerrouters') eq '1') {
-%  $hidecustomerrouters = 1;
-%  $cgi->param('hidecustomerrouters', 0);
-%  $hideurl = '<A HREF="' . $cgi->self_url() . '">Show customer routers</A>';
-%} else {
-%  $hidecustomerrouters = 0;
-%  $cgi->param('hidecustomerrouters', 1);
-%  $hideurl = '<A HREF="' . $cgi->self_url() . '">Hide customer routers</A>';
-%}
-%
+<% include('elements/browse.html',
+                'title'           => 'Routers',
+                'menubar'         => [ @menubar ],
+                'name_singular'   => 'router',
+                'query'           => { 'table'     => 'router',
+                                       'hashref'   => {},
+                                       'extra_sql' => $extra_sql,
+                                     },
+                'count_query'     => "SELECT count(*) from router $count_sql",
+                'header'          => [ 'Router name',
+                                       'Address block(s)',
+                                       'IP addressing',
+                                       'Action',
+                                     ],
+                'fields'          => [ 'routername',
+                                       sub { join( '<BR>', map { $_->NetAddr }
+                                                               shift->addr_block
+                                                 );
+                                           },
+                                       sub { shift->manual_addr ? 'Manual' : 'Automatic' },
+                                       sub { 'Delete' },
+                                     ],
+                'links'           => [ [ "${p2}edit/router.cgi?", 'routernum' ],
+                                       '',
+                                       '',
+                                       [ "${p}misc/delete-router.html?", 'routernum' ],
+                                     ],
+                'agent_virt'      => 1,
+                'agent_null_right'=> "Broadband global configuration",
+                'agent_pos'       => 1,
+          )
+%>
+<%init>
 
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Broadband configuration')
+  || $FS::CurrentUser::CurrentUser->access_right('Broadband global configuration');
 
-<A HREF="<%$p2%>edit/router.cgi">Add a new router</A>&nbsp;|&nbsp;<%$hideurl%>
+my $p2 = popurl(2);
+my $extra_sql = '';
 
-<%table()%>
-  <TR>
-    <TD><B>Router name</B></TD>
-    <TD><B>Address block(s)</B></TD>
-  </TR>
-% foreach my $router (sort {$a->routernum <=> $b->routernum} @router) {
-%     next if $hidecustomerrouters && $router->svcnum;
-%     my @addr_block = $router->addr_block;
-%     if (scalar(@addr_block) == 0) {
-%       push @addr_block, '&nbsp;';
-%     }
-%
+my @menubar = ( 'Add a new router', "${p2}edit/router.cgi" );
 
-  <TR>
-    <TD ROWSPAN="<%scalar(@addr_block)+1%>">
-      <A HREF="<%$p2%>edit/router.cgi?<%$router->routernum%>"><%$router->routername%></A>
-    </TD>
-  </TR>
-% foreach my $block ( @addr_block ) { 
+if ($cgi->param('hidecustomerrouters') eq '1') {
+  $extra_sql = 'WHERE svcnum > 0';
+  $cgi->delete('hidecustomerrouters');
+  push @menubar, 'Show customer routers', $cgi->self_url();
+  $cgi->param('hidecustomerrouters', 1);
+} else {
+  $cgi->param('hidecustomerrouters', 1);
+  push @menubar, 'Hide customer routers', $cgi->self_url();
+  $cgi->delete('hidecustomerrouters');
+}
 
-  <TR>
-    <TD><%UNIVERSAL::isa($block, 'FS::addr_block') ? $block->NetAddr : '&nbsp;'%></TD>
-  </TR>
-% } 
+my $count_sql = $extra_sql.  ( $extra_sql =~ /WHERE/ ? ' AND' : 'WHERE' ).
+  $FS::CurrentUser::CurrentUser->agentnums_sql(
+    'null_right' => 'Broadband global configuration',
+  );
 
-  </TR>
-% } 
 
-</TABLE>
-</BODY>
-</HTML>
-<%init>
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 </%init>