From: Maxious Date: Tue, 21 Feb 2012 14:10:57 +0000 Subject: Move static resources off amazon S3 X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=9313a23a6647ec457d879a27fd8169cb2ee8e2bc --- Move static resources off amazon S3 --- --- /dev/null +++ b/.gitmodules @@ -1,1 +1,4 @@ +[submodule "lib/amon-php"] + path = lib/amon-php + url = https://github.com/martinrusev/amon-php.git --- a/about.php +++ b/about.php @@ -20,8 +20,8 @@

Busness Time - An ACT bus timetable webapp
Based on the maxious-canberra-transit-feed (download, - last updated )
+ href="http://busresources.lambdacomplex.org/cbrfeed.zip">download, + last updated )
Source code for the transit feed and this --- a/feedback.php +++ b/feedback.php @@ -67,7 +67,7 @@ echo "\nServer host/IP: ".php_uname("n"); echo "\nCurrent date/time: ". date("c"); echo "\nCurrent code revision: ".exec("git rev-parse --short HEAD"); - echo "\nCurrent timetables version: ".date("c",@filemtime('cbrfeed.zip')); + echo "\nCurrent timetables version: ".date("c",@filemtime('../busresources/cbrfeed.zip')); echo "\nDump of session: ".print_r($_SESSION,true); ?> --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -184,20 +184,20 @@ } $serviceAlerts = Array(); $globalAlerts = getServiceAlertsAsArray("agency", "0"); - if ($globalAlerts != nullarray) { + if ($globalAlerts != null) { // echo "getting alerts due to network wide"; $serviceAlerts = array_merge($serviceAlerts, $globalAlerts); } if (isset($stopid)) { $stopAlerts = getServiceAlertsAsArray("stop", $stopid); - if ($stopAlerts != nullarray) { + if ($stopAlerts != null) { // echo "getting alerts due to stop $stopid"; $serviceAlerts = array_merge($serviceAlerts, $stopAlerts); } } if (isset($routeid)) { $routeAlerts = getServiceAlertsAsArray("route", $routeid); - if ($routeAlerts != nullarray) { + if ($routeAlerts != null) { // echo "getting alerts due to route $routeid"; $serviceAlerts = array_merge($serviceAlerts, $routeAlerts); } @@ -229,7 +229,7 @@ s.parentNode.insertBefore(ga, s); })();"; $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); - echo ''; + echo ''; } echo "\n"; } --- a/include/common-transit.inc.php +++ b/include/common-transit.inc.php @@ -245,7 +245,7 @@ return $codec->encode($alerts); } else { - return nullarray; + return null; } } --- a/include/common.inc.php +++ b/include/common.inc.php @@ -61,6 +61,12 @@ || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || $_SERVER['SERVER_NAME'] == "192.168.1.8" || $_SERVER['SERVER_NAME'] == "192.168.178.24"); } +if (isset($_SERVER['SERVER_NAME']) && $_SERVER['SERVER_NAME'] == "maxious.xen.prgmr.com") { +// Set the exception handler +require $basePath."/lib/amon-php/amon.php"; +Amon::setup_exception_handler(); +} + include_once ("common-geo.inc.php"); include_once ("common-net.inc.php"); include_once ("common-transit.inc.php"); --- a/include/db/route-dao.inc.php +++ b/include/db/route-dao.inc.php @@ -59,7 +59,12 @@ databaseError($conn->errorInfo()); return Array(); } - return $query->fetchAll(); + $results = $query->fetchAll(); + if (is_array($results)) { + return $results; + } else { + return Array($results); + } } function getRouteDescription($routeID, $directionID) { $trip = getRouteNextTrip($routeID, $directionID); @@ -120,7 +125,7 @@ function getRouteNextTrip($routeID, $directionID) { global $conn; - $query = "select routes.route_id,direction_id,trips.trip_id,trip_headsign,departure_time from routes join trips on trips.route_id = routes.route_id + $query = "select routes.route_id,direction_id,trips.trip_id,trip_headsign,departure_time,service_id from routes join trips on trips.route_id = routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where arrival_time between :currentTime and :futureTime and routes.route_id = :routeID and trips.direction_id = :directionID order by arrival_time limit 1"; --- /dev/null +++ b/lib/amon-php --- a/routeList.php +++ b/routeList.php @@ -50,17 +50,17 @@ echo '