--- a/displayAgency.php
+++ b/displayAgency.php
@@ -3,12 +3,11 @@
 include_once ("./lib/common.inc.php");

 if ($_REQUEST['agency']) {

 

+    include_header("Agency");

     $agency = htmlentities(strip_tags($_REQUEST['agency']));

-    include_header($agency);

-echo '<center><h1>'.$agency.'</h1></center>';

-//    MethodCountGraph($agency);

- //   CnCGraph($agency);

- //   MethodValueGraph($agency);

+    //MethodCountGraph($agency);

+   // CnCGraph($agency);

+    //MethodValueGraph($agency);

     /* biggest contracts

       spending by year

       spending by industry/category

@@ -30,7 +29,7 @@
     "contractStart", "supplierName"

     FROM contractnotice

     WHERE "agencyName" = :agency

-    ORDER BY "value" DESC';

+    ORDER BY "value" DESC limit 100';

     $query = $conn->prepare($query);

     $query->bindParam(":agency", $agency);

     $query->execute();

--- a/displayContract.php
+++ b/displayContract.php
@@ -1,6 +1,7 @@
 <?php

 

 include_once("./lib/common.inc.php");

+include_header("Contract");

 $query = 'SELECT *

 FROM contractnotice

 WHERE  "CNID" = :CNID LIMIT 1';

@@ -8,25 +9,15 @@
 $query = $conn->prepare($query);

 $query->bindParam(":CNID", $_REQUEST['CNID']);

 $query->execute();

-$contractResult = $query->fetch(PDO::FETCH_ASSOC);

-if (!$contractResult) {

-  header("Status: 404 Not Found");

-    header("HTTP/1.0 404 Not Found");

-include_header("Contract Not Found");

- echo "<center><h1>No Contract Notice with that ID found</h1></center>";

 databaseError($conn->errorInfo());

-} else {

-$description = ucsmart($contractResult["description"]);

-include_header($description);

- echo '<center><h1>'.$description.'</h1></center>';

-databaseError($conn->errorInfo());

+foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {

     setlocale(LC_MONETARY, 'en_US');

-    foreach (array_filter($contractResult) as $key => $value) {

+    foreach (array_filter($row) as $key => $value) {

         echo "<b>$key</b>&nbsp;";

         switch ($key) {

             case "supplierName":

             case "supplierABN":

-                echo '<a href="displaySupplier.php?supplier=' . $contractResult['supplierABN'] . '-' . urlencode($contractResult['supplierName']) . '">' . $value . "</a>";

+                echo '<a href="displaySupplier.php?supplier=' . $row['supplierABN'] . '-' . urlencode($row['supplierName']) . '">' . $value . "</a>";

                 break;

             case "agencyName":

                 echo '<a href="displayAgency.php?agency=' . urlencode($value) . '">' . $value . "</a>";

@@ -35,10 +26,11 @@
                 echo "$" . number_format(doubleval($value), 2);

                 break;

             default:

-                echo str_replace("  ", "<br>", ucsmart($value));

+                echo str_replace("  ", "<br>", $value);

         }

         echo "<br>";

     }

+}

 echo '<br><a href="https://www.tenders.gov.au/?event=public.advancedsearch.keyword&keyword=CN' . $_REQUEST['CNID'] . '"> View original record @ tenders.gov.au</a><br>';

 

 

@@ -51,7 +43,7 @@
 foreach ($query->fetchAll() as $r) {

     echo "<b>{$r['heuristic_name']}</b>: {$r['heuristic_value']} (raw value: {$r['raw_value']}, mean: {$r['mean']}, stddev: {$r['stddev']})<br>";

 }

-}

+

 include_footer();

 ?>

 

--- a/displaySupplier.php
+++ b/displaySupplier.php
@@ -3,10 +3,8 @@
 include_once ("./lib/common.inc.php");
 if ($_REQUEST['supplier']) {
 
+    include_header("Supplier");
     $supplierS = htmlentities(strip_tags($_REQUEST['supplier']));
-    include_header(str_replace("%","",$supplierName));
-echo '<center><h1>'.str_replace("%","",$supplierName).'</h1></center>';
-
    // MethodCountGraph($supplierS);
   //  CnCGraph($supplierS);
    // MethodValueGraph($supplierS);

--- /dev/null
+++ b/google676a414ad086cefb.html
@@ -1,1 +1,2 @@
+google-site-verification: google676a414ad086cefb.html
 

--- a/lib/common.inc.php
+++ b/lib/common.inc.php
@@ -105,7 +105,9 @@
 

 $standardQ = ' "childCN" is null '; // AND YEAR(contractStart) >= 2007 AND YEAR(contractStart) <= 2010';

 $start = 0.0;

-

+function local_url() {

+    return "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), '/\\') . "/";

+}

 function include_header($title) {

     global $start;

     ?>

--- a/sitemap.xml.php
+++ b/sitemap.xml.php
@@ -1,27 +1,13 @@
 <?php
-include ('include/common.inc.php');
+include ('lib/common.inc.php');
 $last_updated = date('Y-m-d',@filemtime('cbrfeed.zip'));
 header("Content-Type: text/xml");
 echo "<?xml version='1.0' encoding='UTF-8'?>";
   echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">' . "\n";
-      echo " <url><loc>".curPageURL()."index.php</loc><priority>1.0</priority></url>\n";
+      echo " <url><loc>".local_url()."index.php</loc><priority>1.0</priority></url>\n";
 foreach (scandir("./") as $file) {
-      if (strpos($file,".php") !== false && $file != "index.php" && $file != "sitemap.xml.php") echo " <url><loc>".curPageURL()."$file</loc><priority>0.3</priority></url>\n";
+      if (strpos($file,".php") !== false && $file != "index.php" && $file != "sitemap.xml.php") echo " <url><loc>".local_url()."$file</loc><priority>0.3</priority></url>\n";
 }
-foreach (getStops() as $stop) {
-      echo " <url><loc>".curPageURL()."stop.php?stopid=".htmlspecialchars ($stop["stop_id"])."</loc>";
-	echo "<lastmod>" . $last_updated . "</lastmod>";
-	echo "<changefreq>monthly</changefreq>";
-	echo "<priority>0.9</priority>";
-	echo "</url>\n";
- }
-foreach (getRoutes() as $route) {
-      echo " <url><loc>".curPageURL()."trip.php?routeid=".htmlspecialchars ($route["route_id"])."</loc>";
-	echo "<lastmod>" . $last_updated . "</lastmod>";
-	echo "<changefreq>monthly</changefreq>";
-	echo "<priority>0.9</priority>";
-	echo "</url>\n";
- }
   echo '</urlset>';
 
 ?>