From: Maxious <maxious@lambdacomplex.org>
Date: Fri, 16 Sep 2011 03:53:46 +0000
Subject: Purge openid-php
X-Git-Url: https://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=0dc105deddf45bf359e88445ba8371b31ec212e4
---
Purge openid-php
---


--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /labs/tiles/16
 /labs/tiles/17
 /labs/tiles/19
+/nbproject/private/

--- a/about.php
+++ b/about.php
@@ -21,10 +21,6 @@
 , <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>) 
 and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
 <br />
-GTFS-realtime API;
-Alerts and Trip Updates (but only Cancelled or Stop Skipped)
-Default format binary but can get JSON by adding ?ascii=yes
-<br />
 <br />
 <small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip.
 Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty, 

--- a/aws/busuiphp.sh
+++ b/aws/busuiphp.sh
@@ -9,6 +9,7 @@
 chcon -R -t httpd_sys_content_rw_t /var/www/labs/tiles
 chmod -R 777 /var/www/labs/tiles
 
+mkdir /var/www/lib/openid-php/oid_store
 chcon -R -t httpd_sys_content_rw_t /var/www/lib/openid-php/oid_store
 chmod -R 777 /var/www/lib/openid-php/oid_store
 

--- a/include/common-auth.inc.php
+++ b/include/common-auth.inc.php
@@ -1,83 +1,33 @@
 <?php
+require $basePath.'lib/openid.php';
+ $openid = new LightOpenID($_SERVER['HTTP_HOST']);
+ 
+function login()
+{
+ global $openid;
+ if(!$openid->mode) {
+    $openid->required = array('contact/email');
+            $openid->identity = 'https://www.google.com/accounts/o8/id';
+            header('Location: ' . $openid->authUrl());
+ }
+    } 
 
-function getScheme() {
-    $scheme = 'http';
-    if (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
-        $scheme .= 's';
-    }
-    return $scheme;
-}
 
-function getTrustRoot() {
-    return sprintf("%s://%s:%s%s/", getScheme(), $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], dirname($_SERVER['PHP_SELF']));
-}
+function auth()
 
-// Includes required files
-set_include_path(get_include_path() . PATH_SEPARATOR . $basePath . "lib/openid-php/");
-require_once "Auth/OpenID/Consumer.php";
-require_once "Auth/OpenID/FileStore.php";
-require_once "Auth/OpenID/AX.php";
-
-function login() {
-    // Just tested this with/for Google, needs trying with others ...
-    $oid_identifier = 'https://www.google.com/accounts/o8/id';
-    // Create file storage area for OpenID data
-    $store = new Auth_OpenID_FileStore('lib/openid-php/oid_store');
-    // Create OpenID consumer
-    $consumer = new Auth_OpenID_Consumer($store);
-    // Create an authentication request to the OpenID provider
-    $auth = $consumer->begin($oid_identifier);
-
-    // Create attribute request object
-    // See http://code.google.com/apis/accounts/docs/OpenID.html#Parameters for parameters
-    // Usage: make($type_uri, $count=1, $required=false, $alias=null)
-    $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/contact/email', 2, 1, 'email');
-    $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/namePerson/first', 1, 1, 'firstname');
-    $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/namePerson/last', 1, 1, 'lastname');
-
-    // Create AX fetch request
-    $ax = new Auth_OpenID_AX_FetchRequest;
-
-    // Add attributes to AX fetch request
-    foreach ($attribute as $attr) {
-        $ax->add($attr);
-    }
-
-    // Add AX fetch request to authentication request
-    $auth->addExtension($ax);
-    $_SESSION['returnURL'] = curPageURL();
-    // Redirect to OpenID provider for authentication
-    $url = $auth->redirectURL(getTrustRoot(), $_SESSION['returnURL']);
-    header('Location: ' . $url);
-}
-
-function auth() {
-    if ($_SESSION['authed'] == true)
-        return true;
-
-    // Create file storage area for OpenID data
-    $store = new Auth_OpenID_FileStore('lib/openid-php/oid_store');
-    // Create OpenID consumer
-    $consumer = new Auth_OpenID_Consumer($store);
-    // Create an authentication request to the OpenID provider
-    $response = $consumer->complete($_SESSION['returnURL']);
-
-    if ($response->status == Auth_OpenID_SUCCESS) {
-        // Get registration informations
-        $ax = new Auth_OpenID_AX_FetchResponse();
-        $obj = $ax->fromSuccessResponse($response);
-        $email = $obj->data['http://axschema.org/contact/email'][0];
-        var_dump($email);
-        if ($email != "maxious@gmail.com") {
+{
+  if ($_SESSION['authed'] == true) return true;
+ global $openid;
+  
+  if($openid->mode) {
+      $attr = $openid->getAttributes();
+        if ($attr["contact/email"] != "maxious@gmail.com") {
             die("Access Denied");
+             } else {
+               $_SESSION['authed'] = true;
+             }
         } else {
-            $_SESSION['authed'] = true;
-        }
-    } else {
         login();
-    }
-}
-
-if ($_REQUEST['janrain_nonce'])
-    auth();
+         } 
+    } 
 ?>

--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -1,166 +1,153 @@
 <?php
-
 // SELECT array_to_string(array(SELECT REPLACE(name_2006, ',', '\,') as name FROM suburbs order by name), ',')
 $suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla");
-
-function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true, $twotone = false) {
-    global $basePath;
-    $width = 300;
-    $height = 300;
-    $metersperpixel[9] = 305.492 * $width;
-    $metersperpixel[10] = 152.746 * $width;
-    $metersperpixel[11] = 76.373 * $width;
-    $metersperpixel[12] = 38.187 * $width;
-    $metersperpixel[13] = 19.093 * $width;
-    $metersperpixel[14] = 9.547 * $width;
-    $metersperpixel[15] = 4.773 * $width;
-    //$metersperpixel[16] = 2.387 * $width;
-    // $metersperpixel[17]=1.193*$width;
-    $center = "";
-    $markers = "";
-    $mapwidthinmeters = 50;
-    if (sizeof($mapPoints) < 1)
-        return "map error";
-    if (sizeof($mapPoints) === 1) {
-        if ($zoom == 0)
-            $zoom = 14;
-        $markers.= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
-        $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
-    }
-    else {
-        foreach ($mapPoints as $index => $mapPoint) {
-            if ($twotone && $index == 0) {
-                $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . "iconr" . ($index + 1);
-                $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
-            } else {
-                $markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . $markerImage . ($index + 1);
-            }
-            if ($index + 1 != sizeof($mapPoints))
-                $markers.= "|";
-            $dist = distance($mapPoints[0][0], $mapPoint[0][1], $mapPoint[0], $mapPoint[1]);
-            $mapwidthinmeters = ($dist > $mapwidthinmeters ? $dist : $mapwidthinmeters);
-            $totalLat+= $mapPoint[0];
-            $totalLon+= $mapPoint[1];
-        }
-        if ($zoom == 0) {
-            $mapwidthinmeters = distance($minlat, $minlon, $minlat, $maxlon);
-            foreach (array_reverse($metersperpixel, true) as $zoomLevel => $maxdistance) {
-                if ($zoom == 0 && $mapwidthinmeters * 1.5 < ($maxdistance))
-                    $zoom = $zoomLevel;
-            }
-        }
-        $center = $totalLat / sizeof($mapPoints) . "," . $totalLon / sizeof($mapPoints);
-    }
-    $output = "";
-    if ($collapsible)
-        $output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
-    $output.= '<img class="map" src="' . curPageURL() . '/' . $basePath . '/lib/staticmaplite/staticmap.php?center=' . $center . '&amp;zoom=' . $zoom . '&amp;size=' . $width . 'x' . $height . '&amp;markers=' . $markers . '" width=' . $width . ' height=' . $height . '>';
-    if ($collapsible)
-        $output.= '</div>';
-    return $output;
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true, $twotone = false)
+{
+	global $labsPath;
+	$width = 300;
+	$height = 300;
+	$metersperpixel[9] = 305.492 * $width;
+	$metersperpixel[10] = 152.746 * $width;
+	$metersperpixel[11] = 76.373 * $width;
+	$metersperpixel[12] = 38.187 * $width;
+	$metersperpixel[13] = 19.093 * $width;
+	$metersperpixel[14] = 9.547 * $width;
+	$metersperpixel[15] = 4.773 * $width;
+	//$metersperpixel[16] = 2.387 * $width;
+	// $metersperpixel[17]=1.193*$width;
+	$center = "";
+	$markers = "";
+	$mapwidthinmeters = 50;
+	if (sizeof($mapPoints) < 1) return "map error";
+	if (sizeof($mapPoints) === 1) {
+		if ($zoom == 0) $zoom = 14;
+		$markers.= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
+		$center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+	}
+	else {
+		foreach ($mapPoints as $index => $mapPoint) {
+			if ($twotone && $index == 0) {
+				$markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . "iconr" . ($index + 1);
+				$center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+			}
+			else {
+				$markers.= $mapPoint[0] . "," . $mapPoint[1] . "," . $markerImage . ($index + 1);
+			}
+			if ($index + 1 != sizeof($mapPoints)) $markers.= "|";
+			$dist = distance($mapPoints[0][0], $mapPoint[0][1], $mapPoint[0], $mapPoint[1]);
+			$mapwidthinmeters = ($dist > $mapwidthinmeters ? $dist : $mapwidthinmeters);
+			$totalLat+= $mapPoint[0];
+			$totalLon+= $mapPoint[1];
+		}
+		if ($zoom == 0) {
+			$mapwidthinmeters = distance($minlat, $minlon, $minlat, $maxlon);
+			foreach (array_reverse($metersperpixel, true) as $zoomLevel => $maxdistance) {
+				if ($zoom == 0 && $mapwidthinmeters * 1.5 < ($maxdistance)) $zoom = $zoomLevel;
+			}
+		}
+		$center = $totalLat / sizeof($mapPoints) . "," . $totalLon / sizeof($mapPoints);
+	}
+	$output = "";
+	if ($collapsible) $output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
+	$output.= '<img class="map" src="' . curPageURL() . '/' . $labsPath . '/lib/staticmaplite/staticmap.php?center=' . $center . '&amp;zoom=' . $zoom . '&amp;size=' . $width . 'x' . $height . '&amp;markers=' . $markers . '" width=' . $width . ' height=' . $height . '>';
+	if ($collapsible) $output.= '</div>';
+	return $output;
 }
