--- a/include/common-request.inc.php +++ b/include/common-request.inc.php @@ -1,48 +1,87 @@ <?php + +/* + * Copyright 2010,2011 Alexander Sadleir + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ if (isset($_REQUEST['firstLetter'])) { - $firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING); + $firstLetter = filter_var($_REQUEST['firstLetter'], FILTER_SANITIZE_STRING); } if (isset($_REQUEST['bysuburbs'])) { - $bysuburbs = true; + $bysuburbs = true; } if (isset($_REQUEST['bynumber'])) { - $bynumber = true; + $bynumber = true; } if (isset($_REQUEST['allstops'])) { - $allstops = true; + $allstops = true; } if (isset($_REQUEST['nearby'])) { - $nearby = true; + $nearby = true; +} +if (isset($_REQUEST['labs'])) { + $labs = true; } if (isset($_REQUEST['suburb'])) { - $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); + $suburb = $_REQUEST['suburb']; } -$pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT); -$lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); -$lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); -$max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT); +if (isset($_REQUEST['pageKey'])) { + $pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT); +} +if (isset($_REQUEST['lat'])) { + $lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); +} +if (isset($_REQUEST['lon'])) { + $lon = filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); +} +if (isset($_REQUEST['radius'])) { + $max_distance = filter_var($_REQUEST['radius'], FILTER_SANITIZE_NUMBER_INT); +} if (isset($_REQUEST['numberSeries'])) { - $numberSeries = filter_var($_REQUEST['numberSeries'], FILTER_SANITIZE_NUMBER_INT); + $numberSeries = filter_var($_REQUEST['numberSeries'], FILTER_SANITIZE_NUMBER_INT); } if (isset($_REQUEST['routeDestination'])) { - $routeDestination = urldecode(filter_var($_REQUEST['routeDestination'], FILTER_SANITIZE_ENCODED)); + $routeDestination = urldecode(filter_var($_REQUEST['routeDestination'], FILTER_SANITIZE_ENCODED)); +} +if (isset($_REQUEST['routename'])) { + $routename = urldecode(filter_var($_REQUEST['routename'], FILTER_SANITIZE_ENCODED)); } if (isset($_REQUEST['stopcode'])) { - $stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING); + $stopcode = filter_var($_REQUEST['stopcode'], FILTER_SANITIZE_STRING); } if (isset($_REQUEST['stopids'])) { - $stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING)); + $stopids = explode(",", filter_var($_REQUEST['stopids'], FILTER_SANITIZE_STRING)); +} +if (isset($_REQUEST['filterIncludeRoutes'])) { + $filterIncludeRoutes = explode(",", filter_var($_REQUEST['filterIncludeRoutes'], FILTER_SANITIZE_STRING)); +} +if (isset($_REQUEST['filterHasStop'])) { + $filterHasStop = filter_var($_REQUEST['filterHasStop'], FILTER_SANITIZE_STRING); } if (isset($_REQUEST['tripid'])) { - $tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_NUMBER_INT); + $tripid = filter_var($_REQUEST['tripid'], FILTER_SANITIZE_STRING); +} +if (isset($_REQUEST['routeid'])) { + $routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_STRING); +} +if (isset($_REQUEST['directionid'])) { + $directionid = filter_var($_REQUEST['directionid'], FILTER_SANITIZE_STRING); } if (isset($_REQUEST['stopid'])) { - $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT); -} -if (isset($_REQUEST['routeid'])) { - $routeid = filter_var($_REQUEST['routeid'], FILTER_SANITIZE_NUMBER_INT); + $stopid = filter_var($_REQUEST['stopid'], FILTER_SANITIZE_NUMBER_INT); } if (isset($_REQUEST['geolocate'])) { -$geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL); + $geolocate = filter_var($_REQUEST['geolocate'], FILTER_SANITIZE_URL); } -?> +