--- a/trip.php +++ b/trip.php @@ -1,12 +1,9 @@ <?php include ('include/common.inc.php'); -$tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT); -$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT); -$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT); $routetrips = Array(); -if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) { +if (isset($routeid) && !isset($tripid)) { $trip = getRouteNextTrip($routeid); $tripid = $trip['trip_id']; } else { @@ -34,7 +31,7 @@ echo ' <ul data-role="listview" data-inset="true">'; $stopsGrouped = Array(); $tripStopTimes = getTimeInterpolatedTrip($tripid); -echo '<li data-role="list-divider">' . $tripStopTimes[0]['arrival_time'] . ' to ' . $tripStopTimes[sizeof($tripStopTimes) - 1]['arrival_time'] . ' ' . $trips[1]->route_long_name . '</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) { if (($tripStopTimes[$key]["stop_name"] != $tripStopTimes[$key + 1]["stop_name"]) || $key + 1 >= sizeof($tripStopTimes)) {