--- a/busui/stopList.php +++ b/busui/stopList.php @@ -1,8 +1,9 @@ <?php include('common.inc.php'); -include_header("Stops"); -echo' - <div data-role="navbar"> + +function navbar() { + echo' + <div data-role="navbar"> <ul> <li><a href="stopList.php">Timing Points</a></li> <li><a href="stopList.php?suburbs=yes">By Suburb</a></li> @@ -11,8 +12,12 @@ </ul> </div> '; + timePlaceSettings(); +} // By suburb if (isset($_REQUEST['suburbs'])) { + include_header("Stops by Suburb"); + navbar(); echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; foreach ($suburbs as $suburb) { echo '<li><a href="stopList.php?suburb='.urlencode($suburb).'">'.$suburb.'</a></li>'; @@ -20,6 +25,25 @@ echo '</ul>'; } else { // Timing Points / All stops + +if ($_REQUEST['allstops']) { + $url = $APIurl."/json/stops"; + include_header("All Stops"); + navbar(); +} else if ($_REQUEST['nearby']) { + $url = $APIurl."/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; +include_header("Nearby Stops"); + navbar(); + timePlaceSettings(); +} else if ($_REQUEST['suburb']) { + $url = $APIurl."/json/stopzonesearch?q=".filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); +include_header("Stops in ".ucwords(filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING))); + navbar(); +} else { + $url = $APIurl."/json/timingpoints"; + include_header("Timing Points / Major Stops"); + navbar(); +} echo '<div class="noscriptnav"> Go to letter: '; foreach(range('A','Z') as $letter) { @@ -30,10 +54,6 @@ $('.noscriptnav').hide(); </script>"; echo ' <ul data-role="listview" data-filter="true" data-inset="true" >'; -$url = $APIurl."/json/timingpoints"; -if ($_REQUEST['allstops']) $url = $APIurl."/json/stops"; -if ($_REQUEST['nearby']) $url = $APIurl."/json/neareststops?lat={$_REQUEST['lat']}&lon={$_REQUEST['lon']}&limit=15"; -if ($_REQUEST['suburb']) $url = $APIurl."/json/stopzonesearch?q={$_REQUEST['suburb']}"; $contents = json_decode(getPage($url)); debug(print_r($contents,true)); foreach ($contents as $key => $row) {