gitphp 0.2.9.1 :: busui.git/commitdiff

file:a/about.php -> file:b/about.php

file:a/aws/busuidb.sh -> file:b/aws/busuidb.sh

createdb transitdata	createdb transitdata
createlang -d transitdata plpgsql	createlang -d transitdata plpgsql
psql -d transitdata -f /var/www/lib/postgis.sql	psql -d transitdata -f /var/www/lib/postgis.sql
# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz	# curl https://github.com/maxious/ACTBus-ui/raw/master/transitdata.cbrfeed.sql.gz -o transitdata.cbrfeed.sql.gz
#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz	#made with pg_dump transitdata \| gzip -c > transitdata.cbrfeed.sql.gz
gunzip /var/www/transitdata.cbrfeed.sql.gz	gunzip /var/www/transitdata.cbrfeed.sql.gz
psql -d transitdata -f /var/www/transitdata.cbrfeed.sql	psql -d transitdata -f /var/www/transitdata.cbrfeed.sql
#createuser transitdata -SDRP	#createuser transitdata -SDRP
#password transitdata	#password transitdata
#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"	#psql -d transitdata -c "GRANT SELECT ON TABLE agency,calendar,calendar_dates,routes,stop_times,stops,trips TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT ON TABLE myway_observations,myway_routes,myway_stops,myway_timingdeltas TO transitdata;"
#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"	#psql -d transitdata -c "GRANT SELECT,INSERT,UPDATE ON TABLE myway_routes,myway_stops TO transitdata;"
##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"	##psql -d transitdata -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO transitdata;"
	## INSERT INTO geometry_columns(f_table_catalog, f_table_schema, f_table_name, f_geometry_column, coord_dimension, srid, "type")
	##SELECT '', 'public', 'shapes', 'shape_pt', ST_CoordDim(shape_pt), ST_SRID(shape_pt), GeometryType(shape_pt)
	##FROM shapes LIMIT 1;
php /var/www/updatedb.php	php /var/www/updatedb.php

file:a/geo/route.kml.php -> file:b/geo/route.kml.php

<?php	<?php
header('Content-Type: application/vnd.google-earth.kml+xml');	header('Content-Type: application/vnd.google-earth.kml+xml');
include ('../include/common.inc.php');	include ('../include/common.inc.php');
echo '<?xml version="1.0" encoding="UTF-8"?>	echo '<?xml version="1.0" encoding="UTF-8"?>
<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';	<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:atom="http://www.w3.org/2005/Atom"><Document>';
echo '	echo '
<Style id="yellowLineGreenPoly">	<Style id="yellowLineGreenPoly">
<LineStyle>	<LineStyle>
<color>7f00ff00</color>	<color>7f00ff00</color>
<width>4</width>	<width>4</width>
</LineStyle>	</LineStyle>
<PolyStyle>	<PolyStyle>
<color>7f00ffff</color>	<color>7f00ffff</color>
</PolyStyle>	</PolyStyle>
</Style>';	</Style>';
$route = getRoute($routeid);	$route = getRoute($routeid);
echo "\n<Placemark>\n";	echo "\n<Placemark>\n";
$link = curPageURL()."/../trip.php?routeid=".htmlspecialchars ($route["route_id"]);	$link = curPageURL()."/../trip.php?routeid=".htmlspecialchars ($route["route_id"]);
echo "<name>".$route['route_short_name']."</name>";	echo "<name>".$route['route_short_name']."</name>";
echo '<atom:link href="'.$link.'"/>';	echo '<atom:link href="'.$link.'"/>';
echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";	echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";
echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";

$trips = getRouteTrips($routeid);	$trip = getRouteNextTrip($routeid);
echo getTripShape($trips[0]['trip_id']);	echo getTripShape($trip['trip_id']);

echo "</Placemark>\n</Document></kml>\n";	echo "</Placemark>\n</Document></kml>\n";
?>	?>

file:a/include/common-db.inc.php -> file:b/include/common-db.inc.php

file:a/include/common-request.inc.php -> file:b/include/common-request.inc.php

file:a/include/common-session.inc.php -> file:b/include/common-session.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
// you have to open the session to be able to modify or remove it	// you have to open the session to be able to modify or remove it
session_start();	session_start();
if (isset($_REQUEST['service_period'])) {
$_SESSION['service_period'] = filter_var($_REQUEST['service_period'], FILTER_SANITIZE_STRING);
sessionUpdated();
}
if (isset($_REQUEST['time'])) {
$_SESSION['time'] = filter_var($_REQUEST['time'], FILTER_SANITIZE_STRING);
sessionUpdated();
}
if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {	if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {
$geocoded = false;	$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {	if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));	$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
} else {	} else {
if (startsWith($geolocate, "-")) {	if (startsWith($geolocate, "-")) {
$locateparts = explode(",", $geolocate);	$locateparts = explode(",", $geolocate);
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else if (strpos($geolocate, "(") !== false) {	} else if (strpos($geolocate, "(") !== false) {
$geoParts = explode("(", $geolocate);	$geoParts = explode("(", $geolocate);
$locateparts = explode(",", str_replace(")", "", $geoParts[1]));	$locateparts = explode(",", str_replace(")", "", $geoParts[1]));
$_SESSION['lat'] = $locateparts[0];	$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];	$_SESSION['lon'] = $locateparts[1];
} else {	} else {
$contents = geocode($geolocate, true);	$contents = geocode($geolocate, true);
print_r($contents);	print_r($contents);
if (isset($contents[0]->centroid)) {	if (isset($contents[0]->centroid)) {
$geocoded = true;	$geocoded = true;
$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];	$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
$_SESSION['lon'] = $contents[0]->centroid->coordinates[1];	$_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
} else {	} else {
$_SESSION['lat'] = "";	$_SESSION['lat'] = "";
$_SESSION['lon'] = "";	$_SESSION['lon'] = "";
}	}
}	}
}	}
sessionUpdated();	sessionUpdated();
}	}

function sessionUpdated() {	function sessionUpdated() {
$_SESSION['lastUpdated'] = time();	$_SESSION['lastUpdated'] = time();
}	}

// timeoutSession	// timeoutSession
$TIMEOUT_LIMIT = 60 * 5; // 5 minutes	$TIMEOUT_LIMIT = 60 * 5; // 5 minutes
if (isset($_SESSION['lastUpdated']) && $_SESSION['lastUpdated'] + $TIMEOUT_LIMIT < time()) {	if (isset($_SESSION['lastUpdated']) && $_SESSION['lastUpdated'] + $TIMEOUT_LIMIT < time()) {
debug("Session timeout " . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . ">" . time(), "session");	debug("Session timeout " . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . ">" . time(), "session");
session_destroy();	session_destroy();
session_start();	session_start();
}	}

//debug(print_r($_SESSION, true) , "session");	//debug(print_r($_SESSION, true) , "session");
function current_time() {	function current_time() {
return ($_SESSION['time'] ? $_SESSION['time'] : date("H:i:s"));	return ($_REQUEST['time'] ? $_REQUEST['time'] : date("H:i:s"));
}	}

?>	?>

file:a/include/common-template.inc.php -> file:b/include/common-template.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

// Copyright 2009 Google Inc. All Rights Reserved.	// Copyright 2009 Google Inc. All Rights Reserved.
$GA_ACCOUNT = "MO-22173039-1";	$GA_ACCOUNT = "MO-22173039-1";
$GA_PIXEL = "/lib/ga.php";	$GA_PIXEL = "/lib/ga.php";

function googleAnalyticsGetImageUrl() {	function googleAnalyticsGetImageUrl() {
global $GA_ACCOUNT, $GA_PIXEL;	global $GA_ACCOUNT, $GA_PIXEL;
//if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";	//if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return "";
$url = "";	$url = "";
$url.= $GA_PIXEL . "?";	$url.= $GA_PIXEL . "?";
$url.= "utmac=" . $GA_ACCOUNT;	$url.= "utmac=" . $GA_ACCOUNT;
$url.= "&utmn=" . rand(0, 0x7fffffff);	$url.= "&utmn=" . rand(0, 0x7fffffff);
$referer = (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "");	$referer = (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "");
$query = $_SERVER["QUERY_STRING"];	$query = $_SERVER["QUERY_STRING"];
$path = $_SERVER["REQUEST_URI"];	$path = $_SERVER["REQUEST_URI"];
if (empty($referer)) {	if (empty($referer)) {
$referer = "-";	$referer = "-";
}	}
$url.= "&utmr=" . urlencode($referer);	$url.= "&utmr=" . urlencode($referer);
if (!empty($path)) {	if (!empty($path)) {
$url.= "&utmp=" . urlencode($path);	$url.= "&utmp=" . urlencode($path);
}	}
$url.= "&guid=ON";	$url.= "&guid=ON";
return str_replace("&", "&", $url);	return str_replace("&", "&", $url);
}	}

