--- a/stopList.php
+++ b/stopList.php
@@ -1,17 +1,13 @@
@@ -19,18 +15,18 @@
';
}
// By suburb
-if (isset($_REQUEST['suburbs'])) {
+if (isset($bysuburbs)) {
include_header("Stops by Suburb", "stopList");
navbar();
echo ' ';
- if (!isset($_REQUEST['firstLetter'])) {
+ if (!isset($firstLetter)) {
foreach (range('A', 'Z') as $letter) {
- echo "- $letter...
\n";
+ echo "- $letter...
\n";
}
}
else {
foreach ($suburbs as $suburb) {
- if (startsWith($suburb, $_REQUEST['firstLetter'])) {
+ if (startsWith($suburb, $firstLetter)) {
echo '- ' . $suburb . '
';
}
}
@@ -39,41 +35,39 @@
}
else {
// Timing Points / All stops
- if ($_REQUEST['allstops']) {
+ if (isset($allstops)) {
$listType = 'allstops=yes';
$stops = getStops();
include_header("All Stops", "stopList");
navbar();
timePlaceSettings();
}
- else if ($_REQUEST['nearby']) {
+ else if (isset($nearby)) {
$listType = 'nearby=yes';
include_header("Nearby Stops", "stopList", true, true);
- trackEvent("Stop Lists","Stops Nearby", $_SESSION['lat'].",".$_SESSION['lon']);
+ trackEvent("Stop Lists", "Stops Nearby", $_SESSION['lat'] . "," . $_SESSION['lon']);
navbar();
timePlaceSettings(true);
if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") {
include_footer();
die();
}
-
- $stops = getNearbyStops($_SESSION['lat'],$_SESSION['lon'],15);
+ $stops = getNearbyStops($_SESSION['lat'], $_SESSION['lon'], 15);
}
- else if ($_REQUEST['suburb']) {
- $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING);
+ else if (isset($suburb)) {
$stops = getStopsBySuburb($suburb);
include_header("Stops in " . ucwords($suburb) , "stopList");
navbar();
- trackEvent("Stop Lists","Stops By Suburb", $suburb);
+ trackEvent("Stop Lists", "Stops By Suburb", $suburb);
}
else {
- $stops = getStops(true,$_REQUEST['firstLetter']);
+ $stops = getStops(true, $firstLetter);
include_header("Timing Points / Major Stops", "stopList");
navbar();
timePlaceSettings();
}
echo ' ';
- if (!isset($_REQUEST['firstLetter']) && !$_REQUEST['suburb'] && !$_REQUEST['nearby']) {
+ if (!isset($firstLetter) && !isset($suburb) && !isset($nearby)) {
foreach (range('A', 'Z') as $letter) {
echo "- $letter...
\n";
}
@@ -91,11 +85,12 @@
if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '';
echo '';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $stop['stop_name'])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)');
echo "\n";
- flush(); @ob_flush();
+ flush();
+ @ob_flush();
$stopsGrouped = Array();
}
else {
@@ -104,11 +99,12 @@
if (!startsWith($stop['stop_code'], "Wj")) echo '';
echo '';
if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) {
- echo '' . distance($stop['stop_lat'],$stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
+ echo '' . distance($stop['stop_lat'], $stop['stop_lon'], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away';
}
echo bracketsMeanNewLine($stop['stop_name']);
echo "\n";
- flush(); @ob_flush();
+ flush();
+ @ob_flush();
}
}
else {