From: Maxious <maxious@lambdacomplex.org>
Date: Sat, 03 Mar 2012 06:09:55 +0000
Subject: More PHP 5.4 fixes
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=0cbda21c51768137e1632482117908d42a5ae89a
---
More PHP 5.4 fixes
---


--- a/about.php
+++ b/about.php
@@ -36,7 +36,7 @@
     Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
     , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>, <a href="http://itunes.apple.com/app/bus-trips-act/id489146525?mt=8">Bus Trips ACT by Molson Chengalath</a>) 
     , Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>, <A href="https://market.android.com/details?id=GetMe2CanberraFree.source">GetMe2 Canberra by
-Colin Thompson </a>) 
+Colin Thompson </a>, <a href="https://market.android.com/details?id=au.com.transittimes.android">TransitTimes+ by Zervaas Enterprises</a>) 
     and Windows Phone 7 (<a href="http://www.windowsphone.com/en-AU/apps/d840375e-429c-4aa4-a358-80eec6ea9e66">TransHub Canberra by Soul Solutions</a>) Other web clients include <a href="http://canberra.itranzit.com/option.html">iTranzit</a>.
     <br />
     GTFS-realtime API:

--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -55,7 +55,7 @@
 <link rel="dns-prefetch" href="//ajax.googleapis.com">';
     $jqmVersion = "1.0.1";
     echo '
-	<script src="js/yepnope/yepnope.1.5.3-min.js"></script>
+	<script src="'.$basePath.'js/yepnope/yepnope.1.5.3-min.js"></script>
 		 <script>
                  yepnope([{
   load: "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js",

--- a/include/db/servicealert-dao.inc.php
+++ b/include/db/servicealert-dao.inc.php
@@ -21,7 +21,8 @@
     $query = "Select * from calendar_dates where date = :date and exception_type = '1' LIMIT 1";
     // debug($query,"database");
     $query = $conn->prepare($query); // Create a prepared statement
-    $query->bindParam(":date", date("Ymd", ($date != "" ? $date : time())));
+    $date = date("Ymd", ($date != "" ? $date : time()));
+    $query->bindParam(":date", $date);
     $query->execute();
     if (!$query) {
         databaseError($conn->errorInfo());

--- a/labs/busstopdensity.tile.php
+++ b/labs/busstopdensity.tile.php
@@ -15,8 +15,8 @@
 	set_time_limit(120);//2mn
 	ini_set('memory_limit', '256M');
 error_reporting(E_ALL ^ E_DEPRECATED);
-	require_once ($labsPath . 'lib/GoogleMapUtility.php');
-	require_once ($labsPath . 'lib/HeatMap.php');
+	require_once ($basePath . 'lib/GoogleMapUtility.php');
+	require_once ($basePath . 'lib/HeatMap.php');
 
 	//Root folder to store generated tiles
 	define('TILE_DIR', 'tiles/');

--- a/labs/stopBrowser.kml.php
+++ b/labs/stopBrowser.kml.php
@@ -34,7 +34,7 @@
 
 include ('../include/common.inc.php');
 $debugOkay = Array(); // disable debugging output even on dev server
-//$contents = getNearbyStops((($bbox_west + $bbox_east) / 2), ($bbox_south + $bbox_north) / 2, 50, 3000);
+$contents = getNearbyStops((($bbox_west + $bbox_east) / 2), ($bbox_south + $bbox_north) / 2, 50, 3000);
 foreach ($contents as $stop) {
     $description = 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";
     $trips = getStopTripsWithTimes($stop['stop_id'], "", "", "", 3);

--- a/lib/HeatMap.php
+++ b/lib/HeatMap.php
@@ -235,9 +235,9 @@
 			for($x=$x0; $x<=$x1; ++$x){//Loop through x value
 				if(0==(($x-$x0) % $step)){
 					if($steep){
-						self::_drawCircularGradient(&$im, $y, $x, $spot_radius, $dimming);
+						self::_drawCircularGradient($im, $y, $x, $spot_radius, $dimming);
 					}else{ 
-						self::_drawCircularGradient(&$im, $x, $y, $spot_radius, $dimming);
+						self::_drawCircularGradient($im, $x, $y, $spot_radius, $dimming);
 					}
 				}
 				$error -= $deltay;