-
-function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false) {
-    $pi80 = M_PI / 180;
-    $lat1*= $pi80;
-    $lng1*= $pi80;
-    $lat2*= $pi80;
-    $lng2*= $pi80;
-    $r = 6372.797; // mean radius of Earth in km
-    $dlat = $lat2 - $lat1;
-    $dlng = $lng2 - $lng1;
-    $a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
-    $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
-    $km = $r * $c;
-    if ($roundLargeValues) {
-        if ($km < 1)
-            return floor($km * 1000);
-        else
-            return round($km, 2) . "k";
-    }
-    else
-        return floor($km * 1000);
+function distance($lat1, $lng1, $lat2, $lng2, $roundLargeValues = false)
+{
+	$pi80 = M_PI / 180;
+	$lat1*= $pi80;
+	$lng1*= $pi80;
+	$lat2*= $pi80;
+	$lng2*= $pi80;
+	$r = 6372.797; // mean radius of Earth in km
+	$dlat = $lat2 - $lat1;
+	$dlng = $lng2 - $lng1;
+	$a = sin($dlat / 2) * sin($dlat / 2) + cos($lat1) * cos($lat2) * sin($dlng / 2) * sin($dlng / 2);
+	$c = 2 * atan2(sqrt($a) , sqrt(1 - $a));
+	$km = $r * $c;
+	if ($roundLargeValues) {
+		if ($km < 1) return floor($km * 1000);
+		else return round($km, 2) . "k";
+	}
+	else return floor($km * 1000);
 }
-
-function decodePolylineToArray($encoded) {
-    // source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
-    $length = strlen($encoded);
-    $index = 0;
-    $points = array();
-    $lat = 0;
-    $lng = 0;
-    while ($index < $length) {
-        // Temporary variable to hold each ASCII byte.
-        $b = 0;
-        // The encoded polyline consists of a latitude value followed by a
-        // longitude value.  They should always come in pairs.  Read the
-        // latitude value first.
-        $shift = 0;
-        $result = 0;
-        do {
-            // The `ord(substr($encoded, $index++))` statement returns the ASCII
-            //  code for the character at $index.  Subtract 63 to get the original
-            // value. (63 was added to ensure proper ASCII characters are displayed
-            // in the encoded polyline string, which is `human` readable)
-            $b = ord(substr($encoded, $index++)) - 63;
-            // AND the bits of the byte with 0x1f to get the original 5-bit `chunk.
-            // Then left shift the bits by the required amount, which increases
-            // by 5 bits each time.
-            // OR the value into $results, which sums up the individual 5-bit chunks
-            // into the original value.  Since the 5-bit chunks were reversed in
-            // order during encoding, reading them in this way ensures proper
-            // summation.
-            $result|= ($b & 0x1f) << $shift;
-            $shift+= 5;
-        }
-        // Continue while the read byte is >= 0x20 since the last `chunk`
-        // was not OR'd with 0x20 during the conversion process. (Signals the end)
-        while ($b >= 0x20);
-        // Check if negative, and convert. (All negative values have the last bit
-        // set)
-        $dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1));
-        // Compute actual latitude since value is offset from previous value.
-        $lat+= $dlat;
-        // The next values will correspond to the longitude for this point.
-        $shift = 0;
-        $result = 0;
-        do {
-            $b = ord(substr($encoded, $index++)) - 63;
-            $result|= ($b & 0x1f) << $shift;
-            $shift+= 5;
-        } while ($b >= 0x20);
-        $dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));
-        $lng+= $dlng;
-        // The actual latitude and longitude values were multiplied by
-        // 1e5 before encoding so that they could be converted to a 32-bit
-        // integer representation. (With a decimal accuracy of 5 places)
-        // Convert back to original values.
-        $points[] = array(
-            $lat * 1e-5,
-            $lng * 1e-5
-        );
-    }
-    return $points;
+function decodePolylineToArray($encoded)
+{
+	// source: http://latlongeeks.com/forum/viewtopic.php?f=4&t=5
+	$length = strlen($encoded);
+	$index = 0;
+	$points = array();
+	$lat = 0;
+	$lng = 0;
+	while ($index < $length) {
+		// Temporary variable to hold each ASCII byte.
+		$b = 0;
+		// The encoded polyline consists of a latitude value followed by a
+		// longitude value.  They should always come in pairs.  Read the
+		// latitude value first.
+		$shift = 0;
+		$result = 0;
+		do {
+			// The `ord(substr($encoded, $index++))` statement returns the ASCII
+			//  code for the character at $index.  Subtract 63 to get the original
+			// value. (63 was added to ensure proper ASCII characters are displayed
+			// in the encoded polyline string, which is `human` readable)
+			$b = ord(substr($encoded, $index++)) - 63;
+			// AND the bits of the byte with 0x1f to get the original 5-bit `chunk.
+			// Then left shift the bits by the required amount, which increases
+			// by 5 bits each time.
+			// OR the value into $results, which sums up the individual 5-bit chunks
+			// into the original value.  Since the 5-bit chunks were reversed in
+			// order during encoding, reading them in this way ensures proper
+			// summation.
+			$result|= ($b & 0x1f) << $shift;
+			$shift+= 5;
+		}
+		// Continue while the read byte is >= 0x20 since the last `chunk`
+		// was not OR'd with 0x20 during the conversion process. (Signals the end)
+		while ($b >= 0x20);
+		// Check if negative, and convert. (All negative values have the last bit
+		// set)
+		$dlat = (($result & 1) ? ~($result >> 1) : ($result >> 1));
+		// Compute actual latitude since value is offset from previous value.
+		$lat+= $dlat;
+		// The next values will correspond to the longitude for this point.
+		$shift = 0;
+		$result = 0;
+		do {
+			$b = ord(substr($encoded, $index++)) - 63;
+			$result|= ($b & 0x1f) << $shift;
+			$shift+= 5;
+		} while ($b >= 0x20);
+		$dlng = (($result & 1) ? ~($result >> 1) : ($result >> 1));
+		$lng+= $dlng;
+		// The actual latitude and longitude values were multiplied by
+		// 1e5 before encoding so that they could be converted to a 32-bit
+		// integer representation. (With a decimal accuracy of 5 places)
+		// Convert back to original values.
+		$points[] = array(
+			$lat * 1e-5,
+			$lng * 1e-5
+		);
+	}
+	return $points;
 }
