--- a/stopList.php +++ b/stopList.php @@ -1,7 +1,8 @@ <?php include ('common.inc.php'); -function filterByFirstLetter($var) { - return $var[1][0] == $_REQUEST['firstLetter']; +function filterByFirstLetter($var) +{ + return $var[1][0] == $_REQUEST['firstLetter']; } function navbar() { @@ -21,14 +22,16 @@ include_header("Stops by Suburb", "stopList"); 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=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n"; + if (!isset($_REQUEST['firstLetter'])) { + foreach (range('A', 'Z') as $letter) { + echo "<li><a href=\"stopList.php?firstLetter=$letter&suburbs=yes\">$letter...</a></li>\n"; + } + } + else { + foreach ($suburbs as $suburb) { + if (startsWith($suburb, $_REQUEST['firstLetter'])) { + echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; } - } - else if (startsWith($suburb, $_REQUEST['firstLetter'])) { - echo '<li><a href="stopList.php?suburb=' . urlencode($suburb) . '">' . $suburb . '</a></li>'; } } echo '</ul>'; @@ -48,6 +51,10 @@ include_header("Nearby Stops", "stopList"); navbar(); timePlaceSettings(true); + if (!isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == "") { + include_footer(); + die(); + } } else if ($_REQUEST['suburb']) { $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); @@ -75,48 +82,47 @@ } // Sort the stops by name array_multisort($stopName, SORT_ASC, $stops); - if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])){ - $stops = array_filter($stops, "filterByFirstLetter"); - } + if (!isset($_REQUEST['suburb']) && !isset($_REQUEST['nearby'])) { + $stops = array_filter($stops, "filterByFirstLetter"); + } $stopsGrouped = Array(); foreach ($stops as $key => $row) { - if ((trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) { - if (sizeof($stopsGrouped) > 0) { - // print and empty grouped stops - // subsequent duplicates - $stopsGrouped["stop_ids"][] = $row[0]; - echo '<li>'; - - if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">'; - echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; - if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; - } - echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/","",$row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); - echo "</a></li>\n"; - $stopsGrouped = Array(); + if ((trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key + 1][1]))) || $key + 1 >= sizeof($stops)) { + if (sizeof($stopsGrouped) > 0) { + // print and empty grouped stops + // subsequent duplicates + $stopsGrouped["stop_ids"][] = $row[0]; + echo '<li>'; + if (!startsWith($stopsGrouped['stop_codes'][0], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point: " class="ui-li-icon">'; + echo '<a href="stop.php?stopids=' . implode(",", $stopsGrouped['stop_ids']) . '">'; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; } - else { - // just a normal stop - echo '<li>'; - if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">'; - echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">'; - if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { - echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; - } - echo bracketsMeanNewLine($row[1]); - echo "</a></li>\n"; + echo bracketsMeanNewLine(trim(preg_replace("/\(Platform.*/", "", $row[1])) . '(' . sizeof($stopsGrouped["stop_ids"]) . ' stops)'); + echo "</a></li>\n"; + $stopsGrouped = Array(); + } + else { + // just a normal stop + echo '<li>'; + if (!startsWith($row[5], "Wj")) echo '<img src="css/images/time.png" alt="Timing Point" class="ui-li-icon">'; + echo '<a href="stop.php?stopid=' . $row[0] . (startsWith($row[5], "Wj") ? '&stopcode=' . $row[5] : "") . '">'; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])) { + echo '<span class="ui-li-count">' . distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'], true) . 'm away</span>'; } - - } else { + echo bracketsMeanNewLine($row[1]); + echo "</a></li>\n"; + } + } + else { // this is a duplicated line item - if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/","",$stops[$key][1])) != trim(preg_replace("/\(Platform.*/","",$stops[$key - 1][1])))) { + if ($key - 1 <= 0 || (trim(preg_replace("/\(Platform.*/", "", $stops[$key][1])) != trim(preg_replace("/\(Platform.*/", "", $stops[$key - 1][1])))) { // first duplicate $stopsGrouped = Array( - "name" => trim(preg_replace("/\(Platform.*/","",$row[1])), + "name" => trim(preg_replace("/\(Platform.*/", "", $row[1])) , "stop_ids" => Array( $row[0] - ), + ) , "stop_codes" => Array( $row[5] ) @@ -127,8 +133,7 @@ $stopsGrouped["stop_ids"][] = $row[0]; } } - - } + } } echo '</ul>'; }