--- a/routeList.php +++ b/routeList.php @@ -1,5 +1,5 @@ <?php -include ('common.inc.php'); +include ('include/common.inc.php'); function navbar() { echo ' @@ -17,14 +17,16 @@ 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"; + 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 { + foreach ($suburbs as $suburb) { + if (startsWith($suburb, $_REQUEST['firstLetter'])) { + echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; } - } - else if (startsWith($suburb, $_REQUEST['firstLetter'])) { - echo '<li><a href="routeList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; } } echo '</ul>'; @@ -34,10 +36,16 @@ $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); $url = $APIurl . "/json/stopzonesearch?q=" . $suburb; include_header("Routes by Suburb", "routeList"); + trackEvent("Route Lists","Routes By Suburb", $suburb); } if ($_REQUEST['nearby']) { $url = $APIurl . "/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; - include_header("Routes Nearby", "routeList"); + include_header("Routes Nearby", "routeList", true, true); + timePlaceSettings(true); + if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") { + include_footer(); + die(); + } } $stops = json_decode(getPage($url)); $routes = Array();