gitphp 0.2.9.1 :: busui.git/commitdiff

Merge branch 'master' of github.com:maxious/ACTBus-ui

11 files changed: (show all)
geo/route.kml.php
geo/stops.kml.php
geo/trip.kml.php (new)
include/common-net.inc.php
include/common-session.inc.php
include/common-template.inc.php
include/db/trip-dao.inc.php
myway/myway_timeliness_calculate.php
stop.php
stopList.php
trip.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"]);
echo "<name>".$route['route_short_name']."</name>";	$link = curPageURL() . "/../trip.php?routeid=" . htmlspecialchars($route["route_id"]);
echo '<atom:link href="'.$link.'"/>';	echo "<name>" . $route['route_short_name'] . "</name>";
echo '<description><![CDATA[ <a href="'.$link.'">'.$route['route_short_name']." ".$route['route_long_name']."</a>]]> </description>";	echo '<atom:link href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $route['route_short_name'] . " " . $route['route_long_name'] . "</a>]]> </description>";
echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";
	$trip = getRouteNextTrip($routeid);
$trip = getRouteNextTrip($routeid);	echo getTripShape($trip['trip_id']);
echo getTripShape($trip['trip_id']);

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

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

file:b/geo/trip.kml.php (new)

	<?php

	header('Content-Type: application/vnd.google-earth.kml+xml');
	include ('../include/common.inc.php');
	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>';
	echo '
	<Style id="yellowLineGreenPoly">
	<LineStyle>
	<color>7f00ff00</color>
	<width>4</width>
	</LineStyle>
	<PolyStyle>
	<color>7f00ffff</color>
	</PolyStyle>
	</Style>';
	$trip = getTrip($tripid);
	echo "\n<Placemark>\n";
	$link = curPageURL() . "/../trip.php?tripid=" . htmlspecialchars($$tripid);
	echo "<name>" . $tripid . "</name>";
	echo '<atom:link href="' . $link . '"/>';
	echo '<description><![CDATA[ <a href="' . $link . '">' . $tripid . "</a>]]> </description>";
	echo "<styleUrl>#yellowLineGreenPoly</styleUrl>";


	echo getTripShape($tripid);

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

file:a/include/common-net.inc.php -> file:b/include/common-net.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 getPage($url) {	function getPage($url) {
debug($url, "json");	debug($url, "json");
$ch = curl_init($url);	$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, 0);	curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 45);	curl_setopt($ch, CURLOPT_TIMEOUT, 45);
$page = curl_exec($ch);	$page = curl_exec($ch);
if (curl_errno($ch)) {	if (curl_errno($ch)) {
echo "<font color=red> Database temporarily unavailable: ";	echo "<font color=red> Database temporarily unavailable: ";
echo curl_errno($ch) . " " . curl_error($ch);	echo curl_errno($ch) . " " . curl_error($ch);
if (isDebug()) {	if (isDebug()) {
echo $url;	echo $url;
}	}
echo "</font><br>";	echo "</font><br>";
}	}
curl_close($ch);	curl_close($ch);
debug(print_r($page, true), "json");	debug(print_r($page, true), "json");
return $page;	return $page;
}	}
	function baseURL() {
	$protocol = $_SERVER['HTTPS'] ? "https" : "http";
	return $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

	}
function curPageURL() {	function curPageURL() {
$isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");	$isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");
$port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") \|\| ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));	$port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") \|\| ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));
$port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : '';	$port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : '';
$url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);	$url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);
return $url;	return $url;
}	}