-
-function geocode($query, $giveOptions) {
-    global $cloudmadeAPIkey;
-    $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
-    $contents = json_decode(getPage($url));
-    if ($giveOptions)
-        return $contents->features;
-    elseif (isset($contents->features[0]->centroid))
-        return $contents->features[0]->centroid->coordinates[0] . "," . $contents->features[0]->centroid->coordinates[1];
-    else
-        return "";
+function geocode($query, $giveOptions)
+{
+	global $cloudmadeAPIkey;
+	$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
+	$contents = json_decode(getPage($url));
+	if ($giveOptions) return $contents->features;
+	elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0] . "," . $contents->features[0]->centroid->coordinates[1];
+	else return "";
 }
-
-function reverseGeocode($lat, $lng) {
-    global $cloudmadeAPIkey;
-    $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road";
-    $contents = json_decode(getPage($url));
-    return $contents->features[0]->properties->name;
+function reverseGeocode($lat, $lng)
+{
+	global $cloudmadeAPIkey;
+	$url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road";
+	$contents = json_decode(getPage($url));
+	return $contents->features[0]->properties->name;
 }
-
 ?>
 

--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -1,64 +1,64 @@
 <?php
-
 // Copyright 2009 Google Inc. All Rights Reserved.
 $GA_ACCOUNT = "MO-22173039-1";
 $GA_PIXEL = "/lib/ga.php";
-
-function googleAnalyticsGetImageUrl() {
-    global $GA_ACCOUNT, $GA_PIXEL;
-    //if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";
-    $url = "";
-    $url.= $GA_PIXEL . "?";
-    $url.= "utmac=" . $GA_ACCOUNT;
-    $url.= "&utmn=" . rand(0, 0x7fffffff);
-    $referer = $_SERVER["HTTP_REFERER"];
-    $query = $_SERVER["QUERY_STRING"];
-    $path = $_SERVER["REQUEST_URI"];
-    if (empty($referer)) {
-        $referer = "-";
-    }
-    $url.= "&utmr=" . urlencode($referer);
-    if (!empty($path)) {
-        $url.= "&utmp=" . urlencode($path);
-    }
-    $url.= "&guid=ON";
-    return str_replace("&", "&amp;", $url);
-}
-
-function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) {
-    global $basePath, $serviceAlertsEnabled;
-    echo '
+function googleAnalyticsGetImageUrl()
+{
+	global $GA_ACCOUNT, $GA_PIXEL;
+	//if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";
+	$url = "";
+	$url.= $GA_PIXEL . "?";
+	$url.= "utmac=" . $GA_ACCOUNT;
+	$url.= "&utmn=" . rand(0, 0x7fffffff);
+	$referer = $_SERVER["HTTP_REFERER"];
+	$query = $_SERVER["QUERY_STRING"];
+	$path = $_SERVER["REQUEST_URI"];
+	if (empty($referer)) {
+		$referer = "-";
+	}
+	$url.= "&utmr=" . urlencode($referer);
+	if (!empty($path)) {
+		$url.= "&utmp=" . urlencode($path);
+	}
+	$url.= "&guid=ON";
+	return str_replace("&", "&amp;", $url);
+}
+function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
+{
+	global $labsPath,$serviceAlertsEnabled;
+	echo '
 <!DOCTYPE html> 
 <html lang="en">
 	<head>
         <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1"> 	
-<title>' . $pageTitle . ' - Canberra Bus Timetable</title>
+<title>' . $pageTitle . '</title>
         <meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />
 <link rel="dns-prefetch" href="//code.jquery.com">
 <link rel="dns-prefetch" href="//ajax.googleapis.com">
-	<link rel="stylesheet"  href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';
-    if (isDebugServer()) {
-        $jqmcss = $basePath . 'css/jquery.mobile-1.0b2.css';
-        $jqjs = $basePath . 'js/jquery-1.6.2.min.js';
-        $jqmjs = $basePath . 'js/jquery.mobile-1.0b2.js';
-    } else {
-        $jqmcss = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css";
-        $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js";
-        $jqmjs = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js";
-    }
-    echo '<link rel="stylesheet"  href="' . $jqmcss . '" />
-	<script src="' . $jqjs . '"></script>
+	<link rel="stylesheet"  href="' . $labsPath . 'css/jquery-ui-1.8.12.custom.css" />';
+	if (isDebugServer()) {
+		$jqmcss = $labsPath . 'css/jquery.mobile-1.0b2.css';
+		$jqjs = $labsPath . 'js/jquery-1.6.2.min.js';
+		$jqmjs = $labsPath . 'js/jquery.mobile-1.0b2.js';
+	}
+	else {
+		$jqmcss = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css";
+		$jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js";
+		$jqmjs = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js";
+	}
+	echo '<link rel="stylesheet"  href="' . $jqmcss . '" />
+	<script src="'.$jqjs.'"></script>
 		 <script>$(document).bind("mobileinit", function(){
   $.mobile.ajaxEnabled = false;
 });
 </script> 
-	<script src="' . $jqmjs . '"></script>
-
-<script src="' . $basePath . 'js/jquery.ui.core.min.js"></script>
-<script src="' . $basePath . 'js/jquery.ui.position.min.js"></script>
-<script src="' . $basePath . 'js/jquery.ui.widget.min.js"></script>
-  <script src="' . $basePath . 'js/jquery.ui.autocomplete.min.js"></script>
+	<script src="'.$jqmjs.'"></script>
+
+<script src="' . $labsPath . 'js/jquery.ui.core.min.js"></script>
+<script src="' . $labsPath . 'js/jquery.ui.position.min.js"></script>
+<script src="' . $labsPath . 'js/jquery.ui.widget.min.js"></script>
+  <script src="' . $labsPath . 'js/jquery.ui.autocomplete.min.js"></script>
   <script>
 	$(function() {
 		$( "#geolocate" ).autocomplete({
@@ -75,9 +75,8 @@
 		});
 	});
 	</script>';
-    echo '<style type="text/css">';
-    if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android'))
-        echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b,
+	echo '<style type="text/css">';
+	if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android')) echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b,
 .ui-btn-down-b,.ui-bar-c,.ui-body-c,.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c,.ui-bar-c,.ui-body-d,
 .ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d,.ui-bar-d,.ui-body-e,.ui-btn-up-e,.ui-btn-hover-e,
 .ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a {
@@ -85,25 +84,22 @@
  box-shadow: none;
  -webkit-box-shadow: none;
 }';
-    echo '</style>';
-    echo '<link rel="stylesheet"  href="' . $basePath . 'css/local.css.php" />';
-    if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
-        echo '<meta name="apple-mobile-web-app-capable" content="yes" />
+	echo '</style>';
+	echo '<link rel="stylesheet"  href="' . $labsPath . 'css/local.css.php" />';
+	if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) {
+		echo '<meta name="apple-mobile-web-app-capable" content="yes" />
  <meta name="apple-mobile-web-app-status-bar-style" content="black" />
  <link rel="apple-touch-startup-image" href="startup.png" />
  <link rel="apple-touch-icon" href="apple-touch-icon.png" />';
-    }
-    if ($geolocate) {
-        echo "<script>
+	}
+	if ($geolocate) {
+		echo "<script>
 
 function success(position) {
 $('#error').val('Location now detected. Please wait for data to load.');
 $('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
-$.ajax({ async: false, 
-success: function(){
-	location.reload(true);
-  },
-url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
+$.ajax({ url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
+location.reload(true);
 }
 function error(msg) {
 $('#error').val('Error: '+msg);
@@ -124,12 +120,10 @@
         $('#here').show();
 });
 ";
-        if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "")
-            echo "geolocate();";
-        echo "</script> ";
-    }
-    if (isAnalyticsOn())
-        echo '
+		if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();";
+		echo "</script> ";
+	}
+	if (isAnalyticsOn()) echo '
 <script type="text/javascript">' . "
 
   var _gaq = _gaq || [];
@@ -137,46 +131,47 @@
   _gaq.push(['_trackPageview']);
    _gaq.push(['_trackPageLoadTime']);
 </script>";
-    echo '</head>
+	echo '</head>
 <body>
     <div id="skip">
     <a href="#maincontent">Skip to content</a>
     </div>
  ';
-    if ($opendiv) {
-        echo '<div data-role="page"> 
+	if ($opendiv) {
+		echo '<div data-role="page"> 
 	<div data-role="header" data-position="inline">
 	<a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a> 
 		<h1>' . $pageTitle . '</h1>
-		<a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>
+		<a href="' . $labsPath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>
 	</div><!-- /header -->
         <a name="maincontent" id="maincontent"></a>
         <div data-role="content"> ';
-        $overrides = getServiceOverride();
-        if ($overrides['service_id']) {
-            if ($overrides['service_id'] == "noservice") {
-                echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a 
+		$overrides = getServiceOverride();
+		if ($overrides['service_id']) {
+			if ($overrides['service_id'] == "noservice") {
+				echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a 
 href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
-            } else {
-                echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
-            }
-        }
-        if ($GTFSREnabled) {
-            $serviceAlerts = getServiceAlertsAsArray("agency", "0");
-            foreach ($serviceAlerts['entity'] as $entity) {
-                echo "<div id='servicewarning'>" . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['start'])) . " to " . date("F j, g:i a", strtotime($entity['alert']['active_period'][0]['end'])) . "{$entity['alert']['header_text']['translation'][0]['text']}<br>Warning: {$entity['alert']['description_text']['translation'][0]['text']} 
-			<br><a href='{$entity['alert']['url']['translation'][0]['text']}'>Source</a>  </div>";
-            }
-        }
-    }
-}
-
-function include_footer() {
-    global $basePath;
-    echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a>&nbsp;<a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a>&nbsp;<a href="' . $basePath . 'privacy.php">Privacy Policy</a>';
-    echo '</div>';
-    if (isAnalyticsOn()) {
-        echo "<script>  (function() {
+			}
+			else {
+				echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
+			}
+		}
+		if ($serviceAlertsEnabled) {
+		$serviceAlerts = getServiceAlerts("network","network");
+		foreach ($serviceAlerts['entities'] as $entity) {
+			echo "<div id='servicewarning'>".date("F j, g:i a",strtotime($entity['alert']['active_period']['start']))." to ". date("F j, g:i a", strtotime($entity['alert']['active_period']['end']))."{$entity['alert']['header_text']['translation']['text']}<br>Warning: {$entity['alert']['description_text']['translation']['text']} 
+			<br><a href='{$entity['alert']['url']['translation']['text']}'>Source</a>  </div>";
+		}
+	}
+	}
+}
+function include_footer()
+{
+	global $labsPath;
+	echo '<div id="footer"><a href="' . $labsPath . 'about.php">About/Contact Us</a>&nbsp;<a href="' . $labsPath . 'feedback.php">Feedback/Bug Report</a>&nbsp;<a href="' . $labsPath . 'privacy.php">Privacy Policy</a>';
+	echo '</div>';
+	if (isAnalyticsOn()) {
+		echo "<script>  (function() {
     var ga = document.createElement('script'); ga.type = 
 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 
@@ -184,25 +179,25 @@
     var s = document.getElementsByTagName('script')[0]; 
 s.parentNode.insertBefore(ga, s);
   })();</script>";
-        $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
-        echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
-    }
-    echo "\n</div></div></body></html>";
-}
-
-function placeSettings() {
-    global $service_periods;
-    $geoerror = false;
-    $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "";
-
-    echo '<div id="error">';
-    if ($geoerror) {
-        echo 'Sorry, but your location could not currently be detected.
+		$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
+		echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
+	}
+	echo "\n</div></div></body></html>";
+}
+function placeSettings()
+{
+	global $service_periods;
+	$geoerror = false;
+		$geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "";
+
+	echo '<div id="error">';
+	if ($geoerror) {
+		echo 'Sorry, but your location could not currently be detected.
         Please allow location permission, wait for your location to be detected,
         or enter an address/co-ordinates in the box below.';
-    }
-    echo '</div>';
-    echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">
+	}
+	echo '</div>';
+	echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">
         <h3>Change Location...</h3>
         <form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
         <div class="ui-body"> 
