From: Maxious <maxious@lambdacomplex.org>
Date: Sun, 12 Aug 2012 02:32:36 +0000
Subject: Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=contractdashboard.git&a=commitdiff&h=3bf6c34b764792d50d03d4456eb2484e9b1eafc5
---
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/contractdashboard

Conflicts:
displayAgency.php
---


--- a/displayAgency.php
+++ b/displayAgency.php
@@ -30,7 +30,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();

--- /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>';
 
 ?>