diff options
| -rw-r--r-- | httemplate/browse/access_group.html | 4 | ||||
| -rw-r--r-- | httemplate/browse/access_user.html | 6 | ||||
| -rw-r--r-- | httemplate/browse/addr_block.cgi | 23 | ||||
| -rwxr-xr-x | httemplate/browse/agent.cgi | 1 | ||||
| -rwxr-xr-x | httemplate/browse/agent_type.cgi | 4 | ||||
| -rwxr-xr-x | httemplate/browse/nas.cgi | 13 | ||||
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 3 | ||||
| -rwxr-xr-x | httemplate/browse/part_svc.cgi | 2 | ||||
| -rw-r--r-- | httemplate/browse/part_virtual_field.cgi | 26 | ||||
| -rw-r--r-- | httemplate/browse/payment_gateway.html | 6 | ||||
| -rw-r--r-- | httemplate/browse/reason.html | 6 | ||||
| -rw-r--r-- | httemplate/browse/router.cgi | 17 |
12 files changed, 53 insertions, 58 deletions
diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html index ca162a094..2d5047c1d 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 397e64a5d..ec47f1aa7 100644 --- a/httemplate/browse/access_user.html +++ b/httemplate/browse/access_user.html @@ -1,11 +1,9 @@ <% 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, - 'html_posttotal' => $posttotal, 'name' => 'internal users', + 'html_posttotal' => $posttotal, 'query' => { 'table' => 'access_user', 'hashref' => \%search, 'extra_sql' => 'ORDER BY last, first', diff --git a/httemplate/browse/addr_block.cgi b/httemplate/browse/addr_block.cgi index 8bbc5f350..eac7cf7b6 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 35ad86343..5bb9f918a 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 b4e4fcf99..d64ff186a 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 022c65ea7..b5e0ef8b7 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 5acf17ef2..ca23c41e6 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,9 +1,8 @@ <% include( 'elements/browse.html', 'title' => 'Package Definitions', - 'menubar' => [ 'Main Menu' => $p ], 'html_init' => $html_init, - 'html_posttotal' => $posttotal, 'name' => 'package definitions', + 'html_posttotal' => $posttotal, 'query' => { 'select' => $select, 'table' => 'part_pkg', 'hashref' => \%search, diff --git a/httemplate/browse/part_svc.cgi b/httemplate/browse/part_svc.cgi index 95573a0d7..f1b283638 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 5a1abe213..b18440036 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 720858e9b..671f7118c 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 cbe065800..7fb5d7855 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 7ed0963db..acddf5677 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> | <%$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> |