@@ -215,12 +210,11 @@
                 </div></form>
             </div>';
 }
-
-function trackEvent($category, $action, $label = "", $value = - 1) {
-    if (isAnalyticsOn()) {
-        echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
-    }
-}
-
+function trackEvent($category, $action, $label = "", $value = - 1)
+{
+	if (isAnalyticsOn()) {
+		echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
+	}
+}
 ?>
 

--- a/include/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -45,7 +45,7 @@
 		return "";
 	}
 }
-if ($GTFSREnabled) {
+
 $serviceAlertCause = Array(
 "UNKNOWN_CAUSE" => "Unknown cause",
 "OTHER_CAUSE" => "Other cause",
@@ -71,22 +71,7 @@
 "UNKNOWN_EFFECT" => "Unknown effect",
 "STOP_MOVED" => "Stop moved");
 
-set_include_path(get_include_path() . PATH_SEPARATOR . $labsPath."lib/Protobuf-PHP/library/DrSlump/");
-
-include_once("Protobuf.php");
-include_once("Protobuf/Message.php");
-include_once("Protobuf/Registry.php");
-include_once("Protobuf/Descriptor.php");
-include_once("Protobuf/Field.php");
-
-include_once($labsPath."lib/Protobuf-PHP/gtfs-realtime.php");
-include_once("Protobuf/CodecInterface.php");
-include_once("Protobuf/Codec/PhpArray.php");
-include_once("Protobuf/Codec/Binary.php");
-include_once("Protobuf/Codec/Binary/Writer.php");
-include_once("Protobuf/Codec/Json.php");
-
-function getServiceAlerts($filter_class = "", $filter_id = "") {
+function getServiceAlerts($filter_class, $filter_id) {
 /*
 
   also need last modified epoch of client gtfs
@@ -106,82 +91,40 @@
             street inform: route inform, trip inform, stop inform
             route patch: trip remove
             */
-            $fm = new transit_realtime\FeedMessage();
-$fh = new transit_realtime\FeedHeader();
-$fh->setGtfsRealtimeVersion(1);
-$fh->setTimestamp(time());
-$fm->setHeader($fh);
+$return = Array();
+$return['header']['gtfs_realtime_version'] = "1";
+$return['header']['timestamp'] = time();
+$return['header']['incrementality'] =  "FULL_DATASET";
+$return['entities'] = Array();
 foreach(getCurrentAlerts() as $alert) {
-$fe = new transit_realtime\FeedEntity();
-	$fe->setId($alert['id']);
-	$fe->setIsDeleted(false);
-	$alert = new transit_realtime\Alert();	
-		$tr = new transit_realtime\TimeRange();
-			$tr->setStart($alert['start']);
-			$tr->setEnd($alert['end']);
-		$alert-> addActivePeriod($tr);
-			$informedEntities = getInformedAlerts($alert['id'],$_REQUEST['filter_class'],$_REQUEST['filter_id']);
+	$informedEntities = getInformedAlerts($alert['id'],$_REQUEST['filter_class'],$_REQUEST['filter_id']);
 	if (sizeof($informedEntities) >0) {
-		$informed = Array();
-		$es = new transit_realtime\EntitySelector();
-		if ($informedEntity['informed_class'] == "agency") {
-			$es->setAgencyId($informedEntity['informed_id']);
+		$entity = Array();
+		$entity['id'] = $alert['id'];
+		$entity['alert']['active_period']['start'] = $alert['start'];
+		$entity['alert']['active_period']['end'] = $alert['end'];
+		$entity['alert']['url']['translation']['text'] = $alert['url'];
+		$entity['alert']['url']['translation']['language'] = 'en';
+		$entity['alert']['header_text']['translation']['text'] = $alert['header'];
+		$entity['alert']['header_text']['translation']['language'] = 'en';
+		$entity['alert']['description_text']['translation']['text'] = $alert['description'];
+		$entity['alert']['description_text']['translation']['language'] = 'en';
+		
+		foreach ($informedEntities as $informedEntity) {
+			$informed = Array();
+			$informed[$informedEntity['informed_class']."_id"] = $informedEntity['informed_id'];
+			if ($informedEntity['informed_action'] != "") $informed["x-action"] = $informedEntity['informed_action'];
+			$informed[$informedEntity['class']."_type"] = $informedEntity['type'];
+			$entity['informed'][] = $informed; 
 		}
-		if ($informedEntity['informed_class'] == "stop") {
-			$es->setStopId($informedEntity['informed_id']);
-		}
-		if ($informedEntity['informed_class'] == "route") {
-			$es->setRouteId($informedEntity['informed_id']);
-		}
-		if ($informedEntity['informed_class'] == "trip") {
-			$td = new transit_realtime\TripDescriptor();
-				$td->setTripId($informedEntity['informed_id']);
-			$es->setTrip($td);
-		}
-		$alert-> addInformedEntity($es);
+		$return['entities'][] = $entity;
 	}
-		$alert->setCause(constant("transit_realtime\Alert\Cause::".$alert['cause']));
-		$alert->setEffect(constant("transit_realtime\Alert\Effect::".$alert['effect']));
-		$tsUrl = new transit_realtime\TranslatedString();
-			$tUrl = new transit_realtime\TranslatedString\Translation();
-				$tUrl->setText($alert['url']);
-				$tUrl->setLanguage("en");
-			$tsUrl->addTranslation($tUrl);
-		$alert->setUrl($tsUrl);
-		$tsHeaderText= new transit_realtime\TranslatedString();
-			$tHeaderText = new transit_realtime\TranslatedString\Translation();
-				$tHeaderText->setText($alert['header']);
-				$tHeaderText->setLanguage("en");
-			$tsHeaderText->addTranslation($tHeaderText);
-		$alert->setHeaderText($tsHeaderText);
-		$tsDescriptionText= new transit_realtime\TranslatedString();
-			$tDescriptionText = new transit_realtime\TranslatedString\Translation();
-				$tDescriptionText->setText($alert['description']);
-				$tDescriptionText->setLanguage("en");
-			$tsDescriptionText->addTranslation($tDescriptionText);
-		$alert->setDescriptionText($tsDescriptionText);
-	$fe->setAlert($alert);
-$fm->addEntity($fe);
 }
-return $fm;
-}
-function getServiceAlertsAsArray($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\PhpArray();
-	return $codec->encode(getServiceAlerts($filter_class, $filter_id));
-}
-
-function getServiceAlertsAsBinary($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\Binary();
-	return $codec->encode(getServiceAlerts($filter_class, $filter_id));
-}
-
-function getServiceAlertsAsJSON($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\Json();
-	return $codec->encode(getServiceAlerts($filter_class, $filter_id));
+return $return;
 }
 function getServiceAlertsByClass() {
 	$return = Array();
-	$alerts = getServiceAlertsAsArray("","");
+	$alerts = getServiceAlerts("","");
 	foreach ($alerts['entities'] as $entity) {
 		foreach ($entity['informed'] as $informed) {
 			foreach($informed as $key => $value){
@@ -191,70 +134,10 @@
 					$id = $value;
 				}
 			}
-		$return[$class][$id][] = $entity;
+		$return[$class][$id][]['entity'] = $entity;
+		$return[$class][$id][]['action'] = $informed["x-action"];
 	}
 	}
 }
-
-function getTripUpdates($filter_class = "", $filter_id = "") {
-     $fm = new transit_realtime\FeedMessage();
-$fh = new transit_realtime\FeedHeader();
-$fh->setGtfsRealtimeVersion(1);
-$fh->setTimestamp(time());
-$fm->setHeader($fh);
-foreach(getCurrentAlerts() as $alert) {
-			$informedEntities = getInformedAlerts($alert['id'],$_REQUEST['filter_class'],$_REQUEST['filter_id']);
-	$stops = Array();
-		$routestrips = Array();
-		if (sizeof($informedEntities) >0) {
-		if ($informedEntity['informed_class'] == "stop" && $informed["x-action"] == "remove") {
-			$stops[] = $informedEntity['informed_id'];
-		}
-		if (($informedEntity['informed_class'] == "route" || $informedEntity['informed_class'] == "trip") && $informed["x-action"] == "patch" ) {
-			$routestrips[] = Array( "id" => $informedEntity['informed_id'],
-			"type"=>$informedEntity['informed_class']);
-		}
-		}
-foreach ($routestrips as $routetrip) {
-$fe = new transit_realtime\FeedEntity();
-	$fe->setId($alert['id'].$routetrip['id']);
-	$fe->setIsDeleted(false);
-	$tu = new transit_realtime\TripUpdate();	
-		$td = new transit_realtime\TripDescriptor();
-		if ($routetrip['type'] == "route") {
-			$td->setRouteId($routetrip['id']);
-			} else if ($routetrip['type'] == "trip") {
-				$td->setTripId($routetrip['id']);
-			}
-		$tu->setTrip($td);
-		foreach ($stops as $stop) {
-		$stu = new transit_realtime\TripUpdate\StopTimeUpdate();
-				$stu->setStopId($stop);
-				$stu->setScheduleRelationship(transit_realtime\TripUpdate\StopTimeUpdate\ScheduleRelationship::SKIPPED);
-		$tu->addStopTimeUpdate($stu);
-	}
-	$fe->setTripUpdate($tu);
-$fm->addEntity($fe);
-}		
-
-}
-return $fm;
-	
-}
-function getTripUpdatesAsArray($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\PhpArray();
-	return $codec->encode(getTripUpdates($filter_class, $filter_id));
-}
-
-function getTripUpdatesAsBinary($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\Binary();
-	return $codec->encode(getTripUpdates($filter_class, $filter_id));
-}
-
-function getTripUpdatesAsJSON($filter_class = "", $filter_id = "") {
-	$codec = new DrSlump\Protobuf\Codec\Json();
-	return $codec->encode(getTripUpdates($filter_class, $filter_id));
-}
-}
 ?>
 

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -1,43 +1,39 @@
 <?php
-
 date_default_timezone_set('Australia/ACT');
 $debugOkay = Array(
-    "session",
-    "json",
-    "phperror",
-    "awsotp",
-    //"squallotp",
-    //"vanilleotp",
-    "database",
-    "other"
+	"session",
+	"json",
+	"phperror",
+	"awsotp",
+	//"squallotp",
+	//"vanilleotp",
+	"database",
+	"other"
 );
-$GTFSREnabled = true;
+$serviceAlertsEnabled = true;
 $cloudmadeAPIkey = "daa03470bb8740298d4b10e3f03d63e6";
 $googleMapsAPIkey = "ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
 $otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
 if (isDebug("awsotp") || php_uname('n') == "maxious.xen.prgmr.com") {
-    $otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';
+	$otpAPIurl = 'http://bus-main.lambdacomplex.org:8080/opentripplanner-api-webapp/';
 }
 if (isDebug("dotcloudotp") || php_uname('n') == "actbus-www") {
-    $otpAPIurl = 'http://otp.actbus.dotcloud.com/opentripplanner-api-webapp/';
+	$otpAPIurl = 'http://otp.actbus.dotcloud.com/opentripplanner-api-webapp/';
 }
 if (isDebug("squallotp")) {
-    $otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
+		$otpAPIurl = 'http://10.0.1.108:5080/opentripplanner-api-webapp/';
 }
 if (isDebug("vanilleotp")) {
-    $otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';
+		$otpAPIurl = 'http://10.0.1.135:8080/opentripplanner-api-webapp/';
 }
-if (isDebug("phperror"))
-    error_reporting(E_ALL ^ E_NOTICE);
-$basePath = "";
-if (strstr($_SERVER['PHP_SELF'], "labs/")
-        || strstr($_SERVER['PHP_SELF'], "myway/")
-        || strstr($_SERVER['PHP_SELF'], "servicealerts/"))
-    $basePath = "../";
+if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
+$labsPath = "";
+if (strstr($_SERVER['PHP_SELF'],"labs")) $labsPath = "../";
 
-function isDebugServer() {
-    return php_sapi_name() == "cli" || isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "azusa" || $_SERVER['SERVER_NAME'] == "vanille"
-            || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1");
+function isDebugServer()
+{
+	return php_sapi_name() == "cli" || isset($_SERVER['SERVER_NAME']) && ( $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "10.1.0.4" || $_SERVER['SERVER_NAME'] == 
+"localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1") ;
 }
 
 include_once ("common-geo.inc.php");
@@ -50,154 +46,149 @@
 include_once ("common-auth.inc.php");
 include_once ("common-template.inc.php");
 
-function isAnalyticsOn() {
-    $user_agent = $_SERVER['HTTP_USER_AGENT'];
-    return!isDebugServer() && !preg_match('/cloudkick/i', $user_agent) && !preg_match('/googlebot/i', $user_agent) &&
-            !preg_match('/baidu/i', $user_agent);
+
+function isAnalyticsOn()
+{
+	return !isDebugServer();
+}
+function isDebug($debugReason = "other")
+{
+	global $debugOkay;
+	return in_array($debugReason, $debugOkay, false) && isDebugServer();
 }
 
-function isDebug($debugReason = "other") {
-    global $debugOkay;
-    return in_array($debugReason, $debugOkay, false) && isDebugServer();
+function debug($msg, $debugReason = "other")
+{
+	if (isDebug($debugReason)) echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
+}
+function isJQueryMobileDevice()
+{
+	// http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
+	$user_agent = $_SERVER['HTTP_USER_AGENT'];
+	return preg_match('/iphone/i', $user_agent) || preg_match('/android/i', $user_agent) || preg_match('/webos/i', $user_agent) || preg_match('/ios/i', $user_agent) || preg_match('/bada/i', $user_agent) || preg_match('/maemo/i', $user_agent) || preg_match('/meego/i', $user_agent) || preg_match('/fennec/i', $user_agent) || (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) || (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) || (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5);
+}
+function isFastDevice()
+{
+	$ua = $_SERVER['HTTP_USER_AGENT'];
+	$fastDevices = Array(
+		"Mozilla/5.0 (X11;",
+		"Mozilla/5.0 (Windows;",
+		"Mozilla/5.0 (iP",
+		"Mozilla/5.0 (Linux; U; Android",
+		"Mozilla/4.0 (compatible; MSIE"
+	);
+	$slowDevices = Array(
+		"J2ME",
+		"MIDP",
+		"Opera/",
+		"Mozilla/2.0 (compatible;",
+		"Mozilla/3.0 (compatible;"
+	);
+	return true;
+}
+function array_flatten($a, $f = array())
+{
+	if (!$a || !is_array($a)) return '';
+	foreach ($a as $k => $v) {
+		if (is_array($v)) $f = array_flatten($v, $f);
+		else $f[$k] = $v;
+	}
+	return $f;
+}
+function remove_spaces($string)
+{
+	return str_replace(' ', '', $string);
+}
+function object2array($object)
+{
+	if (is_object($object)) {
+		foreach ($object as $key => $value) {
+			$array[$key] = $value;
+		}
+	}
+	else {
+		$array = $object;
+	}
+	return $array;
+}
+function startsWith($haystack, $needle, $case = true)
+{
+	if ($case) {
+		return (strcmp(substr($haystack, 0, strlen($needle)) , $needle) === 0);
+	}
+	return (strcasecmp(substr($haystack, 0, strlen($needle)) , $needle) === 0);
 }
 
-function debug($msg, $debugReason = "other") {
-    if (isDebug($debugReason))
-        echo "\n<!-- " . date(DATE_RFC822) . "\n $msg -->\n";
+function endsWith($haystack, $needle, $case = true)
+{
+	if ($case) {
+		return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0);
+	}
+	return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)) , $needle) === 0);
 }
-
-function isJQueryMobileDevice() {
-    // http://forum.jquery.com/topic/what-is-the-best-way-to-detect-all-useragents-which-can-handle-jquery-mobile#14737000002087897
-    $user_agent = $_SERVER['HTTP_USER_AGENT'];
-    return preg_match('/iphone/i', $user_agent) || preg_match('/android/i', $user_agent) || preg_match('/webos/i', $user_agent) || preg_match('/ios/i', $user_agent) || preg_match('/bada/i', $user_agent) || preg_match('/maemo/i', $user_agent) || preg_match('/meego/i', $user_agent) || preg_match('/fennec/i', $user_agent) || (preg_match('/symbian/i', $user_agent) && preg_match('/s60/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/symbian/i', $user_agent) && preg_match('/platform/i', $user_agent) && $browser['majorver'] >= 3) || (preg_match('/blackberry/i', $user_agent) && $browser['majorver'] >= 5) || (preg_match('/opera mobile/i', $user_agent) && $browser['majorver'] >= 10) || (preg_match('/opera mini/i', $user_agent) && $browser['majorver'] >= 5);
+function bracketsMeanNewLine($input)
+{
+	return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
 }
-
-function isFastDevice() {
-    $ua = $_SERVER['HTTP_USER_AGENT'];
-    $fastDevices = Array(
-        "Mozilla/5.0 (X11;",
-        "Mozilla/5.0 (Windows;",
-        "Mozilla/5.0 (iP",
-        "Mozilla/5.0 (Linux; U; Android",
-        "Mozilla/4.0 (compatible; MSIE"
-    );
-    $slowDevices = Array(
-        "J2ME",
-        "MIDP",
-        "Opera/",
-        "Mozilla/2.0 (compatible;",
-        "Mozilla/3.0 (compatible;"
-    );
-    return true;
+function sksort(&$array, $subkey = "id", $sort_ascending = false)
+{
+	if (count($array)) $temp_array[key($array) ] = array_shift($array);
+	foreach ($array as $key => $val) {
+		$offset = 0;
+		$found = false;
+		foreach ($temp_array as $tmp_key => $tmp_val) {
+			if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
+				$temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array(
+					$key => $val
+				) , array_slice($temp_array, $offset));
+				$found = true;
+			}
+			$offset++;
+		}
+		if (!$found) $temp_array = array_merge($temp_array, array(
+			$key => $val
+		));
+	}
+	if ($sort_ascending) $array = array_reverse($temp_array);
+	else $array = $temp_array;
 }
