From a83eb148f2e136229be5fefb9f9705854d0004cc Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Wed, 5 Nov 2008 17:18:18 +0000
Subject: [PATCH] billing permissions fix

git-svn-id: http://www.observium.org/svn/observer/trunk@294 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/includes/billing.php       | 2 +-
 html/includes/print-menubar.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/html/includes/billing.php b/html/includes/billing.php
index 1c345f5f0..47ee7e531 100644
--- a/html/includes/billing.php
+++ b/html/includes/billing.php
@@ -174,7 +174,7 @@ echo("
 
 
 
-if($_GET['bill'] && billpermitted($_GET['id'])){
+if($_GET['bill'] && billpermitted($_GET['bill'])){
 
 	        $bill_id = $_GET['bill'];
 		printReport($bill_id);	
diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 865382849..bfb842214 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -116,10 +116,12 @@ if($errored) {
   echo("<li><a href='interfaces/errors/'><img src='images/16/chart_curve_error.png' border=0 align=absmiddle> Errored ($errored)</a></li>");
 }
 
+if($config['enable_billing']) { echo("<li><a href='bills/'><img src='images/16/money_pound.png' border=0 align=absmiddle> Traffic Bills</a></li>"); $ifbreak = 1;}
+
+
 if($_SESSION['userlevel'] >= '5') {
   echo("<li><hr width=140 /></li>");
   if($config['int_customers']) { echo("<li><a href='customers/'><img src='images/16/group_link.png' border=0 align=absmiddle> Customers</a></li>"); $ifbreak = 1;}
-  if($config['enable_billing']) { echo("<li><a href='bills/'><img src='images/16/money_pound.png' border=0 align=absmiddle> Traffic Bills</a></li>"); $ifbreak = 1;}
   if($config['int_l2tp']) { echo("<li><a href='?page=iftype&type=l2tp'><img src='images/16/user.png'border=0 align=absmiddle> L2TP</a></li>"); $ifbreak = 1; }
   if($config['int_transit']) { echo("<li><a href='?page=iftype&type=transit'><img src='images/16/world_link.png' border=0 align=absmiddle> Transit</a></li>");  $ifbreak = 1; }
   if($config['int_peering']) { echo("<li><a href='?page=iftype&type=peering'><img src='images/16/bug_link.png' border=0 align=absmiddle> Peering</a></li>"); $ifbreak = 1; }