?>	?>

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

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.1";
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 (isset($overrides['service_id'])) {	if (isset($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() {	function timeSettings() {
global $service_periods;	global $service_periods;
echo '<div id="settings" data-role="collapsible" data-collapsed="true">	echo '<div id="settings" data-role="collapsible" data-collapsed="true">
<h3>Change Time (' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>	<h3>Change Time (' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3>
<form action="' . basename($_SERVER['PHP_SELF']) . '" method="GET">	<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="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="stopid" id="stopid" value="' . (isset($_REQUEST['stopid']) ? $_REQUEST['stopid'] : "") . '"/>
<input type="hidden" name="stopcode" id="stopcode" value="' . (isset($_REQUEST['stopcode']) ? $_REQUEST['stopcode'] : "") . '"/>	<input type="hidden" name="stopcode" id="stopcode" value="' . (isset($_REQUEST['stopcode']) ? $_REQUEST['stopcode'] : "") . '"/>
<div class="ui-body">	<div class="ui-body">
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="time"> Time: </label>	<label for="time"> Time: </label>
<input type="time" name="time" id="time" value="' . (isset($_REQUEST['time']) ? $_REQUEST['time'] : date("H:i")) . '"/>	<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>	<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>
<div data-role="fieldcontain">	<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>	<label for="service_period"> Service Period: </label>
<select name="service_period" id="service_period">';	<select name="service_period" id="service_period">';
foreach ($service_periods as $service_period) {	foreach ($service_periods as $service_period) {
echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';	echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>';
}	}
echo '</select>	echo '</select>
<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>	<a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a>
</div>	</div>

<input type="submit" value="Update"/>	<input type="submit" value="Update"/>
</div></form>	</div></form>
</div>';	</div>';
}	}
function placeSettings() {	function placeSettings() {

$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/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 getTripStops($tripID) {
global $conn;	global $conn;
$query = "SELECT stop_id, stop_name, ST_AsKML(position) as positionkml,	$query = "SELECT stop_id, stop_name, ST_AsKML(position) as positionkml,
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";	WHERE trips.trip_id = :tripID 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();
}	}
return $query->fetchColumn(0);	return $query->fetchColumn(0);
}	}
function getTripShape($tripID) {	function getTripShape($tripID) {
// todo, use shapes table if shape_id specified	// todo, use shapes table if shape_id specified
global $conn;	global $conn;
$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route	$query = "SELECT ST_AsKML(ST_MakeLine(geometry(a.shape_pt))) as the_route
FROM (SELECT shapes.shape_id,shape_pt from shapes	FROM (SELECT shapes.shape_id,shape_pt from shapes
inner join trips on shapes.shape_id = trips.shape_id	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";	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 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) {	function getTripStartingPoint($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 and stop_sequence = '1' limit 1";	WHERE trip_id = :tripID and stop_sequence = '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();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);
return $r;	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/myway/myway_timeliness_calculate.php -> file:b/myway/myway_timeliness_calculate.php

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";
//}	//}
}	}
}	}
if (sizeof($stops) > 0) {	if (sizeof($stops) > 0) {
$stopDescParts = explode("<br>",$stop['stop_desc']);	$stopDescParts = explode("<br>",$stop['stop_desc']);
include_header(trim(str_replace("Street: ","",$stopDescParts[0])), "stop");	include_header(trim(str_replace("Street: ","",$stopDescParts[0])), "stop");
} else {	} else {
include_header($stop['stop_name']);	include_header($stop['stop_name']);
}	}
/* $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"]
)	)
));	));
}	}

timeSettings();	timeSettings();

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'>";	echo "<div class='ui-header' style='overflow: visible; height: 2.5em'>";
// if we have too many trips, cut down to size.	// if we have too many trips, cut down to size.
if (sizeof($trips) > 10) {	if (sizeof($trips) > 10) {
$trips = array_splice($trips, 0,10);	$trips = array_splice($trips, 0,10);
}	}

// later/earlier button setup	// later/earlier button setup
if (sizeof($trips) == 0) {	if (sizeof($trips) == 0) {
$time = isset($_REQUEST['time']) ? strtotime($_REQUEST['time']) : time();	$time = isset($_REQUEST['time']) ? strtotime($_REQUEST['time']) : time();
$earlierTime = $time - (90 * 60);	$earlierTime = $time - (90 * 60);
$laterTime = $time + (90 * 60);	$laterTime = $time + (90 * 60);
} else {	} else {
$tripsKeys = array_keys($trips);	$tripsKeys = array_keys($trips);
$earlierTime = strtotime($trips[$tripsKeys[0]]['arrival_time']) - (90 * 60);	$earlierTime = strtotime($trips[$tripsKeys[0]]['arrival_time']) - (90 * 60);
$laterTime = strtotime($trips[$tripsKeys[sizeof($trips) - 1]]['arrival_time']) - 60;	$laterTime = strtotime($trips[$tripsKeys[sizeof($trips) - 1]]['arrival_time']) - 60;
}	}
if (sizeof($stopids) > 0) {	if (isset($stopids) && sizeof($stopids) > 0) {
$stopidurl = "stopids=" . implode(",", $stopids);	$stopidurl = "stopids=" . implode(",", $stopids);
} else {	} else {
$stopidurl = "stopid=$stopid";	$stopidurl = "stopid=$stopid";
}	}
if (sizeof($trips) >= 10) {	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", $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 '<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>";	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'] . " towards " . $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', 'Y') as $letter) { // no suburbs start with J, Q, U, V, X or Z	foreach (range('A', 'Y') as $letter) { // no suburbs start with J, Q, U, V, X or Z
if ($letter != "J" && $letter != "Q" && $letter != "U" && $letter != "V" && $letter != "X") echo "<li><a href=\"stopList.php?firstLetter=$letter&bysuburbs=yes\">$letter...</a></li>\n";	if ($letter != "J" && $letter != "Q" && $letter != "U" && $letter != "V" && $letter != "X") 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)) { // all stops by letter	if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) { // all stops by letter
foreach (range('A', 'Y') as $letter) { // no streets start with X or Z	foreach (range('A', 'Y') as $letter) { // no streets start with X or Z
if ($letter != "X") echo "<li><a href=\"stopList.php?firstLetter=$letter&$listType\">$letter...</a></li>\n";	if ($letter != "X") 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 ($key + 1 >= sizeof($stops) \|\|
!= stopCompare($stops[$key + 1]["stop_name"])	stopCompare($stops[$key]["stop_name"]) != stopCompare($stops[$key + 1]["stop_name"])) {
\|\| $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']) . '&stopcodes=' . implode(",", $stopsGrouped['stop_codes']) . '">';	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($routeid) && !isset($tripid)) {
$trip = getRouteNextTrip($routeid,$directionid);	$trip = getRouteNextTrip($routeid,$directionid);

if (!($trip)) {	if (!($trip)) {
$trip = getRouteFirstTrip($routeid,$directionid);	$trip = getRouteFirstTrip($routeid,$directionid);
}	}
$tripid = $trip['trip_id'];	$tripid = $trip['trip_id'];
} else {	} else {
$trip = getTrip($tripid);	$trip = getTrip($tripid);
$routeid = $trip['route_id'];	$routeid = $trip['route_id'];
}	}
$directionid = $trip['direction_id'];	$directionid = $trip['direction_id'];
$service_period = strtolower($trip["service_id"]);	$service_period = strtolower($trip["service_id"]);
$destination = getTripDestination($trip['trip_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 '<a href="geo/trip.kml.php?tripid='.$tripid.'">View Trip in Google Earth</a> ';
	echo '<a href="geo/route.kml.php?routeid='.$tripid.'">View Route in Google Earth</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, $trip['direction_id'], $service_period);	$routeTrips = getRouteTrips($routeid, $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'] . "&routeid=" . $routeid . '">' . 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;

foreach (getRouteHeadsigns($routeid) as $headsign) {	foreach (getRouteHeadsigns($routeid) as $headsign) {
if ($headsign['direction_id'] != $directionid \|\| strtolower($headsign['service_id']) != $service_period) {	if ($headsign['direction_id'] != $directionid \|\| strtolower($headsign['service_id']) != $service_period) {

echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> ';	echo '<a href="trip.php?routeid=' . $routeid . '&directionid=' . $headsign['direction_id'] . '&service_period=' . $headsign['service_id'] . '"> Starting at ' . $headsign['stop_name'] . ' (' . $headsign['service_id'] . ')</a> ';
$otherDir++;	$otherDir++;
}	}
}	}

if ($otherDir == 0) {	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 . "&routeid=" . $routeid . '" 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 . "&routeid=" . $routeid . '" 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'] . ' towards ' . $destination['stop_name'] . ' (' . ucwords(strtolower($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(strtolower($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
	header('Content-type: application/vnd.google-earth.kml+xml');
include ('../include/common.inc.php');	include ('../include/common.inc.php');
header('Content-type: application/vnd.google-earth.kml+xml');
//http://wiki.openstreetmap.org/wiki/OpenLayers_Dynamic_KML	//http://wiki.openstreetmap.org/wiki/OpenLayers_Dynamic_KML
// Creates the KML/XML Document.	// Creates the KML/XML Document.
$dom = new DOMDocument('1.0', 'UTF-8');	$dom = new DOMDocument('1.0', 'UTF-8');
// Creates the root KML element and appends it to the root document.	// Creates the root KML element and appends it to the root document.
$node = $dom->createElementNS('http://earth.google.com/kml/2.1', 'kml');	$node = $dom->createElementNS('http://www.opengis.net/kml/2.2', 'kml');
$parNode = $dom->appendChild($node);	$parNode = $dom->appendChild($node);
// Creates a KML Document element and append it to the KML element.	// Creates a KML Document element and append it to the KML element.
$dnode = $dom->createElement('Document');	$dnode = $dom->createElement('Document');
$docNode = $parNode->appendChild($dnode);	$docNode = $parNode->appendChild($dnode);
if ($suburb != "") $result_stops = getStopsBySuburb($suburb);	if ($suburb != "") $result_stops = getStopsBySuburb($suburb);
else $result_stops = getStops();	else $result_stops = getStops();
foreach ($result_stops as $stop) {	foreach ($result_stops as $stop) {
$description = 'http://bus.lambdacomplex.org/' . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";	$description = baseURL() . 'stop.php?stopid=' . $stop['stop_id'] . " <br>";
// Creates a Placemark and append it to the Document.	// Creates a Placemark and append it to the Document.
$node = $dom->createElement('Placemark');	$node = $dom->createElement('Placemark');
$placeNode = $docNode->appendChild($node);	$placeNode = $docNode->appendChild($node);
// Creates an id attribute and assign it the value of id column.	// Creates an id attribute and assign it the value of id column.
$placeNode->setAttribute('id', 'placemark' . $stop['stop_id']);	$placeNode->setAttribute('id', 'placemark' . $stop['stop_id']);
// Create name, and description elements and assigns them the values of the name and address columns from the results.	// Create name, and description elements and assigns them the values of the name and address columns from the results.
$nameNode = $dom->createElement('name', htmlentities($stop['stop_name']));	$nameNode = $dom->createElement('name', htmlentities($stop['stop_name']));
$descriptionNode = $dom->createElement('description', $description);	$descriptionNode = $dom->createElement('description', $description);
$placeNode->appendChild($nameNode);	$placeNode->appendChild($nameNode);
$placeNode->appendChild($descriptionNode);	$placeNode->appendChild($descriptionNode);
// Creates a Point element.	// Creates a Point element.
$pointNode = $dom->createElement('Point');	$pointNode = $dom->createElement('Point');
$placeNode->appendChild($pointNode);	$placeNode->appendChild($pointNode);
// Creates a coordinates element and gives it the value of the lng and lat columns from the results.	// Creates a coordinates element and gives it the value of the lng and lat columns from the results.
$coorStr = $stop['stop_lon'] . ',' . $stop['stop_lat'];	$coorStr = $stop['stop_lon'] . ',' . $stop['stop_lat'];
$coorNode = $dom->createElement('coordinates', $coorStr);	$coorNode = $dom->createElement('coordinates', $coorStr);
$pointNode->appendChild($coorNode);	$pointNode->appendChild($coorNode);
}	}
$kmlOutput = $dom->saveXML();	$kmlOutput = $dom->saveXML();
echo $kmlOutput;	echo $kmlOutput;
?>	?>

<?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("MyWay Delta Calculate", "mywayDeltaCalc");	include_header("MyWay Delta Calculate", "mywayDeltaCalc");
flush();	flush();
ob_flush();	ob_flush();

function abssort($a, $b) {	function abssort($a, $b) {
if ($a['timeDiff'] == $b['timeDiff']) {	if ($a['timeDiff'] == $b['timeDiff']) {
return 0;	return 0;
}	}
return (abs($a['timeDiff']) < abs($b['timeDiff'])) ? -1 : 1;	return (abs($a['timeDiff']) < abs($b['timeDiff'])) ? -1 : 1;
}	}

//collect all observation not in delta	//collect all observation not in delta
$query = "select * from myway_observations INNER JOIN myway_stops	$query = "select * from myway_observations INNER JOIN myway_stops
ON myway_observations.myway_stop=myway_stops.myway_stop INNER JOIN myway_routes	ON myway_observations.myway_stop=myway_stops.myway_stop INNER JOIN myway_routes
ON myway_observations.myway_route=myway_routes.myway_route	ON myway_observations.myway_route=myway_routes.myway_route
WHERE observation_id NOT IN	WHERE observation_id NOT IN
(	(
SELECT observation_id	SELECT observation_id
FROM myway_timingdeltas	FROM myway_timingdeltas
)";	)";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);