-
-function array_flatten($a, $f = array()) {
-    if (!$a || !is_array($a))
-        return '';
-    foreach ($a as $k => $v) {
-        if (is_array($v))
-            $f = array_flatten($v, $f);
-        else
-            $f[$k] = $v;
-    }
-    return $f;
+function sktimesort(&$array, $subkey = "id", $sort_ascending = false)
+{
+	if (count($array)) $temp_array[key($array) ] = array_shift($array);
+	foreach ($array as $key => $val) {
+		$offset = 0;
+		$found = false;
+		foreach ($temp_array as $tmp_key => $tmp_val) {
+			if (!$found and strtotime($val[$subkey]) > strtotime($tmp_val[$subkey])) {
+				$temp_array = array_merge((array)array_slice($temp_array, 0, $offset) , array(
+					$key => $val
+				) , array_slice($temp_array, $offset));
+				$found = true;
+			}
+			$offset++;
+		}
+		if (!$found) $temp_array = array_merge($temp_array, array(
+			$key => $val
+		));
+	}
+	if ($sort_ascending && isset($temp_array)) $array = array_reverse($temp_array);
+	else $array = $temp_array;
 }
-
-function remove_spaces($string) {
-    return str_replace(' ', '', $string);
-}
-
-function object2array($object) {
-    if (is_object($object)) {
-        foreach ($object as $key => $value) {
-            $array[$key] = $value;
-        }
-    } else {
-        $array = $object;
-    }
-    return $array;
-}
-
-function startsWith($haystack, $needle, $case = true) {
-    if ($case) {
-        return (strcmp(substr($haystack, 0, strlen($needle)), $needle) === 0);
-    }
-    return (strcasecmp(substr($haystack, 0, strlen($needle)), $needle) === 0);
-}
-
-function endsWith($haystack, $needle, $case = true) {
-    if ($case) {
-        return (strcmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
-    }
-    return (strcasecmp(substr($haystack, strlen($haystack) - strlen($needle)), $needle) === 0);
-}
-
-function bracketsMeanNewLine($input) {
-    return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
-}
-
-function sksort(&$array, $subkey = "id", $sort_ascending = false) {
-    if (count($array))
-        $temp_array[key($array)] = array_shift($array);
-    foreach ($array as $key => $val) {
-        $offset = 0;
-        $found = false;
-        foreach ($temp_array as $tmp_key => $tmp_val) {
-            if (!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey])) {
-                $temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(
-                    $key => $val
-                        ), array_slice($temp_array, $offset));
-                $found = true;
-            }
-            $offset++;
-        }
-        if (!$found)
-            $temp_array = array_merge($temp_array, array(
-                $key => $val
-                    ));
-    }
-    if ($sort_ascending)
-        $array = array_reverse($temp_array);
-    else
-        $array = $temp_array;
-}
-
-function sktimesort(&$array, $subkey = "id", $sort_ascending = false) {
-    if (count($array))
-        $temp_array[key($array)] = array_shift($array);
-    foreach ($array as $key => $val) {
-        $offset = 0;
-        $found = false;
-        foreach ($temp_array as $tmp_key => $tmp_val) {
-            if (!$found and strtotime($val[$subkey]) > strtotime($tmp_val[$subkey])) {
-                $temp_array = array_merge((array) array_slice($temp_array, 0, $offset), array(
-                    $key => $val
-                        ), array_slice($temp_array, $offset));
-                $found = true;
-            }
-            $offset++;
-        }
-        if (!$found)
-            $temp_array = array_merge($temp_array, array(
-                $key => $val
-                    ));
-    }
-    if ($sort_ascending && isset($temp_array))
-        $array = array_reverse($temp_array);
-    else
-        $array = $temp_array;
-}
-
-function r_implode($glue, $pieces) {
-    foreach ($pieces as $r_pieces) {
-        if (is_array($r_pieces)) {
-            $retVal[] = r_implode($glue, $r_pieces);
-        } else {
-            $retVal[] = $r_pieces;
-        }
-    }
-    return implode($glue, $retVal);
-}
+function r_implode( $glue, $pieces ) 
+{ 
+  foreach( $pieces as $r_pieces ) 
+  { 
+    if( is_array( $r_pieces ) ) 
+    { 
+      $retVal[] = r_implode( $glue, $r_pieces ); 
+    } 
+    else 
+    { 
+      $retVal[] = $r_pieces; 
+    } 
+  } 
+  return implode( $glue, $retVal ); 
+} 
 
 ?>
 