function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) {	function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) {
global $basePath, $GTFSREnabled;	global $basePath, $GTFSREnabled;
echo '	echo '
<!DOCTYPE html>	<!DOCTYPE html>
<html lang="en">	<html lang="en">
<head>	<head>
<meta charset="UTF-8">	<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">	<meta name="viewport" content="width=device-width, initial-scale=1">
<title>' . $pageTitle . ' - Canberra Bus Timetable</title>	<title>' . $pageTitle . ' - Canberra Bus Timetable</title>
<meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />	<meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />
<link rel="dns-prefetch" href="//code.jquery.com">	<link rel="dns-prefetch" href="//code.jquery.com">
<link rel="dns-prefetch" href="//ajax.googleapis.com">	<link rel="dns-prefetch" href="//ajax.googleapis.com">
<link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';	<link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />';
$jqmVersion = "1.0";	$jqmVersion = "1.0";
if (isDebugServer()) {	if (isDebugServer()) {
$jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css";	$jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css";
$jqjs = $basePath . "js/jquery-1.6.4.min.js";	$jqjs = $basePath . "js/jquery-1.6.4.min.js";
$jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js";	$jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js";

$jqmcss = $basePath . "css/jquery.mobile-b90eab4935.css";	$jqmcss = $basePath . "css/jquery.mobile-b90eab4935.css";
$jqmjs = $basePath . "js/jquery.mobile-b90eab4935.js";	$jqmjs = $basePath . "js/jquery.mobile-b90eab4935.js";
} else {	} else {
$jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css";	$jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css";
$jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js";	$jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js";
$jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";	$jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js";

}	}
echo '<link rel="stylesheet" href="' . $jqmcss . '" />	echo '<link rel="stylesheet" href="' . $jqmcss . '" />
<script src="' . $jqjs . '"></script>	<script src="' . $jqjs . '"></script>
<script>$(document).bind("mobileinit", function(){	<script>$(document).bind("mobileinit", function(){
$.mobile.ajaxEnabled = false;	$.mobile.ajaxEnabled = false;
});	});
</script>	</script>
<script src="' . $jqmjs . '"></script>	<script src="' . $jqmjs . '"></script>

<script src="' . $basePath . 'js/jquery.ui.core.min.js"></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.position.min.js"></script>
<script src="' . $basePath . 'js/jquery.ui.widget.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="' . $basePath . 'js/jquery.ui.autocomplete.min.js"></script>
<script>	<script>
$(function() {	$(function() {
$( "#geolocate" ).autocomplete({	$( "#geolocate" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
$( "#from" ).autocomplete({	$( "#from" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
$( "#to" ).autocomplete({	$( "#to" ).autocomplete({
source: "lib/autocomplete.php",	source: "lib/autocomplete.php",
minLength: 2	minLength: 2
});	});
});	});
</script>';	</script>';
echo '<style type="text/css">';	echo '<style type="text/css">';
if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android'))	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 '.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-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-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 {	.ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a {
text-shadow: none;	text-shadow: none;
box-shadow: none;	box-shadow: none;
-webkit-box-shadow: none;	-webkit-box-shadow: none;
}';	}';
echo '</style>';	echo '</style>';
echo '<link rel="stylesheet" href="' . $basePath . 'css/local.css.php" />';	echo '<link rel="stylesheet" href="' . $basePath . 'css/local.css.php" />';
if (isIOSDevice()){	if (isIOSDevice()){
echo '<meta name="apple-mobile-web-app-capable" content="yes" />	echo '<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />	<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<link rel="apple-touch-startup-image" href="startup.png" />	<link rel="apple-touch-startup-image" href="startup.png" />
<link rel="apple-touch-icon" href="apple-touch-icon.png" />';	<link rel="apple-touch-icon" href="apple-touch-icon.png" />';
}	}
if ($geolocate) {	if ($geolocate) {
echo "<script>	echo "<script>

function success(position) {	function success(position) {
$('#error').val('Location now detected. Please wait for data to load.');	$('#error').val('Location now detected. Please wait for data to load.');
$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);	$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
$.ajax({ async: false,	$.ajax({ async: false,
success: function(){	success: function(){
location.reload(true);	location.reload(true);
},	},
url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });	url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
}	}
function error(msg) {	function error(msg) {
$('#error').val('Error: '+msg);	$('#error').val('Error: '+msg);
}	}

function geolocate() {	function geolocate() {
if (navigator.geolocation) {	if (navigator.geolocation) {
var options = {	var options = {
enableHighAccuracy: true,	enableHighAccuracy: true,
timeout: 60000,	timeout: 60000,
maximumAge: 10000	maximumAge: 10000
}	}
navigator.geolocation.getCurrentPosition(success, error, options);	navigator.geolocation.getCurrentPosition(success, error, options);
}	}
}	}
$(document).ready(function() {	$(document).ready(function() {
$('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;});	$('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;});
$('#here').show();	$('#here').show();
});	});
";	";
if (!isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "")	if (!isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "")
echo "geolocate();";	echo "geolocate();";
echo "</script> ";	echo "</script> ";
}	}
if (isAnalyticsOn())	if (isAnalyticsOn())
echo '	echo '
<script type="text/javascript">' . "	<script type="text/javascript">' . "

var _gaq = _gaq \|\| [];	var _gaq = _gaq \|\| [];
_gaq.push(['_setAccount', 'UA-22173039-1']);	_gaq.push(['_setAccount', 'UA-22173039-1']);
_gaq.push(['_trackPageview']);	_gaq.push(['_trackPageview']);
_gaq.push(['_trackPageLoadTime']);	_gaq.push(['_trackPageLoadTime']);
</script>";	</script>";
echo '</head>	echo '</head>
<body>	<body>
<div id="skip">	<div id="skip">
<a href="#maincontent">Skip to content</a>	<a href="#maincontent">Skip to content</a>
</div>	</div>
';	';
if ($opendiv) {	if ($opendiv) {
echo '<div data-role="page">	echo '<div data-role="page">
<div data-role="header" data-position="inline">	<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>	<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>	<h1>' . $pageTitle . '</h1>
<a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>	<a href="' . $basePath . '/index.php" data-icon="home" class="ui-btn-right">Home</a>
</div><!-- /header -->	</div><!-- /header -->
<a name="maincontent" id="maincontent"></a>	<a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';	<div data-role="content"> ';
if ($GTFSREnabled) {	if ($GTFSREnabled) {
$overrides = getServiceOverride();	$overrides = getServiceOverride();
if ($overrides['service_id']) {	if ($overrides['service_id']) {
if ($overrides['service_id'] == "noservice") {	if ($overrides['service_id'] == "noservice") {
echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a	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>';	href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
} else {	} 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>';	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>';
}	}
}	}
$serviceAlerts = getServiceAlertsAsArray("agency", "0");	$serviceAlerts = getServiceAlertsAsArray("agency", "0");
if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {	if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {
foreach ($serviceAlerts['entity'] as $entity) {	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']}	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>";	<br><a href='{$entity['alert']['url']['translation'][0]['text']}'>Source</a> </div>";
}	}
}	}
}	}
}	}
}	}

function include_footer() {	function include_footer() {
global $basePath;	global $basePath;
echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a> <a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $basePath . 'privacy.php">Privacy Policy</a>';	echo '<div id="footer"><a href="' . $basePath . 'about.php">About/Contact Us</a> <a href="' . $basePath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $basePath . 'privacy.php">Privacy Policy</a>';
echo '</div>';	echo '</div>';
if (isAnalyticsOn()) {	if (isAnalyticsOn()) {
echo "<script> (function() {	echo "<script> (function() {
var ga = document.createElement('script'); ga.type =	var ga = document.createElement('script'); ga.type =
'text/javascript'; ga.async = true;	'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ?	ga.src = ('https:' == document.location.protocol ?
'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';	'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];	var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);	s.parentNode.insertBefore(ga, s);
})();</script>";	})();</script>";
$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();	$googleAnalyticsImageUrl = googleAnalyticsGetImageUrl();
echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';	echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>';
}	}
echo "\n</div></div></body></html>";	echo "\n</div></div></body></html>";
}	}
	function timeSettings() {
	global $service_periods;
	echo '<div id="settings" data-role="collapsible" data-collapsed="true">
	<h3>Change Time (' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
	<form action="' . basename($_SERVER['PHP_SELF']) . '" method="GET">
	<input type="hidden" name="suburb" id="suburb" value="' . (isset($_REQUEST['suburb']) ? $_REQUEST['suburb'] : "") . '"/>

	<input type="hidden" name="stopid" id="stopid" value="' . (isset($_REQUEST['stopid']) ? $_REQUEST['stopid'] : "") . '"/>
	<input type="hidden" name="stopcode" id="stopcode" value="' . (isset($_REQUEST['stopcode']) ? $_REQUEST['stopcode'] : "") . '"/>
	<div class="ui-body">
	<div data-role="fieldcontain">
	<label for="time"> Time: </label>
	<input type="time" name="time" id="time" value="' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : date("H:i")) . '"/>
	<a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>
	</div>
	<div data-role="fieldcontain">
	<label for="service_period"> Service Period: </label>
	<select name="service_period" id="service_period">';
	foreach ($service_periods as $service_period) {
	echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
	}
	echo '</select>
	<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>
	</div>

	<input type="submit" value="Update"/>
	</div></form>
	</div>';
	}
function placeSettings() {	function placeSettings() {
global $service_periods;
$geoerror = false;	$geoerror = false;
$geoerror = !isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "";	$geoerror = !isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "";

echo '<div id="error">';	echo '<div id="error">';
if ($geoerror) {	if ($geoerror) {
echo 'Sorry, but your location could not currently be detected.	echo 'Sorry, but your location could not currently be detected.
Please allow location permission, wait for your location to be detected,	Please allow location permission, wait for your location to be detected,
or enter an address/co-ordinates in the box below.';	or enter an address/co-ordinates in the box below.';
}	}
echo '</div>';	echo '</div>';
echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">	echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '">
<h3>Change Location...</h3>	<h3>Change Location...</h3>
<form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">	<form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
<div class="ui-body">	<div class="ui-body">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>	<label for="geolocate"> Current Location: </label>
<input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>	<input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a>
</div>	</div>

<input type="submit" value="Update"/>	<input type="submit" value="Update"/>
</div></form>	</div></form>
</div>';	</div>';
}	}

function trackEvent($category, $action, $label = "", $value = - 1) {	function trackEvent($category, $action, $label = "", $value = - 1) {
if (isAnalyticsOn()) {	if (isAnalyticsOn()) {
echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";	echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>";
}	}
}	}

//stop list collapsing	//stop list collapsing
function stopCompare($stopName) {	function stopCompare($stopName) {
return substr(trim(preg_replace("/\(Platform.*/", "", $stopName)),0,9);	return substr(trim(preg_replace("/\(Platform.*/", "", $stopName)),0,9);
}	}
function stopGroupTitle($stopName,$stopdesc) {	function stopGroupTitle($stopName,$stopdesc) {
if (preg_match("/Dr \|Cct \|Cir \|Av \|St \|Cr \|Parade \|Way \|Bank /",$stopName)) {	if (preg_match("/Dr \|Cct \|Cir \|Av \|St \|Cr \|Parade \|Way \|Bank /",$stopName)) {
$descParts = explode("<br>",$stopdesc);	$descParts = explode("<br>",$stopdesc);
return trim(str_replace("Street: ","",$descParts[0]));	return trim(str_replace("Street: ","",$descParts[0]));
} else {	} else {
return trim(preg_replace("/\(Platform.*/", "",$stopName));	return trim(preg_replace("/\(Platform.*/", "",$stopName));
}	}
}	}

function viaPointNames($tripid, $stop_sequence = "") {	function viaPointNames($tripid, $stop_sequence = "") {
$viaPointNames = Array();	$viaPointNames = Array();
foreach (viaPoints($tripid, $stop_sequence) as $point) {	foreach (viaPoints($tripid, $stop_sequence) as $point) {
if (strstr($point['stop_name'], "Station")	if (strstr($point['stop_name'], "Station")
\|\| strstr($point['stop_name'], "Shops")	\|\| strstr($point['stop_name'], "Shops")
\|\| strstr($point['stop_name'], "CIT")	\|\| strstr($point['stop_name'], "CIT")
\|\| strstr($point['stop_name'], "School")	\|\| strstr($point['stop_name'], "School")
\|\| strstr($point['stop_name'], "University")	\|\| strstr($point['stop_name'], "University")
) {	) {
$viaPointNames[] = $point['stop_name'];	$viaPointNames[] = $point['stop_name'];
}	}
}	}
if (sizeof($viaPointNames) > 0) {	if (sizeof($viaPointNames) > 0) {
return r_implode(", ", $viaPointNames);	return r_implode(", ", $viaPointNames);
} else {	} else {
return "";	return "";
}	}
}	}
?>	?>

file:a/include/common-transit.inc.php -> file:b/include/common-transit.inc.php

file:a/include/db/route-dao.inc.php -> file:b/include/db/route-dao.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

function getRoute($routeID) {	function getRoute($routeID) {
global $conn;	global $conn;
$query = "Select * from routes where route_id = :routeID LIMIT 1";	$query = "Select * from routes where route_id = :routeID LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getRoutesByShortName($routeShortName) {	function getRoutesByShortName($routeShortName) {
global $conn;	global $conn;
$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";	$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeShortName", $routeShortName);	$query->bindParam(":routeShortName", $routeShortName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteHeadsigns($routeID) {	function getRouteHeadsigns($routeID) {
global $conn;	global $conn;
$query = "select distinct stops.stop_name, trip_headsign,direction_id from routes join trips on trips.route_id = routes.route_id	$query = "select stops.stop_name, trip_headsign, direction_id,max(service_id) as service_id, count(*)
join stop_times on stop_times.trip_id = trips.trip_id join stops on stop_times.stop_id = stops.stop_id where trips.route_id = :routeID and stop_times.stop_sequence = 1";	from routes join trips on trips.route_id = routes.route_id
	join stop_times on stop_times.trip_id = trips.trip_id join stops on
	stop_times.stop_id = stops.stop_id where trips.route_id = :routeID
	and stop_times.stop_sequence = 1 group by stops.stop_name, trip_headsign, direction_id having count(*) > 2";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}
	function getRouteDescription($routeID) {
	$trip = getRouteNextTrip($routeID);
	$start = getTripStartingPoint($trip['trip_id']);
	$end = getTripDestination($trip['trip_id']);
	return "From ".$start['stop_name']." to ".$end['stop_name'];
	}
function getRouteByFullName($routeFullName) {	function getRouteByFullName($routeFullName) {
global $conn;	global $conn;
$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";	$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeFullName", $routeFullName);	$query->bindParam(":routeFullName", $routeFullName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getRoutes() {	function getRoutes() {
global $conn;	global $conn;
$query = "Select * from routes order by route_short_name;";	$query = "Select * from routes order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByNumber($routeNumber = "") {	function getRoutesByNumber($routeNumber = "", $directionID = "",$service_period = "") {
global $conn;	global $conn;
if ($routeNumber != "") {	if ($routeNumber != "") {
$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =	$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
routes.route_id join stop_times on stop_times.trip_id = trips.trip_id	routes.route_id join stop_times on stop_times.trip_id = trips.trip_id
where route_short_name = :routeNumber OR route_short_name LIKE :routeNumber2 order by route_short_name;";	where route_short_name = :routeNumber OR route_short_name LIKE :routeNumber2 order by route_short_name;";
} else {	} else {
$query = "SELECT DISTINCT route_short_name from routes order by route_short_name";	$query = "SELECT DISTINCT route_short_name from routes order by route_short_name";
}	}
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($routeNumber != "") {	if ($routeNumber != "") {
$query->bindParam(":routeNumber", $routeNumber);	$query->bindParam(":routeNumber", $routeNumber);
$routeNumber2 = "% " . $routeNumber;	$routeNumber2 = "% " . $routeNumber;
$query->bindParam(":routeNumber2", $routeNumber2);	$query->bindParam(":routeNumber2", $routeNumber2);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByNumberSeries($routeNumberSeries = "") {	function getRoutesByNumberSeries($routeNumberSeries = "") {
global $conn;	global $conn;
if (strlen($routeNumberSeries) == 1) {	if (strlen($routeNumberSeries) == 1) {
return getRoutesByNumber($routeNumberSeries);	return getRoutesByNumber($routeNumberSeries);
}	}
$seriesMin = substr($routeNumberSeries, 0, -1) . "0";	$seriesMin = substr($routeNumberSeries, 0, -1) . "0";
$seriesMax = substr($routeNumberSeries, 0, -1) . "9";	$seriesMax = substr($routeNumberSeries, 0, -1) . "9";
$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =	$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,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 to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";	routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":seriesMin", $seriesMin);	$query->bindParam(":seriesMin", $seriesMin);
$query->bindParam(":seriesMax", $seriesMax);	$query->bindParam(":seriesMax", $seriesMax);
$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";	$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";
$query->bindParam(":routeNumberSeries", $routeNumberSeries);	$query->bindParam(":routeNumberSeries", $routeNumberSeries);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteNextTrip($routeID) {	function getRouteNextTrip($routeID) {
global $conn;	global $conn;
$query = "select * from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where	$query = "select routes.route_id,direction_id,trips.trip_id,departure_time from routes join trips on trips.route_id = routes.route_id
arrival_time > :currentTime and routes.route_id = :routeID order by	join stop_times on stop_times.trip_id = trips.trip_id where arrival_time > :currentTime and routes.route_id = :routeID order by
arrival_time limit 1";	arrival_time limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":currentTime", current_time());	$query->bindParam(":currentTime", current_time());
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
	databaseError($conn->errorInfo());
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);

// past last trip of the day special case	// past last trip of the day special case
if (sizeof($r) < 16) {	if (sizeof($r) < 16) {
$query = "select * from routes join trips on trips.route_id = routes.route_id	$query = "select * from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID order by	join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID order by
arrival_time DESC limit 1";	arrival_time DESC limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}

$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
}	}
return $r;	return $r;
}	}

function getRouteAtStop($routeID, $stop_id) {	function getRouteAtStop($routeID, $stop_id) {
$nextTrip = getRouteNextTrip($routeID);	$nextTrip = getRouteNextTrip($routeID);
if ($nextTrip['trip_id']) {	if ($nextTrip['trip_id']) {
foreach (getTripStopTimes($nextTrip['trip_id']) as $tripStop) {	foreach (getTripStopTimes($nextTrip['trip_id']) as $tripStop) {
if ($tripStop['stop_id'] == $stop_id)	if ($tripStop['stop_id'] == $stop_id)
return $tripStop;	return $tripStop;
}	}
}	}
return Array();	return Array();
}	}

function getRouteTrips($routeID) {	function getRoutesTrips($routeIDs, $directionID = "", $service_period = "") {
global $conn;
$query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID and stop_sequence = '1' order by
arrival_time ";
debug($query, "database");
$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);
$query->execute();
if (!$query) {
databaseError($conn->errorInfo());
return Array();
}
return $query->fetchAll();
}

function getRoutesByDestination($destination = "", $service_period = "") {
global $conn;	global $conn;
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
	$service_ids = service_ids($service_period);
	$sidA = $service_ids[0];
	$sidB = $service_ids[1];
	$directionSQL = "";
	if ($directionID != "")
	$directionSQL = " and direction_id = :directionID ";
	$query = "select routes.route_id,trips.trip_id,service_id,arrival_time, stop_id, stop_sequence from routes join trips on trips.route_id = routes.route_id
	join stop_times on stop_times.trip_id = trips.trip_id where (service_id=:service_periodA OR service_id=:service_periodB)
	AND (routes.route_id = :routeIDA OR routes.route_id = :routeIDB) " . $directionSQL . " and stop_sequence = '1' order by
	arrival_time ";
	debug($query, "database");
	$query = $conn->prepare($query);
	$query->bindParam(":routeIDA", $routeIDs[0]);
	$query->bindParam(":routeIDB", $routeIDs[1]);
	$query->bindParam(":service_periodA", $sidA);
	$query->bindParam(":service_periodB", $sidB);
	if ($directionSQL != "")
	$query->bindParam(":directionID", $directionID);
	$query->execute();
	if (!$query) {
	databaseError($conn->errorInfo());
	return Array();
	}
	return $query->fetchAll();
	}

	function getRoutesByDestination($destination = "", $service_period = "") {
	global $conn;
	if ($service_period == "")
	$service_period = service_period();
	$service_ids = service_ids($service_period);
	$sidA = $service_ids[0];
	$sidB = $service_ids[1];
if ($destination != "") {	if ($destination != "") {
$query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id	$query = "SELECT DISTINCT trips.route_id,route_short_name,route_long_name, service_id
FROM stop_times join trips on trips.trip_id =	FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id	stop_times.trip_id join routes on trips.route_id = routes.route_id
WHERE route_long_name = :destination AND service_id=:service_period order by route_short_name";	WHERE route_long_name = :destination AND (service_id=:service_periodA OR service_id=:service_periodB)
	order by route_short_name";
} else {	} else {
$query = "SELECT DISTINCT route_long_name	$query = "SELECT DISTINCT route_long_name
FROM stop_times join trips on trips.trip_id =	FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id	stop_times.trip_id join routes on trips.route_id = routes.route_id
WHERE service_id= :service_period order by route_long_name";	WHERE (service_id=:service_periodA OR service_id=:service_periodB)
}	order by route_long_name";
debug($query, "database");	}
$query = $conn->prepare($query);	debug($query, "database");
$query->bindParam(":service_period", $service_period);	$query = $conn->prepare($query);

	$query->bindParam(":service_periodA", $sidA);
	$query->bindParam(":service_periodB", $sidB);
if ($destination != "")	if ($destination != "")
$query->bindParam(":destination", $destination);	$query->bindParam(":destination", $destination);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesBySuburb($suburb, $service_period = "") {	function getRoutesBySuburb($suburb, $service_period = "") {
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
	$service_ids = service_ids($service_period);
	$sidA = $service_ids[0];
	$sidB = $service_ids[1];

global $conn;	global $conn;
$query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT DISTINCT service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times join trips on trips.trip_id = stop_times.trip_id	FROM stop_times join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE zone_id LIKE ':suburb AND service_id=:service_period ORDER BY route_short_name";	WHERE stop_desc LIKE :suburb AND (service_id=:service_periodA OR service_id=:service_periodB)
debug($query, "database");	ORDER BY route_short_name";
$query = $conn->prepare($query);	debug($query, "database");
$query->bindParam(":service_period", $service_period);	$query = $conn->prepare($query);
$suburb = "%" . $suburb . ";%";	$query->bindParam(":service_periodA", $sidA);
	$query->bindParam(":service_periodB", $sidB);
	$suburb = "%Suburb: %" . $suburb . "%";
$query->bindParam(":suburb", $suburb);	$query->bindParam(":suburb", $suburb);
$query->execute();	$query->execute();
if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();
}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {	function getRoutesNearby($lat, $lng, $limit = "", $distance = 500) {
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
if ($limit != "")	if ($limit != "")
$limitSQL = " LIMIT :limit ";	$limitSQL = " LIMIT :limit ";
global $conn;	global $conn;
$query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id,	$query = "SELECT service_id,trips.route_id,route_short_name,route_long_name,min(stops.stop_id) as stop_id,
min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance	min(ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE)) as distance
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE (service_id=:service_periodA OR service_id=:service_periodB)	WHERE (service_id=:service_periodA OR service_id=:service_periodB)
AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)	AND ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)
group by service_id,trips.route_id,route_short_name,route_long_name	group by service_id,trips.route_id,route_short_name,route_long_name
order by distance $limitSQL";	order by distance $limitSQL";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":distance", $distance);	$query->bindParam(":distance", $distance);
if ($limit != "")	if ($limit != "")
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

?>	?>

file:a/include/db/stop-dao.inc.php -> file:b/include/db/stop-dao.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

function getStop($stopID) {	function getStop($stopID) {
global $conn;	global $conn;
$query = "Select * from stops where stop_id = :stopID LIMIT 1";	$query = "Select * from stops where stop_id = :stopID LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getStops($firstLetter = "", $startsWith = "") {	function getStops($firstLetter = "", $startsWith = "") {
global $conn;	global $conn;
$conditions = Array();	$conditions = Array();
if ($firstLetter != "")	if ($firstLetter != "")
$conditions[] = "substr(stop_name,1,1) = :firstLetter";	$conditions[] = "substr(stop_name,1,1) = :firstLetter";
if ($startsWith != "")	if ($startsWith != "")
$conditions[] = "stop_name like :startsWith";	$conditions[] = "stop_name like :startsWith";
$query = "Select * from stops";	$query = "Select * from stops";
if (sizeof($conditions) > 0) {	if (sizeof($conditions) > 0) {
if (sizeof($conditions) > 1) {	if (sizeof($conditions) > 1) {
$query .= " Where " . implode(" AND ", $conditions) . " ";	$query .= " Where " . implode(" AND ", $conditions) . " ";
} else {	} else {
$query .= " Where " . $conditions[0] . " ";	$query .= " Where " . $conditions[0] . " ";
}	}
}	}
$query .= " order by stop_name;";	$query .= " order by stop_name;";
debug($query,"database");	debug($query,"database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($firstLetter != "")	if ($firstLetter != "")
$query->bindParam(":firstLetter", $firstLetter);	$query->bindParam(":firstLetter", $firstLetter);

if ($startsWith != "") {	if ($startsWith != "") {
$startsWith = $startsWith . "%";	$startsWith = $startsWith . "%";
$query->bindParam(":startsWith", $startsWith);	$query->bindParam(":startsWith", $startsWith);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getNearbyStops($lat, $lng, $limit = "", $distance = 1000) {	function getNearbyStops($lat, $lng, $limit = "", $distance = 1000) {
if ($lat == null \|\| $lng == null)	if ($lat == null \|\| $lng == null)
return Array();	return Array();
if ($limit != "")	if ($limit != "")
$limitSQL = " LIMIT :limit ";	$limitSQL = " LIMIT :limit ";
global $conn;	global $conn;
$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance	$query = "Select *, ST_Distance(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), FALSE) as distance
from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)	from stops WHERE ST_DWithin(position, ST_GeographyFromText('SRID=4326;POINT($lng $lat)'), :distance, FALSE)
order by distance $limitSQL;";	order by distance $limitSQL;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":distance", $distance);	$query->bindParam(":distance", $distance);
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsByName($name) {	function getStopsByName($name) {
global $conn;	global $conn;
$query = "Select * from stops where stop_name LIKE :name;";	$query = "Select * from stops where stop_name LIKE :name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$name = "%" . $name . ";%";	$name = "%" . $name . ";%";
$query->bindParam(":name", $name);	$query->bindParam(":name", $name);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsBySuburb($suburb) {	function getStopsBySuburb($suburb) {
global $conn;	global $conn;
$query = "Select * from stops where stop_desc LIKE :suburb order by stop_name;";	$query = "Select * from stops where stop_desc LIKE :suburb order by stop_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$suburb = "%<br>Suburb: %" . $suburb . "%";	$suburb = "%<br>Suburb: %" . $suburb . "%";
$query->bindParam(":suburb", $suburb);	$query->bindParam(":suburb", $suburb);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopsByStopCode($stop_code, $startsWith = "") {	function getStopsByStopCode($stop_code, $startsWith = "") {
global $conn;	global $conn;
$query = "Select * from stops where (stop_code = :stop_code OR stop_code LIKE :stop_code2)";	$query = "Select * from stops where (stop_code = :stop_code OR stop_code LIKE :stop_code2)";
if ($startsWith != "")	if ($startsWith != "")
$query .= " AND stop_name like :startsWith";	$query .= " AND stop_name like :startsWith";

debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);

$query->bindParam(":stop_code", $stop_code);	$query->bindParam(":stop_code", $stop_code);
$stop_code2 = $stop_code . "%";	$stop_code2 = $stop_code . "%";
$query->bindParam(":stop_code2", $stop_code2);	$query->bindParam(":stop_code2", $stop_code2);
if ($startsWith != "") {	if ($startsWith != "") {
$startsWith = $startsWith . "%";	$startsWith = $startsWith . "%";
$query->bindParam(":startsWith", $startsWith);	$query->bindParam(":startsWith", $startsWith);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopRoutes($stopID, $service_period) {	function getStopRoutes($stopID, $service_period) {
if ($service_period == "") {	if ($service_period == "") {
$service_period = service_period();	$service_period = service_period();
}	}
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
global $conn;	global $conn;
$query = "SELECT distinct service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT distinct service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times join trips on trips.trip_id =	FROM stop_times join trips on trips.trip_id =
stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = :stopID	stop_times.trip_id join routes on trips.route_id = routes.route_id WHERE stop_id = :stopID
AND (service_id=:service_periodA OR service_id=:service_periodB)";	AND (service_id=:service_periodA OR service_id=:service_periodB)";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopTrips($stopID, $service_period = "", $afterTime = "", $limit = "", $route_short_name = "") {	function getStopTrips($stopID, $service_period = "", $afterTime = "", $limit = "", $route_short_name = "") {
if ($service_period == "") {	if ($service_period == "") {
$service_period = service_period();	$service_period = service_period();
}	}
$service_ids = service_ids($service_period);	$service_ids = service_ids($service_period);
$sidA = $service_ids[0];	$sidA = $service_ids[0];
$sidB = $service_ids[1];	$sidB = $service_ids[1];
$limitSQL = "";	$limitSQL = "";
if ($limit != "")	if ($limit != "")
$limitSQL .= " LIMIT :limit ";	$limitSQL .= " LIMIT :limit ";

global $conn;	global $conn;
if ($afterTime != "") {	if ($afterTime != "") {
$query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name,end_times.arrival_time as end_time	$query = " SELECT stop_times.trip_id,stop_times.arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,trips.direction_id,route_short_name,route_long_name,end_times.arrival_time as end_time
FROM stop_times	FROM stop_times
join trips on trips.trip_id =	join trips on trips.trip_id =
stop_times.trip_id	stop_times.trip_id
join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times	join routes on trips.route_id = routes.route_id , (SELECT trip_id,max(arrival_time) as arrival_time from stop_times
WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times	WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
WHERE stop_times.stop_id = :stopID	WHERE stop_times.stop_id = :stopID
AND stop_times.trip_id = end_times.trip_id	AND stop_times.trip_id = end_times.trip_id
AND (service_id=:service_periodA OR service_id=:service_periodB) ".($route_short_name != "" ? " AND route_short_name = :route_short_name ":"")."	AND (service_id=:service_periodA OR service_id=:service_periodB) ".($route_short_name != "" ? " AND route_short_name = :route_short_name ":"")."
AND end_times.arrival_time > :afterTime	AND end_times.arrival_time > :afterTime
ORDER BY end_time $limitSQL";	ORDER BY end_time $limitSQL";
} else {	} else {
$query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name	$query = "SELECT stop_times.trip_id,arrival_time,stop_times.stop_id,stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times	FROM stop_times
join trips on trips.trip_id =	join trips on trips.trip_id =
stop_times.trip_id	stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
WHERE stop_times.stop_id = :stopID	WHERE stop_times.stop_id = :stopID
AND (service_id=:service_periodA OR service_id=:service_periodB) ".($route_short_name != "" ? " AND route_short_name = :route_short_name ":"")."	AND (service_id=:service_periodA OR service_id=:service_periodB) ".($route_short_name != "" ? " AND route_short_name = :route_short_name ":"")."
ORDER BY arrival_time $limitSQL";	ORDER BY arrival_time $limitSQL";
}	}
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":service_periodA", $sidA);	$query->bindParam(":service_periodA", $sidA);
$query->bindParam(":service_periodB", $sidB);	$query->bindParam(":service_periodB", $sidB);
$query->bindParam(":stopID", $stopID);	$query->bindParam(":stopID", $stopID);
if ($limit != "")	if ($limit != "")
$query->bindParam(":limit", $limit);	$query->bindParam(":limit", $limit);
if ($afterTime != "")	if ($afterTime != "")
$query->bindParam(":afterTime", $afterTime);	$query->bindParam(":afterTime", $afterTime);
if ($route_short_name != "")	if ($route_short_name != "")
$query->bindParam(":route_short_name", $route_short_name);	$query->bindParam(":route_short_name", $route_short_name);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "") {	function getStopTripsWithTimes($stopID, $time = "", $service_period = "", $time_range = "", $limit = "") {
if ($service_period == "")	if ($service_period == "")
$service_period = service_period();	$service_period = service_period();
if ($time_range == "")	if ($time_range == "")
$time_range = (24 * 60 * 60);	$time_range = (24 * 60 * 60);
if ($time == "")	if ($time == "")
$time = current_time();	$time = current_time();
if ($limit == "")	if ($limit == "")
$limit = 10;	$limit = 10;
$trips = getStopTrips($stopID, $service_period, $time);	$trips = getStopTrips($stopID, $service_period, $time);
$timedTrips = Array();	$timedTrips = Array();
if ($trips && sizeof($trips) > 0) {	if ($trips && sizeof($trips) > 0) {
foreach ($trips as $trip) {	foreach ($trips as $trip) {
if ($trip['arrival_time'] != "") {	if ($trip['arrival_time'] != "") {
if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {	if (strtotime($trip['arrival_time']) > strtotime($time) and strtotime($trip['arrival_time']) < (strtotime($time) + $time_range)) {
$timedTrips[] = $trip;	$timedTrips[] = $trip;
}	}
} else {	} else {
$timedTrip = getTripAtStop($trip['trip_id'], $trip['stop_sequence']);	$timedTrip = getTripAtStop($trip['trip_id'], $trip['stop_sequence']);
if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {	if ($timedTrip['arrival_time'] > $time and strtotime($timedTrip['arrival_time']) < (strtotime($time) + $time_range)) {
$timedTrips[] = $timedTrip;	$timedTrips[] = $timedTrip;
}	}
}	}
if (sizeof($timedTrips) > $limit)	if (sizeof($timedTrips) > $limit)
break;	break;
}	}
sktimesort($timedTrips, "arrival_time", true);	sktimesort($timedTrips, "arrival_time", true);
}	}
return $timedTrips;	return $timedTrips;
}	}

?>	?>

file:a/include/db/trip-dao.inc.php -> file:b/include/db/trip-dao.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

function getTrip($tripID) {	function getTrip($tripID) {
global $conn;	global $conn;
$query = "Select * from trips	$query = "Select * from trips
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
where trip_id = :tripID	where trip_id = :tripID
LIMIT 1";	LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());

return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}
	function getTripStops($tripID) {
function getTripShape($tripID) {	global $conn;
// todo, use shapes table if shape_id specified	$query = "SELECT stop_id, stop_name, ST_AsKML(position) as positionkml,
global $conn;
$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.position))) as the_route
FROM (SELECT position,
stop_sequence, trips.trip_id	stop_sequence, trips.trip_id
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE trips.trip_id = :tripID ORDER BY stop_sequence) as a group by a.trip_id";	WHERE trips.trip_id = :tripID ORDER BY stop_sequence";
	debug($query, "database");
	$query = $conn->prepare($query);
	$query->bindParam(":tripID", $tripID);
	$query->execute();
	if (!$query) {
	databaseError($conn->errorInfo());
	return Array();
	}
	return $query->fetchColumn(0);
	}
	function getTripShape($tripID) {
	// todo, use shapes table if shape_id specified
	global $conn;
	$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route
	FROM (SELECT shapes.shape_id,shape_pt from shapes
	inner join trips on shapes.shape_id = trips.shape_id
	WHERE trips.trip_id = :tripID ORDER BY shape_pt_sequence) as a group by a.shape_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchColumn(0);	return $query->fetchColumn(0);
}	}

function getTripStopTimes($tripID) {	function getTripStopTimes($tripID) {
global $conn;	global $conn;
$query = "SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id	$query = "SELECT stop_times.trip_id,trip_headsign,arrival_time,stop_times.stop_id
,stop_lat,stop_lon,stop_name,stop_desc,stop_code,	,stop_lat,stop_lon,stop_name,stop_desc,stop_code,
stop_sequence,service_id,trips.route_id,route_short_name,route_long_name	stop_sequence,service_id,trips.route_id,route_short_name,route_long_name
FROM stop_times	FROM stop_times
join trips on trips.trip_id = stop_times.trip_id	join trips on trips.trip_id = stop_times.trip_id
join routes on trips.route_id = routes.route_id	join routes on trips.route_id = routes.route_id
join stops on stops.stop_id = stop_times.stop_id	join stops on stops.stop_id = stop_times.stop_id
WHERE trips.trip_id = :tripID $range ORDER BY stop_sequence";	WHERE trips.trip_id = :tripID $range ORDER BY stop_sequence";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$stopTimes = $query->fetchAll();	$stopTimes = $query->fetchAll();
return $stopTimes;	return $stopTimes;
}	}

function getTripAtStop($tripID, $stop_sequence) {	function getTripAtStop($tripID, $stop_sequence) {
global $conn;	global $conn;
foreach (getTripStopTimes($tripID) as $tripStop) {	foreach (getTripStopTimes($tripID) as $tripStop) {
if ($tripStop['stop_sequence'] == $stop_sequence)	if ($tripStop['stop_sequence'] == $stop_sequence)
return $tripStop;	return $tripStop;
}	}
return Array();	return Array();
}	}

function getTripStartTime($tripID) {	function getTripStartTime($tripID) {
global $conn;	global $conn;
$query = "Select * from stop_times	$query = "Select * from stop_times
where trip_id = :tripID	where trip_id = :tripID
AND arrival_time IS NOT NULL	AND arrival_time IS NOT NULL
AND stop_sequence = '1'";	AND stop_sequence = '1'";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r['arrival_time'];	return $r['arrival_time'];
}	}

function getTripEndTime($tripID) {	function getTripEndTime($tripID) {
global $conn;	global $conn;
$query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times	$query = "SELECT trip_id,max(arrival_time) as arrival_time from stop_times
WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id";	WHERE stop_times.arrival_time IS NOT NULL and trip_id = :tripID group by trip_id";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r['arrival_time'];	return $r['arrival_time'];
}	}
	function getTripStartingPoint($tripID) {
	global $conn;
	$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc
	from stop_times inner join stops on stop_times.stop_id = stops.stop_id
	WHERE trip_id = :tripID and stop_sequence = '1' limit 1";
	debug($query, "database");
	$query = $conn->prepare($query);
	$query->bindParam(":tripID", $tripID);
	$query->execute();
	if (!$query) {
	databaseError($conn->errorInfo());
	return Array();
	}
	$r = $query->fetch(PDO :: FETCH_ASSOC);
	return $r;
	}

function getTripDestination($tripID) {	function getTripDestination($tripID) {
global $conn;	global $conn;
$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc	$query = "SELECT stops.stop_id, stops.stop_name, stops.stop_desc
from stop_times inner join stops on stop_times.stop_id = stops.stop_id	from stop_times inner join stops on stop_times.stop_id = stops.stop_id
WHERE trip_id = :tripID order by stop_sequence desc limit 1";	WHERE trip_id = :tripID order by stop_sequence desc limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	return $r;
}	}

function getActiveTrips($time) {	function getActiveTrips($time) {
global $conn;	global $conn;
if ($time == "")	if ($time == "")
$time = current_time();	$time = current_time();
$query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL	$query = "Select distinct stop_times.trip_id, start_times.arrival_time as start_time, end_times.arrival_time as end_time from stop_times, (SELECT trip_id,arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL
AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times	AND stop_sequence = '1') as start_times, (SELECT trip_id,max(arrival_time) as arrival_time from stop_times WHERE stop_times.arrival_time IS NOT NULL group by trip_id) as end_times
WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time AND :time < end_times.arrival_time";	WHERE start_times.trip_id = end_times.trip_id AND stop_times.trip_id = end_times.trip_id AND :time > start_times.arrival_time AND :time < end_times.arrival_time";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":time", $time);	$query->bindParam(":time", $time);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function viaPoints($tripID, $stop_sequence = "") {	function viaPoints($tripID, $stop_sequence = "") {
global $conn;	global $conn;
$query = "SELECT stops.stop_id, stop_name, arrival_time	$query = "SELECT stops.stop_id, stop_name, arrival_time
FROM stop_times join stops on stops.stop_id = stop_times.stop_id	FROM stop_times join stops on stops.stop_id = stop_times.stop_id
WHERE stop_times.trip_id = :tripID	WHERE stop_times.trip_id = :tripID
" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . " ORDER BY stop_sequence";	" . ($stop_sequence != "" ? " AND stop_sequence > :stop_sequence " : "") . " ORDER BY stop_sequence";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($stop_sequence != "")	if ($stop_sequence != "")
$query->bindParam(":stop_sequence", $stop_sequence);	$query->bindParam(":stop_sequence", $stop_sequence);
$query->bindParam(":tripID", $tripID);	$query->bindParam(":tripID", $tripID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}


?>	?>

file:a/routeList.php -> file:b/routeList.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');

function navbar() {	function navbar() {

echo '	echo '
<div data-role="navbar">	<div data-role="navbar">
<ul>	<ul>
<li><a href="routeList.php">By Final Destination...</a></li>	<li><a href="routeList.php">By Final Destination...</a></li>
<li><a href="routeList.php?bynumber=yes">By Number... </a></li>	<li><a href="routeList.php?bynumber=yes">By Number... </a></li>
<li><a href="routeList.php?bysuburbs=yes">By Suburb... </a></li>	<li><a href="routeList.php?bysuburbs=yes">By Suburb... </a></li>
<li><a href="routeList.php?nearby=yes">Nearby... </a></li>	<li><a href="routeList.php?nearby=yes">Nearby... </a></li>
</ul>	</ul>
</div>	</div>
';	';
	}

	function displayRoutes($routes) {
	global $nearby;
	echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
	$filteredRoutes = Array();
	foreach ($routes as $route) {
	foreach (getRouteHeadsigns($route['route_id']) as $headsign) {
	$start = $headsign['stop_name'];
	$serviceday = service_period_day($headsign['service_id']);
	$key = $route['route_short_name'] . "." . $headsign['direction_id'];
	if (isset($filteredRoutes[$key])) {
	$filteredRoutes[$key]['route_ids'][] = $route['route_id'];
	$filteredRoutes[$key]['route_ids'] = array_unique($filteredRoutes[$key]['route_ids']);
	} else {
	$filteredRoutes[$key]['route_short_name'] = $route['route_short_name'];
	$filteredRoutes[$key]['route_long_name'] = "starting at " . $start;
	$filteredRoutes[$key]['service_id'] = $serviceday;
	$filteredRoutes[$key]['trip_headsign'] = $headsign['trip_headsign'].(strstr($headsign['trip_headsign'], "bound") ===false ?"bound":"");
	$filteredRoutes[$key]['direction_id'] = $headsign['direction_id'];
	if (isset($nearby)) {
	$filteredRoutes[$key]['distance'] = $route['distance'];
	}
	}
	}
	}
	foreach ($filteredRoutes as $key => $route) {
	echo '<li> <a href="trip.php?routeids=' . implode(",", $route['route_ids']) . '&directionid=' . $route['direction_id'] . '"><h3>' . $route['route_short_name'] . "</h3>

	<p>" . $route['trip_headsign'].", ". $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")</p>";
	if (isset($nearby)) {
	$time = getRouteAtStop($route['route_id'], $route['stop_id']);
	echo '<span class="ui-li-count">' . ($time['arrival_time'] ? $time['arrival_time'] : "No more trips today") . "<br>" . floor($route['distance']) . 'm away</span>';
	}
	echo" </a></li>\n";
	}
}	}

if (isset($bysuburbs)) {	if (isset($bysuburbs)) {
include_header("Routes by Suburb", "routeList");	include_header("Routes by Suburb", "routeList");
navbar();	navbar();
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';	echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
if (!isset($firstLetter)) {	if (!isset($firstLetter)) {
foreach (range('A', 'Z') as $letter) {	foreach (range('A', 'Z') as $letter) {
echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n";	echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n";
}	}
} else {	} else {
foreach ($suburbs as $suburb) {	foreach ($suburbs as $suburb) {
if (startsWith($suburb, $firstLetter)) {	if (startsWith($suburb, $firstLetter)) {
echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';	echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
}	}
}	}
}	}
echo '</ul>';	echo '</ul>';
} else if (isset($nearby) \|\| isset($suburb)) {	} else if (isset($suburb)) {
$routes = Array();
if ($suburb) {	if ($suburb) {
include_header($suburb . " - " . ucwords(service_period()), "routeList");	include_header($suburb . " - " . ucwords(service_period()), "routeList");
navbar();	navbar();
timePlaceSettings();	timeSettings();
trackEvent("Route Lists", "Routes By Suburb", $suburb);	trackEvent("Route Lists", "Routes By Suburb", $suburb);
$routes = getRoutesBySuburb($suburb);	displayRoutes(getRoutesBySuburb($suburb));
}	}
if (isset($nearby)) {	} else if (isset($nearby)) {
include_header("Routes Nearby", "routeList", true, true);	$routes = Array();
trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);	include_header("Routes Nearby", "routeList", true, true);
navbar();	trackEvent("Route Lists", "Routes Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
placeSettings();	navbar();
if (!isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "") {	placeSettings();
include_footer();	if (!isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "") {
die();	include_footer();
}	die();
$routes = getRoutesNearby($_SESSION['lat'], $_SESSION['lon']);
}	}
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';	$routes = getRoutesNearby($_SESSION['lat'], $_SESSION['lon']);
if ($routes) {
foreach ($routes as $route) {
echo '<li><a href="trip.php?routeid=' . $route['route_id'] . '"><h3>' . $route['route_short_name'] . "</h3><p>" . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")</p>";	if (sizeof($routes) > 0) {
if (isset($nearby)) {	displayRoutes($routes);
$time = getRouteAtStop($route['route_id'], $route['stop_id']);
echo '<span class="ui-li-count">' . ($time['arrival_time'] ? $time['arrival_time'] : "No more trips today") . "<br>" . floor($route['distance']) . 'm away</span>';
}
echo "</a></li>\n";
}
} else {	} else {
	echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
echo "<li style='text-align: center;'> No routes nearby.</li>";	echo "<li style='text-align: center;'> No routes nearby.</li>";
}	}
} else if (isset($bynumber) \|\| isset($numberSeries)) {	} else if (isset($bynumber) \|\| isset($numberSeries)) {
include_header("Routes by Number", "routeList");	include_header("Routes by Number", "routeList");
navbar();	navbar();
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
if (isset($bynumber)) {	if (isset($bynumber)) {
$routes = getRoutesByNumber();	$routes = getRoutesByNumber();
$routeSeries = Array();	$routeSeries = Array();
$seriesRange = Array();	$seriesRange = Array();
foreach ($routes as $key => $routeNumber) {	foreach ($routes as $key => $routeNumber) {
foreach (explode(" ", $routeNumber['route_short_name']) as $routeNumber) {	foreach (explode(" ", $routeNumber['route_short_name']) as $routeNumber) {
$seriesNum = substr($routeNumber, 0, -1) . "0";	$seriesNum = substr($routeNumber, 0, -1) . "0";
if ($seriesNum == "0")	if ($seriesNum == "0")
$seriesNum = $routeNumber;	$seriesNum = $routeNumber;
$finalDigit = substr($routeNumber, sizeof($routeNumber) - 1, 1);	$finalDigit = substr($routeNumber, sizeof($routeNumber) - 1, 1);
if (isset($seriesRange[$seriesNum])) {	if (isset($seriesRange[$seriesNum])) {
if ($finalDigit < $seriesRange[$seriesNum]['max'])	if ($finalDigit < $seriesRange[$seriesNum]['max'])
$seriesRange[$seriesNum]['max'] = $routeNumber;	$seriesRange[$seriesNum]['max'] = $routeNumber;
if ($finalDigit > $seriesRange[$seriesNum]['min'])	if ($finalDigit > $seriesRange[$seriesNum]['min'])
$seriesRange[$seriesNum]['min'] = $routeNumber;	$seriesRange[$seriesNum]['min'] = $routeNumber;
}	}
else {	else {
$seriesRange[$seriesNum]['max'] = $routeNumber;	$seriesRange[$seriesNum]['max'] = $routeNumber;
$seriesRange[$seriesNum]['min'] = $routeNumber;	$seriesRange[$seriesNum]['min'] = $routeNumber;
}	}
$routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;	$routeSeries[$seriesNum][$seriesNum . "-" . $row[1] . "-" . $row[0]] = $row;
}	}
}	}
ksort($routeSeries);	ksort($routeSeries);
ksort($seriesRange);	ksort($seriesRange);
foreach ($routeSeries as $series => $routes) {	foreach ($routeSeries as $series => $routes) {
echo '<li><a href="' . curPageURL() . '/routeList.php?numberSeries=' . $series . '">';	echo '<li><a href="' . curPageURL() . '/routeList.php?numberSeries=' . $series . '">';
if ($series <= 9)	if ($series <= 9)
echo $series;	echo $series;
else	else
echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";	echo "{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}";
echo "</a></li>\n";	echo "</a></li>\n";
}	}
}	}
else if ($numberSeries) {	else if ($numberSeries) {
$routes = getRoutesByNumberSeries($numberSeries);	displayRoutes(getRoutesByNumberSeries($numberSeries));
foreach ($routes as $route) {
echo '<li> <a href="trip.php?routeid=' . $route['route_id'] . '"><h3>' . $route['route_short_name'] . "</h3><p>" . $route['route_long_name'] . " (" . ucwords($route['service_id']) . ")</p></a></li>\n";
}
}	}
} else {	} else {
include_header("Routes by Destination", "routeList");	include_header("Routes by Destination", "routeList");
navbar();	navbar();
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
if (isset($routeDestination)) {	if (isset($routeDestination)) {
foreach (getRoutesByDestination($routeDestination) as $route) {	displayRoutes(getRoutesByDestination($routeDestination));
echo '<li><a href="trip.php?routeid=' . $route["route_id"] . '"><h3>' . $route["route_short_name"] . '</h3><p>' . $route["route_long_name"] . " (" . ucwords($route['service_id']) . ")</p></a></li>\n";
}
} else {	} else {
foreach (getRoutesByDestination() as $destination) {	foreach (getRoutesByDestination() as $destination) {
echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination['route_long_name']) . '">' . $destination['route_long_name'] . "... </a></li>\n";	echo '<li><a href="' . curPageURL() . '/routeList.php?routeDestination=' . urlencode($destination['route_long_name']) . '">' . $destination['route_long_name'] . "... </a></li>\n";
}	}
}	}
}	}
echo "</ul>\n";	echo "</ul>\n";
include_footer();	include_footer();
?>	?>

file:a/servicealerts/index.php -> file:b/servicealerts/index.php

<?php	<?php
include ('../include/common.inc.php');	include ('../include/common.inc.php');

include_header("Service Alerts", "index");	include_header("Service Alerts", "index");
	echo '<ul data-role="listview" data-theme="e" data-groupingtheme="e">';

if ($_SESSION['authed'] == true) {	if ($_SESSION['authed'] == true) {
echo '<ul data-role="listview" data-theme="e" data-groupingtheme="e">	echo' <li><a href="servicealert_editor.php"><h3>servicealert_editor</h3>
<li><a href="servicealert_editor.php"><h3>servicealert_editor</h3>	<p>servicealert_editor</p></a></li>';
<p>servicealert_editor</p></a></li>	}
</ul>';	echo' <li><a href="servicealert_viewer.php"><h3>Service Alert Viewer</h3>
}	<p>Browse current network alerts</p></a></li>';

	echo' </ul>';

?> </div>	?> </div>
<?php	<?php
include_footer()	include_footer()
?>	?>

file:b/servicealerts/servicealert_viewer.php (new)

	<?php
	/*
	* Copyright 2010,2011 Alexander Sadleir

	Licensed under the Apache License, Version 2.0 (the "License");
	you may not use this file except in compliance with the License.
	You may obtain a copy of the License at

	http://www.apache.org/licenses/LICENSE-2.0

	Unless required by applicable law or agreed to in writing, software
	distributed under the License is distributed on an "AS IS" BASIS,
	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	See the License for the specific language governing permissions and
	limitations under the License.
	*/
	include ('../include/common.inc.php');
	include_header("Service Alert Viewer", "serviceAlertViewer");
	/**
	* Currently support:
	* network inform
	* stop remove: route patch, stop remove
	* - stop search
	* street inform: route inform, stop inform
	* - street search
	*/
	if (!isset($_REQUEST['view'])) {

	?>
	Active and Future Alerts:
	<table>
	<?php
	foreach (getFutureAlerts() as $alert) {
	echo "<tr><td>{$alert['header']}</td><td>" . substr($alert['description'], 0, 999) . '</td><td><a href="?view=' . $alert['id'] . '">View</a></td></tr>';
	}
	?>
	</table>
	<?php
	} else {
	$alert = getServiceAlert($_REQUEST['view']);
	echo "<h1>{$alert['header']}</h1>
	<h2> From ".date("c",$alert['start'])." to ".date("c",$alert['end'])."</h2>
	<small>{$alert['description']}</small><br>
	Source: <A href='{$alert['url']}'>{$alert['url']}</a><br>";
	echo "Informed Entities for ID {$_REQUEST['view']}:";
	echo '<table>';
	foreach (getInformedAlerts($_REQUEST['view'], "", "") as $informed) {
	echo "<tr><td>{$informed['informed_class']}</td><td>{$informed['informed_id']}</td><td>{$informed['informed_action']}" . '</td></tr>';
	}
	echo '</table>';
	}
	include_footer();
	?>

file:a/stop.php -> file:b/stop.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
if ($stopid)	if ($stopid)
$stop = getStop($stopid);	$stop = getStop($stopid);
/* if ($stopcode != "" && $stop[5] != $stopcode) {	/* if ($stopcode != "" && $stop[5] != $stopcode) {
$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;	$url = $APIurl . "/json/stopcodesearch?q=" . $stopcode;
$stopsearch = json_decode(getPage($url));	$stopsearch = json_decode(getPage($url));
$stopid = $stopsearch[0][0];	$stopid = $stopsearch[0][0];
$url = $APIurl . "/json/stop?stop_id=" . $stopid;	$url = $APIurl . "/json/stop?stop_id=" . $stopid;
$stop = json_decode(getPage($url));	$stop = json_decode(getPage($url));
}	}
if (!startsWith($stop[5], "Wj") && strpos($stop[1], "Platform") === false) {	if (!startsWith($stop[5], "Wj") && strpos($stop[1], "Platform") === false) {
// expand out to all platforms	// expand out to all platforms

} */	} */

$stops = Array();	$stops = Array();
$stopPositions = Array();	$stopPositions = Array();
$stopNames = Array();	$stopNames = Array();
$tripStopNumbers = Array();	$tripStopNumbers = Array();
$allStopsTrips = Array();	$allStopsTrips = Array();
$fetchedTripSequences = Array();	$fetchedTripSequences = Array();
$stopLinks = "";	$stopLinks = "";
if (isset($stopids)) {	if (isset($stopids)) {
foreach ($stopids as $sub_stopid) {	foreach ($stopids as $sub_stopid) {
$stops[] = getStop($sub_stopid);	$stops[] = getStop($sub_stopid);
}	}
$stop = $stops[0];	$stop = $stops[0];
$stopid = $stops[0]["stop_id"];	$stopid = $stops[0]["stop_id"];
$stopLinks.= "Individual stop pages: <br>";	$stopLinks.= "Individual stop pages: <br>";
foreach ($stops as $key => $sub_stop) {	foreach ($stops as $key => $sub_stop) {

$stopNames[$key] = $sub_stop["stop_name"];	$stopNames[$key] = $sub_stop["stop_name"];
$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . '</a> ';	$stopLinks.= '<a href="stop.php?stopid=' . $sub_stop["stop_id"] . '&stopcode=' . $sub_stop["stop_code"] . '">' . $sub_stop["stop_name"] . '</a> ';

$stopPositions[$key] = Array(	$stopPositions[$key] = Array(
$sub_stop["stop_lat"],	$sub_stop["stop_lat"],
$sub_stop["stop_lon"]	$sub_stop["stop_lon"]
);	);
$trips = getStopTrips($sub_stop["stop_id"]);	$trips = getStopTrips($sub_stop["stop_id"]);
$tripSequence = "";	$tripSequence = "";
foreach ($trips as $trip) {	foreach ($trips as $trip) {
$tripSequence.= "{$trip['trip_id']},";	$tripSequence.= "{$trip['trip_id']},";
$tripStopNumbers[$trip['trip_id']][] = $key;	$tripStopNumbers[$trip['trip_id']][] = $key;
}	}
if (!in_array($tripSequence, $fetchedTripSequences)) {	if (!in_array($tripSequence, $fetchedTripSequences)) {
// only fetch new trip sequences	// only fetch new trip sequences
$fetchedTripSequences[] = $tripSequence;	$fetchedTripSequences[] = $tripSequence;
$trips = getStopTripsWithTimes($sub_stop["stop_id"]);	$trips = getStopTripsWithTimes($sub_stop["stop_id"]);
foreach ($trips as $trip) {	foreach ($trips as $trip) {
if (!isset($allStopsTrips[$trip["trip_id"]]))	if (!isset($allStopsTrips[$trip["trip_id"]]))
$allStopsTrips[$trip["trip_id"]] = $trip;	$allStopsTrips[$trip["trip_id"]] = $trip;
}	}
}	}
//else {	//else {
// echo "skipped sequence $tripSequence";	// echo "skipped sequence $tripSequence";
//}	//}
}	}
}	}
include_header($stop['stop_name'], "stop");	include_header($stop['stop_name'], "stop");

/* $serviceAlerts = json_decode(getPage(curPageURL() . "/servicealerts_api.php?filter_class=stop&filter_id=".$stopid) , true);	/* $serviceAlerts = json_decode(getPage(curPageURL() . "/servicealerts_api.php?filter_class=stop&filter_id=".$stopid) , true);

foreach($serviceAlerts['entities'] as $serviceAlert) {	foreach($serviceAlerts['entities'] as $serviceAlert) {
echo '<div id="servicewarning">'.$serviceAlert['alert']['description']['translation'].'</div>';	echo '<div id="servicewarning">'.$serviceAlert['alert']['description']['translation'].'</div>';
} */	} */

echo '<span class="content-secondary">';	echo '<span class="content-secondary">';
echo $stopLinks;	echo $stopLinks;
if (sizeof($stops) > 0) {	if (sizeof($stops) > 0) {
trackEvent("View Stops", "View Combined Stops", $stop["stop_name"], $stop["stop_id"]);	trackEvent("View Stops", "View Combined Stops", $stop["stop_name"], $stop["stop_id"]);
echo staticmap($stopPositions);	echo staticmap($stopPositions);
} else {	} else {
trackEvent("View Stops", "View Single Stop", $stop["stop_name"], $stop["stop_id"]);	trackEvent("View Stops", "View Single Stop", $stop["stop_name"], $stop["stop_id"]);
echo staticmap(Array(	echo staticmap(Array(
0 => Array(	0 => Array(
$stop["stop_lat"],	$stop["stop_lat"],
$stop["stop_lon"]	$stop["stop_lon"]
)	)
));	));
}	}

// time settings	timeSettings();
echo '<div id="settings" data-role="collapsible" data-collapsed="true">
<h3>Change Time (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
<form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post">
<div class="ui-body">
<div data-role="fieldcontain">
<label for="time"> Time: </label>
<input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/>
<a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
<select name="service_period" id="service_period">';
foreach ($service_periods as $service_period) {
echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
}
echo '</select>
<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>
</div>

<input type="submit" value="Update"/>
</div></form>
</div>';

echo '</span><span class="content-primary">';	echo '</span><span class="content-primary">';
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
if (sizeof($allStopsTrips) > 0) {	if (sizeof($allStopsTrips) > 0) {
sktimesort($allStopsTrips, "arrival_time", true);	sktimesort($allStopsTrips, "arrival_time", true);
$trips = $allStopsTrips;	$trips = $allStopsTrips;
} else {	} else {
$trips = getStopTripsWithTimes($stopid);	$trips = getStopTripsWithTimes($stopid);
}	}
	echo "<div class='ui-header' style='overflow: visible; height: 2.5em'>";
	// later/earlier button setup
	if (sizeof($trips) == 0) {
	$time = isset($_REQUEST['time']) ? strtotime($_REQUEST['time']) : time();
	$earlierTime = $time - (90 * 60);
	$laterTime = $time + (90 * 60);
	} else {
	$earlierTime = strtotime($trips[0]['arrival_time']) - (90 * 60);
	$laterTime = strtotime($trips[sizeof($trips) - 1]['arrival_time']) - 60;
	}
	if (sizeof($stopids) > 0) {
	$stopidurl = "stopids=" . implode(",", $stopids);
	} else {
	$stopidurl = "stopid=$stopid";
	}
	if (sizeof($trips) > 10) {
	echo '<a href="stop.php?' . $stopidurl . '&service_period=' . service_period() . '&time=' . date("H:i", $laterTime) . '" data-icon="arrow-r" class="ui-btn-right">Later Trips</a>';
	}
	echo '<a href="stop.php?' . $stopidurl . '&service_period=' . service_period() . '&time=' . date("H:i", $earlierTime) . '" data-icon="arrow-l" class="ui-btn-left">Earlier Trips</a>';
	echo "</div>";
if (sizeof($trips) == 0) {	if (sizeof($trips) == 0) {
echo "<li style='text-align: center;'>No trips in the near future.</li>";	echo "<li style='text-align: center;'>No trips in the near future.</li>";
} else {	} else {
foreach ($trips as $trip) {	foreach ($trips as $trip) {
echo '<li>';	echo '<li>';

$destination = getTripDestination($trip['trip_id']);	$destination = getTripDestination($trip['trip_id']);
echo '<a href="trip.php?stopid=' . $stopid . '&tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " " . $destination['stop_name'] . "</h3><p>";	echo '<a href="trip.php?stopid=' . $stopid . '&tripid=' . $trip['trip_id'] . '"><h3>' . $trip['route_short_name'] . " towards " . $destination['stop_name'] . "</h3><p>";
$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);	$viaPoints = viaPointNames($trip['trip_id'], $trip['stop_sequence']);
if ($viaPoints != "")	if ($viaPoints != "")
echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';	echo '<br><span class="viaPoints">Via: ' . $viaPoints . '</span>';
if (sizeof($tripStopNumbers) > 0) {	if (sizeof($tripStopNumbers) > 0) {
echo '<br><small>Boarding At: ';	echo '<br><small>Boarding At: ';
if (sizeof($tripStopNumbers[$trip['trip_id']]) == sizeof($stopids)) {	if (sizeof($tripStopNumbers[$trip['trip_id']]) == sizeof($stopids)) {
echo "All Stops";	echo "All Stops";
} else {	} else {
foreach ($tripStopNumbers[$trip['trip_id']] as $key) {	foreach ($tripStopNumbers[$trip['trip_id']] as $key) {
echo $stopNames[$key] . ', ';	echo $stopNames[$key] . ', ';
}	}
}	}
echo '</small>';	echo '</small>';
}	}
echo '</p>';	echo '</p>';
echo '<p class="ui-li-aside"><strong>' . $trip['arrival_time'] . '</strong></p>';	echo '<p class="ui-li-aside"><strong>' . $trip['arrival_time'] . '</strong></p>';
echo '</a></li>';	echo '</a></li>';
flush();	flush();
@ob_flush();	@ob_flush();
}	}
}	}
echo '</ul>';	echo '</ul>';
echo '</span>';	echo '</span>';
include_footer();	include_footer();
?>	?>

file:a/stopList.php -> file:b/stopList.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
$stops = Array();	$stops = Array();

function navbar() {	function navbar() {
echo '	echo '
<div data-role="navbar">	<div data-role="navbar">
<ul>	<ul>
<li><a href="stopList.php">Stops by Name</a></li>	<li><a href="stopList.php">Stops by Name</a></li>
<li><a href="stopList.php?bysuburbs=yes">By Suburb</a></li>	<li><a href="stopList.php?bysuburbs=yes">By Suburb</a></li>
<li><a href="stopList.php?nearby=yes">Nearby Stops</a></li>	<li><a href="stopList.php?nearby=yes">Nearby Stops</a></li>
</ul>	</ul>
</div>	</div>
';	';
}	}

// By suburb	// By suburb
if (isset($bysuburbs)) {	if (isset($bysuburbs)) {
include_header("Stops by Suburb", "stopList");	include_header("Stops by Suburb", "stopList");
navbar();	navbar();
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';	echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
if (!isset($firstLetter)) {	if (!isset($firstLetter)) {
foreach (range('A', 'Z') as $letter) {	foreach (range('A', 'Z') as $letter) {
echo "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n";	echo "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n";
}	}
} else {	} else {
foreach ($suburbs as $suburb) {	foreach ($suburbs as $suburb) {
if (startsWith($suburb, $firstLetter)) {	if (startsWith($suburb, $firstLetter)) {
echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';	echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
}	}
}	}
}	}
echo '</ul>';	echo '</ul>';
} else {	} else {
// Timing Points / All stops	// Timing Points / All stops
if (isset($nearby)) {	if (isset($nearby)) {
$listType = 'nearby=yes';	$listType = 'nearby=yes';
include_header("Nearby Stops", "stopList", true, true);	include_header("Nearby Stops", "stopList", true, true);
trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);	trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
navbar();	navbar();
if (!isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "") {	if (!isset($_SESSION['lat']) \|\| !isset($_SESSION['lat']) \|\| $_SESSION['lat'] == "" \|\| $_SESSION['lon'] == "") {
placeSettings();	placeSettings();
include_footer();	include_footer();
die();	die();
}	}
$stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);	$stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
echo '<span class="content-secondary">';	echo '<span class="content-secondary">';
$stopPositions[] = Array(	$stopPositions[] = Array(
$_SESSION['lat'],	$_SESSION['lat'],
$_SESSION['lon']	$_SESSION['lon']
);	);
foreach ($stops as $sub_stop) {	foreach ($stops as $sub_stop) {
$stopPositions[] = Array(	$stopPositions[] = Array(
$sub_stop["stop_lat"],	$sub_stop["stop_lat"],
$sub_stop["stop_lon"]	$sub_stop["stop_lon"]
);	);
}	}
echo staticmap($stopPositions, true, true);	echo staticmap($stopPositions, true, true);
placeSettings();	placeSettings();
echo '</span><span class="content-primary">';	echo '</span><span class="content-primary">';
} else if (isset($suburb)) {	} else if (isset($suburb)) {
$stops = getStopsBySuburb($suburb);	$stops = getStopsBySuburb($suburb);
include_header("Stops in " . ucwords($suburb), "stopList");	include_header("Stops in " . ucwords($suburb), "stopList");
navbar();	navbar();
trackEvent("Stop Lists", "Stops By Suburb", $suburb);	trackEvent("Stop Lists", "Stops By Suburb", $suburb);
} else {	} else {
$listType = 'allstops=yes';	$listType = 'allstops=yes';
$stops = getStops($firstLetter);	$stops = getStops($firstLetter);
include_header("Stops by Name", "stopList");	include_header("Stops by Name", "stopList");
navbar();	navbar();
}	}
echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';	echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {	if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {
foreach (range('A', 'Z') as $letter) {	foreach (range('A', 'Z') as $letter) {
echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";	echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";
}	}
} else {	} else {
//var_dump($stops);	//var_dump($stops);
$stopsGrouped = Array();	$stopsGrouped = Array();
foreach ($stops as $key => $stop) {	foreach ($stops as $key => $stop) {
if (stopCompare($stops[$key]["stop_name"])	if (stopCompare($stops[$key]["stop_name"])
!= stopCompare($stops[$key + 1]["stop_name"])	!= stopCompare($stops[$key + 1]["stop_name"])
\|\| $key + 1 >= sizeof($stops)) {	\|\| $key + 1 >= sizeof($stops)) {
if (sizeof($stopsGrouped) > 0) {	if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops	// print and empty grouped stops
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $stop['stop_id'];	$stopsGrouped["stop_ids"][] = $stop['stop_id'];
echo '<li>';	echo '<li>';
echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';	echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '&stopcodes=' . implode(",", $stopsGrouped['stop_codes']) . '">';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';	echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
}	}
echo stopGroupTitle($stop['stop_name'],$stop['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';	echo stopGroupTitle($stop['stop_name'],$stop['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';
echo "</a></li>\n";	echo "</a></li>\n";
flush();	flush();
@ob_flush();	@ob_flush();
$stopsGrouped = Array();	$stopsGrouped = Array();
} else {	} else {
// just a normal stop	// just a normal stop
echo '<li>';	echo '<li>';
echo '<a href="stop.php?stopid=' . $stop['stop_id'] . '&stopcode=' . $stop['stop_code'] . '">';	echo '<a href="stop.php?stopid=' . $stop['stop_id'] . '&stopcode=' . $stop['stop_code'] . '">';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';	echo '<span class="ui-li-count">' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>';
}	}
echo $stop['stop_name'];	echo $stop['stop_name'];
echo "</a></li>\n";	echo "</a></li>\n";
flush();	flush();
@ob_flush();	@ob_flush();
}	}
} else {	} else {
// this is a duplicated line item	// this is a duplicated line item
if ($key - 1 <= 0 \|\| stopCompare($stops[$key]['stop_name']) != stopCompare($stops[$key - 1]['stop_name'])) {	if ($key - 1 <= 0 \|\| stopCompare($stops[$key]['stop_name']) != stopCompare($stops[$key - 1]['stop_name'])) {
// first duplicate	// first duplicate
$stopsGrouped = Array(	$stopsGrouped = Array(
"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),	"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
"stop_ids" => Array(	"stop_ids" => Array(
$stop['stop_id']	$stop['stop_id']
),	),
"stop_codes" => Array(	"stop_codes" => Array(
$stop['stop_code']	$stop['stop_code']
)	)
);	);
} else {	} else {
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $stop['stop_id'];	$stopsGrouped["stop_ids"][] = $stop['stop_id'];

}	}
}	}
}	}
}	}
echo '</ul>';	echo '</ul>';
if (isset($nearby))	if (isset($nearby))
echo '</span>';	echo '</span>';
}	}
include_footer();	include_footer();
?>	?>

file:a/trip.php -> file:b/trip.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
$routetrips = Array();	$routetrips = Array();
if (isset($routeid) && !isset($tripid)) {	if (isset($routeids) && !isset($tripid)) {
$trip = getRouteNextTrip($routeid);	foreach ($routeids as $routeid) {
	$possibleTrip = getRouteNextTrip($routeid);
	if (!isset($trip) \|\| strtotime($possibleTrip['departure_time']) < strtotime($trip['departure_time'])) {
	$trip = getRouteNextTrip($routeid);
	}
	}
$tripid = $trip['trip_id'];	$tripid = $trip['trip_id'];
} else {	} else {
$trip = getTrip($tripid);	$trip = getTrip($tripid);
$routeid = $trip["route_id"];	$similarRoutes = getRoutesByNumber($trip['route_short_name'], $trip['direction_id'], service_period_day($trip["service_id"]));
	$routeids = Array();
	foreach ($similarRoutes as $similarRoute) {
	$routeids[] = $similarRoute['route_id'];
	}
	$routeids = array_unique($routeids);
}	}
	$directionid = $trip['direction_id'];
$destination = getTripDestination($trip['trip_id']);	$service_period = service_period_day($trip["service_id"]);
	$destination = getTripDestination($trip['trip_id']);
include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip");	include_header("Stops on " . $trip['route_short_name'] . ' ' . $destination['stop_name'], "trip");
trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid);	trackEvent("Route/Trip View", "View Route", $trip['route_short_name'] . ' ' . $destination['stop_name'], $routeid);
echo '<span class="content-secondary">';	echo '<span class="content-secondary">';
echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>';	echo '<a href="' . $trip['route_url'] . '">View Original Timetable/Map</a>';
echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';	echo '<h2>Via:</h2> <small>' . viaPointNames($tripid) . '</small>';
echo '<h2>Other Trips:</h2> ';	echo '<h2>Other Trips:</h2> ';
$routeTrips = getRouteTrips($routeid);	echo "getRoutesTrips(".print_r($routeids,true).", {$trip['direction_id']}, $service_period) $tripid";
	$routeTrips = getRoutesTrips($routeids, $trip['direction_id'], $service_period);
foreach ($routeTrips as $key => $othertrip) {	foreach ($routeTrips as $key => $othertrip) {
if ($othertrip['trip_id'] != $tripid) {	// if ($othertrip['trip_id'] != $tripid) {
echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeid=" . $routeid . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';	echo '<a href="trip.php?tripid=' . $othertrip['trip_id'] . "&routeids=" . implode(",", $routeids) . '">' . str_replace(" ", ":00", str_replace(":00", " ", $othertrip['arrival_time'])) . '</a> ';
} else {	// } else {
// skip this trip but look forward/back	// skip this trip but look forward/back
if ($key - 1 > 0)	if ($key - 1 > 0)
$prevTrip = $routeTrips[$key - 1]['trip_id'];	$prevTrip = $routeTrips[$key - 1]['trip_id'];
if ($key + 1 < sizeof($routeTrips))	if ($key + 1 < sizeof($routeTrips))
$nextTrip = $routeTrips[$key + 1]['trip_id'];	$nextTrip = $routeTrips[$key + 1]['trip_id'];
}	// }
}	}
flush();	flush();
@ob_flush();	@ob_flush();
echo '<h2>Other directions/timing periods:</h2> ';	echo '<h2>Other directions/timing periods:</h2> ';
$otherDir = 0;	$otherDir = 0;
	$filteredRoutes = Array();
foreach (getRoutesByNumber($trip['route_short_name']) as $row) {	foreach (getRoutesByNumber($trip['route_short_name']) as $row) {
if ($row['route_id'] != $routeid) {
echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';	foreach (getRouteHeadsigns($row['route_id']) as $headsign) {
$otherDir++;	if ( $headsign['direction_id'] != $directionid \|\| service_period_day($headsign['service_id']) != $service_period) {
	echo "{$headsign['direction_id']} != $directionid \|\| ".service_period_day($headsign['service_id'])." != $service_period <br>";
	$start = $headsign['stop_name'];

	$serviceday = service_period_day($headsign['service_id']);
	$key = $row['route_short_name'] . "." . $headsign['direction_id'];
	if (isset($filteredRoutes[$key])) {
	$filteredRoutes[$key]['route_ids'][] = $row['route_id'];
	$filteredRoutes[$key]['route_ids'] = array_unique($filteredRoutes[$key]['route_ids']);
	} else {
	$filteredRoutes[$key]['route_short_name'] = $row['route_short_name'];
	$filteredRoutes[$key]['route_long_name'] = "Starting at " . $start;
	$filteredRoutes[$key]['service_id'] = $serviceday;
	$filteredRoutes[$key]['direction_id'] = $headsign['direction_id'];
	}
	}
}	}
}	}
if ($otherDir == 0)	foreach ($filteredRoutes as $key => $row) {
	echo '<a href="trip.php?routeids=' . implode(",",$row['route_ids']) . '&directionid='.$row['direction_id'].'&service_period='.$row['service_id'].'">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
	$otherDir++;
	}

	if ($otherDir == 0) {
echo "None";	echo "None";
	}
echo '</span><span class="content-primary">';	echo '</span><span class="content-primary">';
flush();	flush();
@ob_flush();	@ob_flush();
echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";	echo "<div class='ui-header' style='overflow: visible; height: 1.5em'>";
if ($nextTrip)	if ($nextTrip)
echo '<a href="trip.php?tripid=' . $nextTrip . "&routeid=" . $routeid . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';	echo '<a href="trip.php?tripid=' . $nextTrip . "&routeids=" . implode(",", $routeids) . '" data-icon="arrow-r" class="ui-btn-right">Next Trip</a>';
if ($prevTrip)	if ($prevTrip)
echo '<a href="trip.php?tripid=' . $prevTrip . "&routeid=" . $routeid . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';	echo '<a href="trip.php?tripid=' . $prevTrip . "&routeids=" . implode(",", $routeids) . '" data-icon="arrow-l" class="ui-btn-left">Previous Trip</a>';
echo "</div>";	echo "</div>";
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
$stopsGrouped = Array();	$stopsGrouped = Array();
$tripStopTimes = getTripStopTimes($tripid);	$tripStopTimes = getTripStopTimes($tripid);
echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $destination['stop_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']) . ')</li>';	echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(service_period_day($tripStopTimes[0]['service_id'])) . ')</li>';
foreach ($tripStopTimes as $key => $tripStopTime) {	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 '<li>';	echo '<li>';

if (sizeof($stopsGrouped) > 0) {	if (sizeof($stopsGrouped) > 0) {
// print and empty grouped stops	// print and empty grouped stops
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];	$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];	$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';	echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">';
echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];	echo '<p class="ui-li-aside">' . $stopsGrouped['startTime'] . ' to ' . $stopsGrouped['endTime'];
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';	echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}	}
echo '</p>';	echo '</p>';
echo stopGroupTitle($tripStopTime['stop_name'],$tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';	echo stopGroupTitle($tripStopTime['stop_name'], $tripStopTime['stop_desc']) . '<br><small>' . sizeof($stopsGrouped["stop_ids"]) . ' stops</small>';

echo '</a></li>';	echo '</a></li>';
flush();	flush();
@ob_flush();	@ob_flush();
$stopsGrouped = Array();	$stopsGrouped = Array();
} else {	} else {
// just a normal stop	// just a normal stop
echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">';	echo '<a href="stop.php?stopid=' . $tripStopTime['stop_id'] . (startsWith($tripStopTime['stop_code'], "Wj") ? '&stopcode=' . $tripStopTime['stop_code'] : "") . '">';
echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];	echo '<p class="ui-li-aside">' . $tripStopTime['arrival_time'];
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {	if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';	echo '<br>' . distance($tripStopTime['stop_lat'], $tripStopTime['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}	}
echo '</p>';	echo '</p>';
echo $tripStopTime['stop_name'];	echo $tripStopTime['stop_name'];
echo '</a></li>';	echo '</a></li>';
flush();	flush();
@ob_flush();	@ob_flush();
}	}
} else {	} else {
// this is a duplicated line item	// this is a duplicated line item
if ($key - 1 <= 0 \|\| stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {	if ($key - 1 <= 0 \|\| stopCompare($tripStopTimes[$key]['stop_name']) != stopCompare($tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate	// first duplicate
$stopsGrouped = Array(	$stopsGrouped = Array(
"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),	"name" => trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])),
"startTime" => $tripStopTime['arrival_time'],	"startTime" => $tripStopTime['arrival_time'],
"stop_ids" => Array(	"stop_ids" => Array(
$tripStopTime['stop_id']	$tripStopTime['stop_id']
)	)
);	);
} else {	} else {
// subsequent duplicates	// subsequent duplicates
$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];	$stopsGrouped["stop_ids"][] = $tripStopTime['stop_id'];
$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];	$stopsGrouped["endTime"] = $tripStopTime['arrival_time'];
}	}
}	}
}	}
echo '</ul>';	echo '</ul>';
echo '</span>';	echo '</span>';
include_footer();	include_footer();
?>	?>

<?php	<?php
/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
include_header("About", "about")	include_header("About", "about")
?>	?>
<p>	<p>
Busness Time - An ACT bus timetable webapp<br />	Busness Time - An ACT bus timetable webapp<br />
Based on the maxious-canberra-transit-feed (<a	Based on the maxious-canberra-transit-feed (<a
href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,	href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,
last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />	last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />
Source code for the <a	Source code for the <a
href="https://github.com/maxious/ACTBus-data">transit	href="https://github.com/maxious/ACTBus-data">transit
feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this	feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
site</a> available from github.<br />	site</a> available from github.<br />
Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />	Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
Suburb Geocoding Based on <A href="http://www.abs.gov.au/AUSSTATS/abs@.nsf/Lookup/1270.0.55.003Main+Features1July%202011?OpenDocument">Australian Bureau of Statistics data.</a><br />	Suburb Geocoding Based on <A href="http://www.abs.gov.au/AUSSTATS/abs@.nsf/Lookup/1270.0.55.003Main+Features1July%202011?OpenDocument">Australian Bureau of Statistics data.</a><br />
Street geocoding based on work by OpenStreetMap contributors<br>	Street geocoding based on work by OpenStreetMap contributors<br>
<br />	<br />
Feedback encouraged; contact maxious@lambdacomplex.org<br />	Feedback encouraged; contact maxious@lambdacomplex.org<br />
<br />	<br />
Some icons by Joseph Wain / glyphish.com<br />	Some icons by Joseph Wain / glyphish.com<br />
Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>	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/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>)
, Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)	, Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</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>)	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 />	<br />

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* Copyright 2010,2011 Alexander Sadleir

Licensed under the Apache License, Version 2.0 (the "License");	Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.	you may not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,	distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
$service_periods = Array(	$service_periods = Array(
'sunday',	'sunday',
'saturday',	'saturday',
'weekday'	'weekday'
);	);
	function service_period_day ($spid) {
	$idParts = explode("-",$spid);
	return strtolower($idParts[2]);
	}
function service_period($date = "") {	function service_period($date = "") {

if (isset($_SESSION['service_period']))	if (isset($_REQUEST['service_period']))
return $_SESSION['service_period'];	return $_REQUEST['service_period'];
$override = getServiceOverride($date);	$override = getServiceOverride($date);
if ($override['service_id']) {	if ($override['service_id']) {
$idParts = explode("-",$override['service_id']);	return service_period_day ($override['service_id']);
return strtolower($idParts[2]);
}	}

switch (date('w', ($date != "" ? $date : time()))) {	switch (date('w', ($date != "" ? $date : time()))) {
case 0:	case 0:
return 'sunday';	return 'sunday';
case 6:	case 6: