From: Maxious Date: Tue, 21 Feb 2012 03:34:26 +0000 Subject: Add amon monitoring hook X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=4ed61cd206388249695e0f8c69bcb5be4a1cbdd1 --- Add amon monitoring hook --- --- /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/css/local.css.php +++ b/css/local.css.php @@ -55,7 +55,7 @@ visibility: hidden; display: none; } - .servicewarning { + #servicewarning { padding: 1em; margin-bottom: 0.5em; text-size: 0.2em; --- a/include/common-geo.inc.php +++ b/include/common-geo.inc.php @@ -58,8 +58,8 @@ $output = ""; if ($collapsible) $output.= '

Open Map...

'; - if (isIOSDevice()) $output.= 'map of stop location'; - else $output.= 'map of stop location'; + if (isIOSDevice()) $output.= ''; + else $output.= ''; if ($collapsible) $output.= '
'; --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -176,10 +176,10 @@ $overrides = getServiceOverride(); if (isset($overrides['service_id'])) { if ($overrides['service_id'] == "noservice") { - echo '
Buses are not running today due to industrial action/public holiday. See Buses are not running today due to industrial action/public holiday. See http://www.action.act.gov.au for details.
'; } else { - echo '
Buses are running on an altered timetable today due to industrial action/public holiday. See http://www.action.act.gov.au for details.
'; + echo '
Buses are running on an altered timetable today due to industrial action/public holiday. See http://www.action.act.gov.au for details.
'; } } $serviceAlerts = Array(); @@ -204,7 +204,7 @@ } if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) { foreach ($serviceAlerts['entity'] as $entity) { - echo "
{$entity['alert']['header_text']['translation'][0]['text']} " + echo "
{$entity['alert']['header_text']['translation'][0]['text']} " . date("F jS Y, g:i a", $entity['alert']['active_period'][0]['start']) . " to " . date("F jS Y, g:i a", $entity['alert']['active_period'][0]['end']) . "
Warning: {$entity['alert']['description_text']['translation'][0]['text']} --- 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 @@ -125,7 +125,7 @@ function getRouteNextTrip($routeID, $directionID) { global $conn; - $query = "select routes.route_id,routes.route_url,direction_id,trips.trip_id,trip_headsign,departure_time,service_id 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/stop.php +++ b/stop.php @@ -16,9 +16,8 @@ limitations under the License. */ include ('include/common.inc.php'); -if (isset($stopid)) { +if ($stopid) $stop = getStop($stopid); -} /* if ($stopcode != "" && $stop[5] != $stopcode) { $url = $APIurl . "/json/stopcodesearch?q=" . $stopcode; $stopsearch = json_decode(getPage($url)); @@ -86,7 +85,7 @@ echo '
'.$serviceAlert['alert']['description']['translation'].'
'; } */ -echo '
'; +echo ''; echo $stopLinks; if (sizeof($stops) > 0) { trackEvent("View Stops", "View Combined Stops", $stop["stop_name"], $stop["stop_id"]); @@ -103,7 +102,7 @@ timeSettings(); -echo '
'; +echo ''; echo '
    '; if (sizeof($allStopsTrips) > 0) { sktimesort($allStopsTrips, "arrival_time", true); @@ -174,7 +173,7 @@ } } echo '
'; -echo '
'; +echo ''; include_footer(); ?> --- a/stopList.php +++ b/stopList.php @@ -60,7 +60,7 @@ die(); } $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15); - echo '
'; + echo ''; $stopPositions[] = Array( $_SESSION['lat'], $_SESSION['lon'] @@ -73,7 +73,7 @@ } echo staticmap($stopPositions, true, true); placeSettings(); - echo '
'; + echo ''; } else if (isset($suburb)) { $stops = getStopsBySuburb($suburb); include_header("Stops in " . ucwords($suburb), "stopList"); @@ -144,9 +144,8 @@ } } echo ''; - if (isset($nearby)) { - echo '
'; -} + if (isset($nearby)) + echo ''; } include_footer(); ?> --- a/trip.php +++ b/trip.php @@ -33,7 +33,7 @@ $destination = getTripDestination($trip['trip_id']); include_header("Route " . $trip['route_id'] . ' to ' . $destination['stop_name'], "trip"); trackEvent("Route/Trip View", "View Route", $trip['route_id'] . ' ' . $destination['stop_name'], $routeid); -echo '
'; +echo ''; echo 'View Original Timetable/Map '; echo 'View Trip in Google Earth '; echo 'View Route in Google Earth'; @@ -59,7 +59,7 @@ foreach (getRouteHeadsigns($routeid) as $headsign) { if ($headsign['direction_id'] != $directionid || strtolower($headsign['service_id']) != $service_period) { - echo ' Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ') '; + echo ' Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ') '; $otherDir++; } } @@ -67,7 +67,7 @@ if ($otherDir == 0) { echo "None"; } -echo '
'; +echo ''; flush(); @ob_flush(); echo "
"; @@ -83,7 +83,7 @@ $tripStopTimes = getTripStopTimes($tripid); echo '
  • ' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(strtolower($tripStopTimes[0]['service_id'])) . ')
    • '; foreach ($tripStopTimes as $key => $tripStopTime) { - if ($key + 1 >= sizeof($tripStopTimes) || stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) { + if ($key + 1 > sizeof($tripStopTimes) || stopCompare($tripStopTimes[$key]["stop_name"]) != stopCompare($tripStopTimes[$key + 1]["stop_name"])) { echo '
  • '; if (sizeof($stopsGrouped) > 0) { @@ -134,7 +134,7 @@ } } echo ''; -echo '
    • '; +echo '    '; include_footer(); ?>