Merge branch 'master' of ssh://apples.lambdacomplex.org/git/bus
[bus.git] / busui / trip.php
blob:a/busui/trip.php -> blob:b/busui/trip.php
--- 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];
@@ -18,6 +19,7 @@
 $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);
+timePlaceSettings();
 echo '  <ul data-role="listview"  data-inset="true">';
 
 
@@ -30,7 +32,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>';       
 }