From: maxious Date: Thu, 17 Feb 2011 13:22:21 +0000 Subject: Fix css issues X-Git-Url: http://maxious.lambdacomplex.org/git/?p=bus.git&a=commitdiff&h=451eb7887e50abf13e16a138afa7cbe818851c89 --- Fix css issues Place time/period/location adjuster on many views Sanitize more user input --- --- a/busui/common.inc.php +++ b/busui/common.inc.php @@ -1,13 +1,30 @@ centroid)) { + $session['lat'] = $contents[0]->centroid->coordinates[0]; + $session['lon'] = $contents[0]->centroid->coordinates[1]; + } + else { + $session['lat'] = ""; + $session['lon'] = ""; + } + } +//print_r ($_SESSION); function isDebug() { return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME']; @@ -21,10 +38,6 @@ } function include_header($pageTitle, $opendiv = true, $geolocate = false) { - // this starts the session - session_start(); - - // if (isDebug()) // set php error level high echo ' @@ -49,12 +62,16 @@ @@ -64,35 +81,12 @@ if ($geolocate) { echo ""; + } + echo ''; } $service_periods = Array ('sunday','saturday','weekday'); @@ -145,7 +147,7 @@ { // from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html if (isset($_SESSION['time'])) { - $time = mkdate($_SESSION['time']); + $time = strtotime($_SESSION['time']); return (date("G",$time) * 3600) + (date("i",$time) * 60) + date("s",$time); } return (date("G") * 3600) + (date("i") * 60) + date("s"); @@ -336,7 +338,8 @@ } function geocode($query, $giveOptions) { - $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?query=".$query."&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true"; + global $cloudmadeAPIkey; + $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=".$query."&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true"; $contents = json_decode(getPage($url)); if ($giveOptions) return $contents->features; elseif (isset($contents->features[0]->centroid)) return $contents->features[0]->centroid->coordinates[0].",".$contents->features[0]->centroid->coordinates[1]; @@ -344,7 +347,8 @@ } function reverseGeocode($lat,$lng) { - $url = "http://geocoding.cloudmade.com/daa03470bb8740298d4b10e3f03d63e6/geocoding/v2/find.js?around=".$lat.",".$lng."&distance=closest&object_type=road"; + global $cloudmadeAPIkey; + $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=".$lat.",".$lng."&distance=closest&object_type=road"; $contents = json_decode(getPage($url)); return $contents->features[0]->properties->name; } @@ -394,10 +398,21 @@ return implode(", ",$pointNames); } -function timePlaceSettings() { +function timePlaceSettings($geolocate = false) { global $service_periods; - echo '

+ $geoerror = false; + if ($geolocate == true) { + $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) + || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; + } + if ($geoerror) { + echo '

Sorry, but your location could not currently be detected. + Please allow location permission, wait for your location to be detected, + or enter an address/co-ordinates in the box below.

'; + } + echo '

Change Time/Place...

+

'; -echo " "; } ?> --- a/busui/index.php +++ b/busui/index.php @@ -1,20 +1,11 @@

-

- busness time

+

busness time

Canberra Bus Timetables and Trip Planner

Launch Trip Planner...

--- a/busui/routeList.php +++ b/busui/routeList.php @@ -6,7 +6,8 @@

'; --- a/busui/stop.php +++ b/busui/stop.php @@ -3,9 +3,9 @@ $url = $APIurl."/json/stop?stop_id=".$_REQUEST['stopid']; $stop = json_decode(getPage($url)); -include_header("Trips passing ".$stop[1]); +include_header($stop[1]); +timePlaceSettings(); echo '

'.staticmap(Array(0 => Array($stop[2],$stop[3]))).'

'; -// change date/time/service_period echo '

Timing Points
By Suburb

'.$suburb.'

Go to letter: '; foreach(range('A','Z') as $letter) { @@ -30,10 +54,6 @@ $('.noscriptnav').hide(); "; echo '

$errorMessage

I would like to go from @@ -86,17 +88,17 @@ } if ($_REQUEST['time']) { - $toPlace = (startsWith($_REQUEST['to'], "-") ? $_REQUEST['to'] : geocode(urlencode($_REQUEST['to']), false)); - $fromPlace = (startsWith($_REQUEST['from'], "-") ? $_REQUEST['from'] : geocode(urlencode($_REQUEST['from']), false)); + $toPlace = (startsWith($to, "-") ? $to : geocode($to, false)); + $fromPlace = (startsWith($from, "-") ? $from : geocode($from, false)); if ($toPlace == "" || $fromPlace == "") { $errorMessage = ""; if ($toPlace === "") - $errorMessage .= urlencode($_REQUEST['to']) . " not found.
\n"; + $errorMessage .= urlencode($to) . " not found.
\n"; if ($fromPlace === "") - $errorMessage .= urlencode($_REQUEST['from']) . " not found.
\n"; + $errorMessage .= urlencode($from) . " not found.
\n"; tripPlanForm($errorMessage); } else { - $url = "http://10.1.0.243:5080/opentripplanner-api-webapp/ws/plan?_dc=1290254798856&arriveBy=false&date=" . urlencode($_REQUEST['date']) . "&time=" . urlencode($_REQUEST['time']) . "&mode=TRANSIT%2CWALK&optimize=QUICK&maxWalkDistance=840&wheelchair=false&toPlace=$toPlace&fromPlace=$fromPlace&intermediatePlaces="; + $url = $otpAPIurl."ws/plan?date=" . urlencode($_REQUEST['date']) . "&time=" . urlencode($_REQUEST['time']) . "&mode=TRANSIT%2CWALK&optimize=QUICK&maxWalkDistance=840&wheelchair=false&toPlace=$toPlace&fromPlace=$fromPlace&intermediatePlaces="; $ch = curl_init($url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_HEADER, 0); --- a/maxious-canberra-transit-feed/cbrtable.yml.in.in +++ b/maxious-canberra-transit-feed/cbrtable.yml.in.in @@ -5,6 +5,7 @@ agency_name: ACT Internal Omnibus Network (ACTION) agency_url: http://www.action.act.gov.au/ agency_timezone: Australia/Sydney + agency_phone: 131710 + agency_lang: en -