gitphp 0.2.9.1 :: busui.git/commitdiff

Add original route URL

2 files changed: (show all)
include/common-request.inc.php
trip.php

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

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

<?php	<?php
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);	$trip = getRouteNextTrip($routeid);
$tripid = $trip['trip_id'];	$tripid = $trip['trip_id'];
} else {	} else {
$trip = getTrip($tripid);	$trip = getTrip($tripid);
$routeid = $trip["route_id"];	$routeid = $trip["route_id"];
}	}

$routetrips = getRouteTrips($routeid);	$routetrips = getRouteTrips($routeid);

include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip");	include_header("Stops on " . $trip['route_short_name'] . ' ' . $trip['route_long_name'], "trip");
trackEvent("Route/Trip View","View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);	trackEvent("Route/Trip View","View Route", $trip['route_short_name'] . ' ' . $trip['route_long_name'], $routeid);

echo '<span id="leftcolumn">';	echo '<span id="leftcolumn">';
	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> ';
foreach (getRouteTrips($routeid) as $othertrip) {	foreach (getRouteTrips($routeid) as $othertrip) {
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> ';
}	}
flush(); @ob_flush();	flush(); @ob_flush();
echo '<h2>Other directions/timing periods:</h2> ';	echo '<h2>Other directions/timing periods:</h2> ';
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> ';	if ($row['route_id'] != $routeid) echo '<a href="trip.php?routeid=' . $row['route_id'] . '">' . $row['route_long_name'] . ' (' . ucwords($row['service_id']) . ')</a> ';
}	}
echo '</span><span id="rightcolumn">';	echo '</span><span id="rightcolumn">';
flush(); @ob_flush();	flush(); @ob_flush();
echo ' <ul data-role="listview" data-inset="true">';	echo ' <ul data-role="listview" data-inset="true">';
$stopsGrouped = Array();	$stopsGrouped = Array();
$tripStopTimes = getTimeInterpolatedTrip($tripid);	$tripStopTimes = getTimeInterpolatedTrip($tripid);
echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']).')</li>';	echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trip['route_long_name'] . ' (' . ucwords($tripStopTimes[0]['service_id']).')</li>';

foreach ($tripStopTimes as $key => $tripStopTime) {	foreach ($tripStopTimes as $key => $tripStopTime) {
if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) \|\| $key + 1 >= sizeof($tripStopTimes)) {	if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) \|\| $key + 1 >= sizeof($tripStopTimes)) {
echo '<li>';	echo '<li>';
if (!startsWith($tripStopTime['stop_code'], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';	if (!startsWith($tripStopTime['stop_code'], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">';
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 bracketsMeanNewLine($tripStopTime["stop_name"]);	echo bracketsMeanNewLine($tripStopTime["stop_name"]);
echo '</a></li>';	echo '</a></li>';
flush(); @ob_flush();	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 bracketsMeanNewLine($tripStopTime['stop_name']);	echo bracketsMeanNewLine($tripStopTime['stop_name']);
echo '</a></li>';	echo '</a></li>';
flush(); @ob_flush();	flush(); @ob_flush();
}	}
}	}
else {	else {
// this is a duplicated line item	// this is a duplicated line item
if ($key - 1 <= 0 \|\| ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {	if ($key - 1 <= 0 \|\| ($tripStopTimes[$key]['stop_name'] != $tripStopTimes[$key - 1]['stop_name'])) {
// first duplicate	// first duplicate
$stopsGrouped = Array(	$stopsGrouped = Array(
"name" => $tripStopTime['stop_name'],	"name" => $tripStopTime['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
if (isset($_REQUEST['firstLetter'])) {	if (isset($_REQUEST['firstLetter'])) {
$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);	$firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING);
}	}
if (isset($_REQUEST['bysuburbs'])) {	if (isset($_REQUEST['bysuburbs'])) {
$bysuburbs = true;	$bysuburbs = true;
}	}
if (isset($_REQUEST['bynumber'])) {	if (isset($_REQUEST['bynumber'])) {
$bynumber = true;	$bynumber = true;
}	}
if (isset($_REQUEST['allstops'])) {	if (isset($_REQUEST['allstops'])) {
$allstops = true;	$allstops = true;
}	}
if (isset($_REQUEST['nearby'])) {	if (isset($_REQUEST['nearby'])) {
$nearby = true;	$nearby = true;
}	}
if (isset($_REQUEST['suburb'])) {	if (isset($_REQUEST['suburb'])) {
$suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);	$suburb = $_REQUEST['suburb'];
}	}
$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);	$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT);
$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);	$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);	$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
$max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT);	$max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT);
if (isset($_REQUEST['numberSeries'])) {	if (isset($_REQUEST['numberSeries'])) {
$numberSeries = filter_var($_REQUEST['numberSeries'], FILTER_SANITIZE_NUMBER_INT);	$numberSeries = filter_var($_REQUEST['numberSeries'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['routeDestination'])) {	if (isset($_REQUEST['routeDestination'])) {
$routeDestination = urldecode(filter_var($_REQUEST['routeDestination'], FILTER_SANITIZE_ENCODED));	$routeDestination = urldecode(filter_var($_REQUEST['routeDestination'], FILTER_SANITIZE_ENCODED));
}	}
if (isset($_REQUEST['stopcode'])) {	if (isset($_REQUEST['stopcode'])) {
$stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);	$stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING);
}	}
if (isset($_REQUEST['stopids'])) {	if (isset($_REQUEST['stopids'])) {
$stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));	$stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING));
}	}
if (isset($_REQUEST['tripid'])) {	if (isset($_REQUEST['tripid'])) {
$tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT);	$tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['stopid'])) {	if (isset($_REQUEST['stopid'])) {
$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);	$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['routeid'])) {	if (isset($_REQUEST['routeid'])) {
$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);	$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
}	}
if (isset($_REQUEST['geolocate'])) {	if (isset($_REQUEST['geolocate'])) {
$geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);	$geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL);
}	}
?>	?>