--- a/busui/trip.php +++ b/busui/trip.php @@ -1,11 +1,12 @@ <?php include('common.inc.php'); -$tripid = $_REQUEST['tripid']; +$tripid = filter_var($_REQUEST['tripid'],FILTER_SANITIZE_NUMBER_INT); +$stopid = filter_var($_REQUEST['stopid'],FILTER_SANITIZE_NUMBER_INT); if ($_REQUEST['routeid']) { - $url = $APIurl."/json/routetrips?route_id=".$_REQUEST['routeid']; + $url = $APIurl."/json/routetrips?route_id=".filter_var($_REQUEST['routeid'],FILTER_SANITIZE_NUMBER_INT); $trips = json_decode(getPage($url)); -debug(print_r($trips,true)); -foreach ($trips as $trip) + debug(print_r($trips,true)); + foreach ($trips as $trip) { if ($trip[0] < midnight_seconds()) { $tripid = $trip[1]; @@ -17,7 +18,23 @@ $url = $APIurl."/json/triprows?trip=".$tripid; $trips = array_flatten(json_decode(getPage($url))); debug(print_r($trips,true)); -include_header("Stops on ". $trips[1]->route_short_name . ' '. $trips[1]->route_long_name); +include_header("Stops on ". $trips[1]->route_short_name . ' '. $trips[1]->route_long_name,"trip"); +if (isMetricsOn()) { +// Create a new Instance of the tracker +$owa = new owa_php($config); +// Set the ID of the site being tracked +$owa->setSiteId('bus.lambdacomplex.org'); +// Create a new event object +$event = $owa->makeEvent(); +// Set the Event Type, in this case a "video_play" +$event->setEventType('view_trip'); +// Set a property +$event->set('trip_id',$tripid); +$event->set('route_id',$routeid); +// Track the event +$owa->trackEvent($event); + } +timePlaceSettings(); echo ' <ul data-role="listview" data-inset="true">'; @@ -30,7 +47,9 @@ foreach ($stops as $key => $row) { echo '<li>'; -echo '<h3><a href="stop.php?stopid='.$row[0].'">'.bracketsMeanNewLine($row[1]).'</a></h3>'; +echo '<h3><a href="stop.php?stopid='.$row[0].'">'.bracketsMeanNewLine($row[1]); +if ($row[0] == $stopid) echo "<br><small> Current Location</small>"; +echo '</a></h3>'; echo '<p class="ui-li-aside">'.midnight_seconds_to_time($times[$key]).'</p>'; echo '</li>'; }