More lax geolocation
--- a/common-template.inc.php
+++ b/common-template.inc.php
@@ -1,26 +1,28 @@
<?php
-function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false)
+function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false)
{
echo '
<!DOCTYPE html>
<html>
<head>
<title>' . $pageTitle . '</title>';
- if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />';
if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" />
<script type="text/javascript" src="js/jquery-1.5.js"></script>
<script type="text/javascript" src="js/jquery-mobile-1.0a3.js"></script>';
- else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" />
- <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.1.min.js"></script>
- <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js"></script>';
- if ($datepicker) echo '<script>
+ else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.css" />
+ <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.js"></script>
+ <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.js"></script>';
+ echo '
+<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />
+ <script>
//reset type=date inputs to text
$( document ).bind( "mobileinit", function(){
$.mobile.page.prototype.options.degradeInputs.date = true;
});
</script>
- <script src="js/jQuery.ui.datepicker.js"></script>';
-echo '<style type="text/css">
+ <script src="js/jQuery.ui.datepicker.js"></script>
+ <script src="js/jquery.ui.datepicker.mobile.js"></script>
+ <style type="text/css">
.ui-navbar {
width: 100%;
}
@@ -63,7 +65,12 @@
}
if (navigator.geolocation) {
- navigator.geolocation.getCurrentPosition(success, error);
+var options = {
+ enableHighAccuracy: false,
+ timeout: 60000,
+ maximumAge: 10000
+}
+ navigator.geolocation.getCurrentPosition(success, error, options);
}
</script> ";
@@ -146,4 +153,3 @@
</div></div>';
}
?>
-
--- a/common.inc.php
+++ b/common.inc.php
@@ -150,5 +150,33 @@
{
return str_replace(")", "</small>", str_replace("(", "<br><small>", $input));
}
+
+function sksort(&$array, $subkey="id", $sort_ascending=false) {
+
+ if (count($array))
+ $temp_array[key($array)] = array_shift($array);
+
+ foreach($array as $key => $val){
+ $offset = 0;
+ $found = false;
+ foreach($temp_array as $tmp_key => $tmp_val)
+ {
+ if(!$found and strtolower($val[$subkey]) > strtolower($tmp_val[$subkey]))
+ {
+ $temp_array = array_merge( (array)array_slice($temp_array,0,$offset),
+ array($key => $val),
+ array_slice($temp_array,$offset)
+ );
+ $found = true;
+ }
+ $offset++;
+ }
+ if(!$found) $temp_array = array_merge($temp_array, array($key => $val));
+ }
+
+ if ($sort_ascending) $array = array_reverse($temp_array);
+
+ else $array = $temp_array;
+}
?>
Binary files a/css/images/113-navigation.png and b/css/images/113-navigation.png differ
--- a/css/jquery.ui.datepicker.mobile.css
+++ b/css/jquery.ui.datepicker.mobile.css
@@ -1,18 +1,30 @@
-div.hasDatepicker{display:block;padding:0;overflow:visible;margin:8px 0;}
-.ui-datepicker{overflow:visible;margin:0;max-width:500px;}
-.ui-datepicker .ui-datepicker-header{position:relative;padding:.4em 0;border-bottom:0;font-weight:bold;}
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next{padding:1px 0 1px 2px;position:absolute;top:.5em;margin-top:0;text-indent:-9999px;}
-.ui-datepicker .ui-datepicker-prev{left:6px;}
-.ui-datepicker .ui-datepicker-next{right:6px;}
-.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center;}
-.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0;}
-.ui-datepicker select.ui-datepicker-month-year{width:100%;}
-.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year{width:49%;}
-.ui-datepicker table{width:100%;border-collapse:collapse;margin:0;}
-.ui-datepicker td{border-width:1px;padding:0;text-align:center;}
-.ui-datepicker td span, .ui-datepicker td a{display:block;padding:.2em 0;font-weight:bold;margin:0;border-width:0;text-align:center;text-decoration:none;}
-.ui-datepicker-calendar th{padding-top:.3em;padding-bottom:.3em;}
-.ui-datepicker-calendar th span, .ui-datepicker-calendar span.ui-state-default{opacity:.3;}
-.ui-datepicker-calendar td a{padding-top:.5em;padding-bottom:.5em;}
-.min-width-480px div.hasDatepicker{width:63%;display:inline-block;margin:0;}
+/*
+ * jQuery UI Datepicker @VERSION
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+div.hasDatepicker{ display: block; padding: 0; overflow: visible; margin: 8px 0; }
+.ui-datepicker { overflow: visible; margin: 0; max-width: 500px; }
+.ui-datepicker .ui-datepicker-header { position:relative; padding:.4em 0; border-bottom: 0; font-weight: bold; }
+.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { padding: 1px 0 1px 2px; position:absolute; top: .5em; margin-top: 0; text-indent: -9999px; }
+.ui-datepicker .ui-datepicker-prev { left:6px; }
+.ui-datepicker .ui-datepicker-next { right:6px; }
+.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
+.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year { width: 49%;}
+.ui-datepicker table {width: 100%; border-collapse: collapse; margin:0; }
+.ui-datepicker td { border-width: 1px; padding: 0; text-align: center; }
+.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em 0; font-weight: bold; margin: 0; border-width: 0; text-align: center; text-decoration: none; }
+
+.ui-datepicker-calendar th { padding-top: .3em; padding-bottom: .3em; }
+.ui-datepicker-calendar th span, .ui-datepicker-calendar span.ui-state-default { opacity: .3; }
+.ui-datepicker-calendar td a { padding-top: .5em; padding-bottom: .5em; }
+
+.min-width-480px div.hasDatepicker { width: 63%; display: inline-block; margin: 0; }
--- a/index.php
+++ b/index.php
@@ -19,6 +19,7 @@
<li data-role="list-divider">Timetables - Routes</li>
<li><a href="routeList.php">Routes By Final Destination</a></li>
<li><a href="routeList.php?bynumber=yes">Routes By Number</a></li>
+ <li><a href="routeList.php?bysuburb=yes">Stops By Suburb</a></li>
<li><a class="nearby" href="routeList.php?nearby=yes">Nearby Routes</a></li>
</ul>
<?php
--- a/js/jQuery.ui.datepicker.js
+++ b/js/jQuery.ui.datepicker.js
@@ -95,62 +95,4 @@
"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));
return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new L;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.5";window["DP_jQuery_"+y]=d})(jQuery);
-;/*
-* jQuery Mobile Framework : temporary extension to port jQuery UI's datepicker for mobile
-* Copyright (c) jQuery Project
-* Dual licensed under the MIT or GPL Version 2 licenses.
-* http://jquery.org/license
-*/
-(function($, undefined ) {
-
- //cache previous datepicker ui method
- var prevDp = $.fn.datepicker;
-
- //rewrite datepicker
- $.fn.datepicker = function( options ){
-
- var dp = this;
-
- //call cached datepicker plugin
- prevDp.call( this, options );
-
- //extend with some dom manipulation to update the markup for jQM
- //call immediately
- function updateDatepicker(){
- $( ".ui-datepicker-header", dp ).addClass("ui-body-c ui-corner-top").removeClass("ui-corner-all");
- $( ".ui-datepicker-prev, .ui-datepicker-next", dp ).attr("href", "#");
- $( ".ui-datepicker-prev", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-l", shadow: true, corners: true});
- $( ".ui-datepicker-next", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-r", shadow: true, corners: true});
- $( ".ui-datepicker-calendar th", dp ).addClass("ui-bar-c");
- $( ".ui-datepicker-calendar td", dp ).addClass("ui-body-c");
- $( ".ui-datepicker-calendar a", dp ).buttonMarkup({corners: false, shadow: false});
- $( ".ui-datepicker-calendar a.ui-state-active", dp ).addClass("ui-btn-active"); // selected date
- $( ".ui-datepicker-calendar a.ui-state-highlight", dp ).addClass("ui-btn-up-e"); // today"s date
- $( ".ui-datepicker-calendar .ui-btn", dp ).each(function(){
- var el = $(this);
- // remove extra button markup - necessary for date value to be interpreted correctly
- el.html( el.find( ".ui-btn-text" ).text() );
- });
- };
-
- //update now
- updateDatepicker();
-
- // and on click
- $( dp ).click( updateDatepicker );
-
- //return jqm obj
- return this;
- };
-
- //bind to pagecreate to automatically enhance date inputs
- $( ".ui-page" ).live( "pagecreate", function(){
- $( "#date, input[type='date'], input[data-type='date']" ).each(function(){
- if ($(this).hasClass("hasDatepicker") == false) {
- $(this).after( $( "<div />" ).datepicker({ altField: "#" + $(this).attr( "id" ), showOtherMonths: true }) );
- $(this).addClass("hasDatepicker");
- }
- });
- });
-})( jQuery );
-
+;
--- /dev/null
+++ b/js/jquery.ui.datepicker.mobile.js
@@ -1,1 +1,59 @@
+/*
+* jQuery Mobile Framework : temporary extension to port jQuery UI's datepicker for mobile
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT or GPL Version 2 licenses.
+* http://jquery.org/license
+*/
+(function($, undefined ) {
+ //cache previous datepicker ui method
+ var prevDp = $.fn.datepicker;
+
+ //rewrite datepicker
+ $.fn.datepicker = function( options ){
+
+ var dp = this;
+
+ //call cached datepicker plugin
+ prevDp.call( this, options );
+
+ //extend with some dom manipulation to update the markup for jQM
+ //call immediately
+ function updateDatepicker(){
+ $( ".ui-datepicker-header", dp ).addClass("ui-body-c ui-corner-top").removeClass("ui-corner-all");
+ $( ".ui-datepicker-prev, .ui-datepicker-next", dp ).attr("href", "#");
+ $( ".ui-datepicker-prev", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-l", shadow: true, corners: true});
+ $( ".ui-datepicker-next", dp ).buttonMarkup({iconpos: "notext", icon: "arrow-r", shadow: true, corners: true});
+ $( ".ui-datepicker-calendar th", dp ).addClass("ui-bar-c");
+ $( ".ui-datepicker-calendar td", dp ).addClass("ui-body-c");
+ $( ".ui-datepicker-calendar a", dp ).buttonMarkup({corners: false, shadow: false});
+ $( ".ui-datepicker-calendar a.ui-state-active", dp ).addClass("ui-btn-active"); // selected date
+ $( ".ui-datepicker-calendar a.ui-state-highlight", dp ).addClass("ui-btn-up-e"); // today"s date
+ $( ".ui-datepicker-calendar .ui-btn", dp ).each(function(){
+ var el = $(this);
+ // remove extra button markup - necessary for date value to be interpreted correctly
+ el.html( el.find( ".ui-btn-text" ).text() );
+ });
+ };
+
+ //update now
+ updateDatepicker();
+
+ // and on click
+ $( dp ).click( updateDatepicker );
+
+ //return jqm obj
+ return this;
+ };
+
+ //bind to pagecreate to automatically enhance date inputs
+ $( ".ui-page" ).live( "pagecreate", function(){
+ $( "#date, input[type='date'], input[data-type='date']" ).each(function(){
+ if ($(this).hasClass("hasDatepicker") == false) {
+ $(this).after( $( "<div />" ).datepicker({ altField: "#" + $(this).attr( "id" ), showOtherMonths: true }) );
+ $(this).addClass("hasDatepicker");
+ }
+ });
+ });
+})( jQuery );
+
--- a/mywaybalance.php
+++ b/mywaybalance.php
@@ -1,6 +1,6 @@
<?php
include ('common.inc.php');
-include_header("MyWay Balance", "mywayBalance", true, false, true);
+include_header("MyWay Balance", "mywayBalance");
$return = Array();
function printBalance($cardNumber, $date, $pwrd)
{
@@ -61,4 +61,3 @@
}
include_footer();
?>
-
--- a/routeList.php
+++ b/routeList.php
@@ -1,7 +1,8 @@
<?php
include ('common.inc.php');
-include_header("Routes", "routeList");
-echo '
+function navbar()
+{
+ echo '
<div data-role="navbar">
<ul>
<li><a href="routeList.php">By Final Destination...</a></li>
@@ -11,16 +12,55 @@
</ul>
</div>
';
-echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/routes";
-$contents = json_decode(getPage($url));
-function printRoutes($routes)
-{
+}
+if ($_REQUEST['bysuburb']) {
+ include_header("Routes by Suburb", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ foreach ($suburbs as $suburb) {
+ if (!isset($_REQUEST['firstLetter'])) {
+ foreach (range('A', 'Z') as $letter) {
+ echo "<li><a href=\"routeList.php?firstLetter=$letter&bysuburb=yes\">$letter...</a></li>\n";
+ }
+ }
+ else if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>';
+ }
+ }
+ echo '</ul>';
+}
+else if ($_REQUEST['nearby'] || $_REQUEST['suburb']) {
+ if ($_REQUEST['suburb']) {
+ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ $url = $APIurl . "/json/stopzonesearch?q=" . $suburb;
+ include_header("Routes by Suburb", "routeList");
+ }
+ if ($_REQUEST['nearby']) {
+ $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15";
+ include_header("Routes Nearby", "routeList");
+ }
+ $stops = json_decode(getPage($url));
+ $routes = Array();
+ foreach ($stops as $stop) {
+ $url = $APIurl . "/json/stoproutes?stop=" . $stop[0];
+ $stoproutes = json_decode(getPage($url));
+ foreach ($stoproutes as $route) {
+ if (!isset($routes[$route[0]])) $routes[$route[0]] = $route;
+ }
+ }
+ navbar();
+ echo ' <ul data-role="listview" data-filter="true" data-inset="true" >';
+ sksort($routes, 1, true);
foreach ($routes as $row) {
- echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[4]) . ")</a></li>\n";
}
}
-if ($_REQUEST['bynumber']) {
+else if ($_REQUEST['bynumber']) {
+ include_header("Routes by Number", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
$routeSeries = Array();
$seriesRange = Array();
foreach ($contents as $key => $row) {
@@ -54,11 +94,19 @@
echo '<a name="' . $series . '"></a>';
if ($series <= 9) echo '<li>' . $series . "<ul>\n";
else echo "<li>{$seriesRange[$series]['min']}-{$seriesRange[$series]['max']}<ul>\n";
- printRoutes($routes);
+ foreach ($routes as $row) {
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ }
echo "</ul></li>\n";
}
}
else {
+ include_header("Routes by Destination", "routeList");
+ navbar();
+ echo ' <ul data-role="listview" data-inset="true">';
+ $url = $APIurl . "/json/routes";
+ $contents = json_decode(getPage($url));
+ // by destination!
foreach ($contents as $key => $row) {
$routeDestinations[$row[2]][] = $row;
}
@@ -73,7 +121,9 @@
foreach ($routeDestinations as $destination => $routes) {
echo '<a name="' . $destination . '"></a>';
echo '<li>' . $destination . "... <ul>\n";
- printRoutes($routes);
+ foreach ($routes as $row) {
+ echo '<li>' . $row[1] . ' <a href="trip.php?routeid=' . $row[0] . '">' . $row[2] . " (" . ucwords($row[3]) . ")</a></li>\n";
+ }
echo "</ul></li>\n";
}
}
--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -281,6 +281,23 @@
result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
result.sort(key = lambda x: x[1:3])
return result
+
+ def handle_json_GET_routesearch(self, params):
+ """Return a list of routes with matching short name."""
+ schedule = self.server.schedule
+ routeshortname = params.get('routeshortname', None)
+ result = []
+ for r in schedule.GetRouteList():
+ if r.route_short_name == routeshortname:
+ servicep = None
+ for t in schedule.GetTripList():
+ if t.route_id == r.route_id:
+ servicep = t.service_period
+ break
+ result.append( (r.route_id, r.route_short_name, r.route_long_name, servicep.service_id) )
+ result.sort(key = lambda x: x[1:3])
+ return result
+
def handle_json_GET_routerow(self, params):
schedule = self.server.schedule
@@ -477,8 +494,8 @@
result = {}
for trip in trips:
route = schedule.GetRoute(trip.route_id)
- if not trip.route_short_name+route.route_long_name in result:
- result[trip.route_short_name+route.route_long_name] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id)
+ if not route.route_short_name+route.route_long_name+trip.service_id in result:
+ result[route.route_short_name+route.route_long_name+trip.service_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id, trip.service_id)
return result
def handle_json_GET_stopalltrips(self, params):
@@ -509,6 +526,8 @@
if service_period == None or trip.service_id == service_period:
result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
return result
+
+
def handle_json_GET_stoptrips(self, params):
"""Given a stop_id and time in seconds since midnight return the next
--- a/trip.php
+++ b/trip.php
@@ -4,16 +4,17 @@
$stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT);
$routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT);
$routetrips = Array();
-if ($_REQUEST['routeid']) {
+if ($_REQUEST['routeid'] && !$_REQUEST['tripid']) {
+ $tripid = 0;
$url = $APIurl . "/json/routetrips?route_id=" . $routeid;
$routetrips = json_decode(getPage($url));
foreach ($routetrips as $trip) {
- if ($trip[0] < midnight_seconds()) {
+ if ($trip[0] > midnight_seconds()) {
$tripid = $trip[1];
break;
}
}
- if (!($tripid > 0)) $tripid = $routetrip[0][1];
+ if ($tripid == 0) $tripid = $routetrips[0][1];
}
$url = $APIurl . "/json/triprows?trip=" . $tripid;
$trips = array_flatten(json_decode(getPage($url)));
@@ -39,18 +40,30 @@
// Track the event
$owa->trackEvent($event);
}
-timePlaceSettings();
+$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
+$json = json_decode(getPage($url));
+$stops = $json[0];
+$times = $json[1];
+$viaPoints = Array();
+foreach ($stops as $stop) {
+ if (!startsWith($stop[5], "Wj")) {
+ $viaPoints[] = $stop[1];
+ }
+}
+echo 'Via: ' . implode(", ",$viaPoints) . '</small>';
echo '<p> Other Trips: ';
foreach ($routetrips as $othertrip) {
echo '<a href="trip.php?tripid=' . $othertrip[1] . "&routeid=" . $routeid . '">' . midnight_seconds_to_time($othertrip[0]) . '</a> ';
}
echo '</p> Other directions/timing periods: ';
+$url = $APIurl . "/json/routesearch?routeshortname=" . $trips[1]->route_short_name;
+$json = json_decode(getPage($url));
+foreach ($json as $row) {
+ if ($row[0] != $routeid) echo '<a href="trip.php?routeid=' . $row[0]. '">' . $row[2] . ' (' . ucwords($row[3]) . ')</a> ';
+}
+
echo ' <ul data-role="listview" data-inset="true">';
-$url = $APIurl . "/json/tripstoptimes?trip=" . $tripid;
-$json = json_decode(getPage($url));
-$stops = $json[0];
-$times = $json[1];
-echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . '</li>';
+echo '<li data-role="list-divider">' . midnight_seconds_to_time($times[0]) . '-' . midnight_seconds_to_time($times[sizeof($times) - 1]) . ' ' . $trips[1]->route_long_name .'</li>';
$stopsGrouped = Array();
foreach ($stops as $key => $row) {
if (($stops[$key][1] != $stops[$key + 1][1]) || $key + 1 >= sizeof($stops)) {
@@ -61,7 +74,7 @@
// subsequent duplicates
$stopsGrouped["stop_ids"][] = $row[0];
$stopsGrouped["endTime"] = $times[$key];
- 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">' . midnight_seconds_to_time($stopsGrouped['startTime']) . ' to ' . midnight_seconds_to_time($stopsGrouped['endTime']) . '</p>';
echo bracketsMeanNewLine($row[1]);
echo '</a></li>';
--- a/tripPlanner.php
+++ b/tripPlanner.php
@@ -1,6 +1,6 @@
<?php
include ('common.inc.php');
-include_header("Trip Planner", "tripPlanner", true, true, true);
+include_header("Trip Planner", "tripPlanner", true, true);
$from = (isset($_REQUEST['from']) ? filter_var($_REQUEST['from'], FILTER_SANITIZE_STRING) : "Brigalow");
$to = (isset($_REQUEST['to']) ? filter_var($_REQUEST['to'], FILTER_SANITIZE_STRING) : "Barry");
$date = (isset($_REQUEST['date']) ? filter_var($_REQUEST['date'], FILTER_SANITIZE_STRING) : date("m/d/Y"));
