From 9891f0201b24c1a9753b2a3cce0ec6e972742881 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Mon, 7 Nov 2011 10:30:43 +0000
Subject: [PATCH] fix bill adding

git-svn-id: http://www.observium.org/svn/observer/trunk@2718 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/bill/history.inc.php           |  2 +-
 html/pages/bills.inc.php                  |  6 ++----
 html/pages/{bill => bills}/pmonth.inc.php | 16 ++++++++--------
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename html/pages/{bill => bills}/pmonth.inc.php (90%)

diff --git a/html/pages/bill/history.inc.php b/html/pages/bill/history.inc.php
index ddf2f97c3..be0561697 100644
--- a/html/pages/bill/history.inc.php
+++ b/html/pages/bill/history.inc.php
@@ -54,7 +54,7 @@
       echo("
            <tr style=\"background: $row_colour;\">
              <td></td>
-             <td><span style=\"font-weight: bold;\" class=\"interface\">from ".strftime("%x", strtotime($datefrom))." to ".strftime("%x", strtotime($dateto))."</span></td>
+             <td><span style=\"font-weight: bold;\" class=\"interface\">".strftime("%Y", strtotime($datefrom))." to ".strftime("%Y", strtotime($dateto))."</span></td>
              <td>$type</td>
              <td>$allowed</td>
              <td>$in</td>
diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index 6f5fa6b04..c94e00617 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -20,8 +20,8 @@ echo("<meta http-equiv='refresh' content='10000'>");
 
 if ($_GET['opta'] == "history")
 {
-  include("pages/bill/search.inc.php");
-  include("pages/bill/pmonth.inc.php");
+  include("pages/bills/search.inc.php");
+  include("pages/bills/pmonth.inc.php");
 }
 elseif ($_GET['opta'] == "add")
 {
@@ -77,7 +77,6 @@ elseif ($_GET['opta'] == "add")
 } else {
 
   include("pages/bill/search.inc.php");
-  /*
   print_optionbar_start('40');
 
 ?>
@@ -125,7 +124,6 @@ elseif ($_GET['opta'] == "add")
 <?php
 
   print_optionbar_end();
-  */
 
   $i=0;
   echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>
diff --git a/html/pages/bill/pmonth.inc.php b/html/pages/bills/pmonth.inc.php
similarity index 90%
rename from html/pages/bill/pmonth.inc.php
rename to html/pages/bills/pmonth.inc.php
index ea4c71303..a3855f8fc 100644
--- a/html/pages/bill/pmonth.inc.php
+++ b/html/pages/bills/pmonth.inc.php
@@ -1,21 +1,21 @@
 <?php
 
   $pagetitle[] = "Previous Billing Period";
-  $i=1;
+  $i=0;
 
-  echo("<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>
-           <tr style=\"font-weight: bold; border-bottom: ".$list_highlight." 1px solid;\">
-             <td width=\"7\"></td>
-             <td width=\"250\">Billing name</td>
+  echo('<table border=0 cellspacing=0 cellpadding=5 class=devicetable width=100%>
+           <tr style="font-weight: bold;">
+             <td width="7"></td>
+             <td width="250">Billing name</td>
              <td>Type</td>
              <td>Allowed</td>
              <td>Inbound</td>
              <td>Outbound</td>
              <td>Total</td>
              <td>95 percentile</td>
-             <td style=\"text-align: center;\">Overusage</td>
-             <td width=\"250\"></td>
-           </tr>");
+             <td style="text-align: center;">Overusage</td>
+             <td width="250"></td>
+           </tr>');
 
   foreach (dbFetchRows("SELECT * FROM `bills` ORDER BY `bill_name`") as $bill)
   {