--- a/include/db/servicealert-dao.inc.php
+++ b/include/db/servicealert-dao.inc.php
@@ -17,7 +17,7 @@
 function getServiceAlert($alertID)
 {
      global $conn;
-     $query = "SELECT id,extract('epoch', start) as start, extract('epoch', end) as end,cause,effect,header,description,url from servicealerts_alerts where id = :servicealert_id";
+     $query = 'SELECT * from servicealerts_alerts where id = :servicealert_id';
      debug($query, "database");
      $query = $conn -> prepare($query);
      $query -> bindParam(":servicealert_id", $alertID);
@@ -30,16 +30,15 @@
     } 
 
 
-function updateServiceAlert($alertID, $start, $end, $header, $description, $url)
+function updateServiceAlert($alertID, $start, $end, $description, $url)
 {
      global $conn;
-     $query = 'update servicealerts_alerts set start=:start, "end"=:end, header=:header, description=:description, url=:url where id = :servicealert_id';
+     $query = 'update servicealerts_alerts set start=:start, "end"=:end, description=:description, url=:url where id = :servicealert_id';
      debug($query, "database");
      $query = $conn -> prepare($query);
      $query -> bindParam(":servicealert_id", $alertID);
      $query -> bindParam(":start", $start);
      $query -> bindParam(":end", $end);
-     $query -> bindParam(":header", $header);
      $query -> bindParam(":description", $description);
      $query -> bindParam(":url", $url);
      $query -> execute();
@@ -52,15 +51,14 @@
     return $query -> fetch(PDO :: FETCH_ASSOC);
     } 
 
-    function addServiceAlert($start, $end, $header, $description, $url)
+    function addServiceAlert($start, $end, $description, $url)
 {
      global $conn;
-     $query = 'INSERT INTO servicealerts_alerts (start, "end", header, description, url) VALUES (:start, :end, :header, :description, :url) ';
+     $query = 'INSERT INTO servicealerts_alerts (start, "end", description, url) VALUES (:start, :end, :description, :url) ';
      debug($query, "database");
      $query = $conn -> prepare($query);
      $query -> bindParam(":start", $start);
      $query -> bindParam(":end", $end);
-     $query -> bindParam(":header", $header);
      $query -> bindParam(":description", $description);
      $query -> bindParam(":url", $url);
      $query -> execute();
@@ -76,7 +74,7 @@
 function getCurrentAlerts()
 {
      global $conn;
-     $query = "SELECT id,extract('epoch', start) as start, extract('epoch', end) as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start and NOW() < \"end\"";
+     $query = 'SELECT * from servicealerts_alerts where NOW() > start and NOW() < "end"';
      // debug($query, "database");
     $query = $conn -> prepare($query);
      $query -> execute();
@@ -90,7 +88,7 @@
 function getFutureAlerts()
 {
      global $conn;
-     $query = "SELECT id,extract('epoch', start) as start, extract('epoch', end) as end,cause,effect,header,description,url from servicealerts_alerts where NOW() > start or NOW() < \"end\"";
+     $query = 'SELECT * from servicealerts_alerts where NOW() > start or NOW() < "end"';
      // debug($query, "database");
     $query = $conn -> prepare($query);
      $query -> execute();

--- a/index.php
+++ b/index.php
@@ -25,7 +25,6 @@
             </ul>
 <?php
 echo ' <a href="labs/index.php" data-role="button" data-icon="beaker">Busness R&amp;D</a>';
-echo ' <a href="myway/index.php" data-role="button">MyWay Balance and Timeliness Survey Results</a>';
 include_footer(true)
 ?>
 

--- a/labs/index.php
+++ b/labs/index.php
@@ -2,15 +2,40 @@
 include ('../include/common.inc.php');
 
 include_header("Busness R&amp;D", "index");
+ if ($_SESSION['authed'] == true) {
+ 	echo '<ul data-role="listview" data-theme="e" data-groupingtheme="e">
+		<li data-role="list-divider" > Admin Features </li>
+		<li><a href="myway_timeliness_calculate.php"><h3>myway_timeliness_calculate</h3>
+		<p>myway_timeliness_calculate</p></a></li>
+		<li><a href="myway_timeliness_reconcile.php"><h3>myway_timeliness_reconcile</h3>
+		<p>myway_timeliness_reconcile</p></a></li>
+		<li><a href="servicealert_editor.php"><h3>servicealert_editor</h3>
+		<p>servicealert_editor</p></a></li>
+            </ul>';
+ }
 ?>
 	    <ul data-role="listview" data-theme="e" data-groupingtheme="e">
 		<li data-role="list-divider" > Experimental Features </li>
+		<li><a href="mywaybalance.php"><h3>MyWay Balance for mobile</h3>
+		<p>Mobile viewer for MyWay balance. Warning! No HTTPS security.</p></a></li>
 		<li><a href="busstopdensity.php"><h3>Bus Stop Density Map</h3>
 		<p>Analysis of bus stop coverage</p></a></li>
 		<li><a href="stopBrowser.php"><h3>Bus Stop Browser Map</h3>
 		<p>Bus stop location/route browser</p></a></li>
             </ul>
-  	    </div>
+   <ul data-role="listview" data-theme="e" data-groupingtheme="e">
+
+		<li data-role="list-divider" > MyWay Timeliness Graphs </li>
+		<li><a href="myway_timeliness.php"><h3>Timeliness over Day</h3>
+		<p>Displays the deviation from the timetable over the day</p></a></li>
+		<li><a href="myway_timeliness_freqdist.php"><h3>Frequency Distribution of Time Deviation</h3>
+		<p>Displays spread of time deviations</p></a></li>
+		<li><a href="myway_timeliness_route.php"><h3>Timeliness over Route</h3>
+		<p>Displays the deviation from timetable as a specific route progresses</p></a></li>
+		<li><a href="myway_timeliness_stop.php"><h3>Timeliness at Stop</h3>
+		<p>Displays the deviation from the timetable at a specific stop</p></a></li>
+            </ul>
+	    </div>
 <?php
 include_footer()
 ?>

--- /dev/null
+++ b/labs/myway_api.json.php
@@ -1,1 +1,142 @@
+<?php
+function cleanString($subject)
+{
+	$subject = str_replace("&nbsp;", " ", $subject);
+	$subject = str_replace("&", "&amp;", $subject);
+	$subject = preg_replace('/[^\r\n\t\x20-\x7E\xA0-\xFF]/', '', $subject);
+	$subject = str_replace("  ", " ", $subject);
+	return trim($subject);
+}
+$return = Array();
+/*if (file_exists("mywayresponse.txt")) {
+	@$fh = fopen("mywayresponse.txt", 'r');
+	if ($fh) {
+		$pageHTML = fread($fh, filesize("mywayresponse.txt"));
+		fclose($fh);
+	}
+}*/
+//set POST variables
+$url = 'https://www.action.act.gov.au/ARTS/use_Funcs.asp';
+//$url = 'http://localhost/myway.htm';
+$field_mapping = Array(
+	"card_number" => "SRNO",
+	"DOBmonth" => "month",
+	"DOBday" => "day",
+	"DOByear" => "year",
+	"secret_answer" => "pwrd",
+	"button" => "Submit"
+);
+foreach (Array(
+	"card_number",
+	"DOBday",
+	"DOBmonth",
+	"DOByear"
+) as $field_name) {
+	if (isset($_REQUEST[$field_name])) {
+		$fields[$field_name] = filter_var($_REQUEST[$field_name], FILTER_SANITIZE_NUMBER_INT);
+	}
+	else {
+		$return["error"][] = $field_name. " parameter invalid or unspecified";
+	}
+}
+if (isset($_REQUEST['secret_answer'])) {
+	$fields['secret_answer'] = filter_var($_REQUEST['secret_answer'], FILTER_SANITIZE_STRING, Array(
+		FILTER_FLAG_NO_ENCODE_QUOTES,
+		FILTER_FLAG_STRIP_HIGH,
+		FILTER_FLAG_STRIP_LOW
+	));
+}
+else {
+	$return["error"][] = "secret_answer parameter invalid or unspecified";
+}
+$fields['button'] = 'Submit';
+$fields_string = "";
+//url-ify the data for the POST
+foreach ($fields as $key => $value) {
+	if (sizeof($value) === 0) $return['error'][] = $key . " parameter invalid or unspecified";
+	$fields_string.= $field_mapping[$key] . '=' . $value . '&';
+}
+$fields_string = rtrim($fields_string, '&');
+if (!isset($return['error'])) {
+	//open connection
+	$ch = curl_init();
+	//set the url, number of POST vars, POST data
+	curl_setopt($ch, CURLOPT_URL, $url);
+	curl_setopt($ch, CURLOPT_POST, count($fields));
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_REFERER, "https://www.action.act.gov.au/ARTS/getbalance.asp");
+	curl_setopt($ch, CURLOPT_HEADER, 0);
+	curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+	//execute post
+	$pageHTML = curl_exec($ch);
+	if (curl_errno($ch)) $return["error"][] = "Network error " . curl_errno($ch) . " " . curl_error($ch) . " " . $url . $fields_string;
+	//close connection
+	curl_close($ch);
+}
 
+if (!isset($return['error'])) {
+	include_once ('../lib/simple_html_dom.php');
+	//print_r($pageHTML);
+	$page = str_get_html($pageHTML);
+	$pageAlerts = $page->find(".smartCardAlert");
+	if (sizeof($pageAlerts) > 0) {
+		$return['error'][] = $pageAlerts[0]->plaintext;
+	}
+	if (!isset($return['error'])) {
+		$tableNum = 0;
+		$tableName = Array(
+			1 => "myway_carddetails",
+			2 => "myway_transactions"
+		);
+		foreach ($page->find("table") as $table) {
+			$tableNum++;
+			$tableColumns = Array();
+			$tableColumnNum = 0;
+			foreach ($table->find("th") as $th) {
+				$tableColumns[$tableColumnNum] = cleanString($th->plaintext);
+				$tableColumnNum++;
+			}
+			//print_r($tableColumns);
+			$tableRowNum = 0;
+			foreach ($table->find("tr") as $tr) {
+				$tableColumnNum = 0;
+				foreach ($tr->find("td") as $td) {
+					if ($tableNum == 1) {
+						// first table has card/cardholder details
+						$return[$tableName[$tableNum]][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+					} else {
+						// second table has transactions
+						
+						if ($tableColumns[$tableColumnNum] == "TX Reference No / Type") {
+							$return[$tableName[$tableNum]][$tableRowNum]["TX Reference No"] = substr(cleanString($td->plaintext), 0,6);
+							$return[$tableName[$tableNum]][$tableRowNum]["TX Type"] = substr(cleanString($td->plaintext), 7);
+						} else {
+							$return[$tableName[$tableNum]][$tableRowNum][$tableColumns[$tableColumnNum]] = cleanString($td->plaintext);
+						}
+					}
+					//print_r($return);
+					$tableColumnNum++;
+				}
+				$tableRowNum++;
+			}
+		}
+	}
+}
+if (sizeof($return) == 0) {
+$return['error'][] = "No data extracted from MyWay website - API may be out of date";
+}
+if (basename(__FILE__) == "myway_api.json.php") {
+header('Content-Type: text/javascript; charset=utf8');
+// header('Access-Control-Allow-Origin: http://bus.lambdacomplex.org/');
+header('Access-Control-Max-Age: 3628800');
+header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+if (isset($_GET['callback'])) {
+	$json = '(' . json_encode($return) . ');'; //must wrap in parens and end with semicolon
+	print_r($_GET['callback'] . $json); //callback is prepended for json-p
+	
+}
+else echo json_encode($return);
+}
+?>
+

--- /dev/null
+++ b/labs/myway_timeliness.php
@@ -1,1 +1,118 @@
+<?php
+include ('../include/common.inc.php');
+include_header("MyWay Deltas", "mywayDelta");
+?>
 
+    <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]--> 
+ 
+    <script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script> 
+  <center><div id="placeholder" style="width:900px;height:550px"></div></center>
+<script type="text/javascript"> 
+$(function () {
+    var d = new Date();
+    d.setUTCMinutes(0);
+    d.setUTCHours(0);
+    var midnight = d.getTime();
+
+<?php
+$query = "select * from myway_timingdeltas where abs(timing_delta) < 2*(select stddev(timing_delta) from myway_timingdeltas)  order by route_full_name;";
+$query = $conn -> prepare($query);
+$query -> execute();
+if (!$query) {
+    databaseError($conn -> errorInfo());
+     return Array();
+    } 
+$i = 0;
+$labels = Array();
+$lastRoute = "";
+foreach ($query -> fetchAll() as $delta) {
+    $routeName = $delta['route_full_name'];
+     if (strstr($routeName, " 3")) $routeName = "312-319";
+     else $routeName = preg_replace('/\D/', '', $routeName);
+     if ($routeName != $lastRoute) {
+        $i++;
+         echo "    var d$i = [];";
+         $lastRoute = $routeName;
+         $labels[$i] = $routeName;
+         } 
+    echo "d$i.push([ midnight+ (1000*" . midnight_seconds(strtotime($delta['time'])) . "), " . intval($delta['timing_delta']) . "]); \n";
+