From: maxious Date: Sun, 27 Feb 2011 06:10:08 +0000 Subject: Fix geolocation X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=64a65976f926d3e84f1c3f96b7267e87eedbe7df --- Fix geolocation Include Amazon email SES --- --- a/aws/awsStartup.sh +++ b/aws/awsStartup.sh @@ -5,6 +5,7 @@ #http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12 cp -rfv /tmp/busui/* /var/www +cp /root/aws.php /tmp/ chcon -h system_u:object_r:httpd_sys_content_t /var/www chcon -R -h root:object_r:httpd_sys_content_t /var/www/* chcon -R -t httpd_sys_content_rw_t /var/www/staticmaplite/cache --- a/common.inc.php +++ b/common.inc.php @@ -22,7 +22,7 @@ $_SESSION['lat'] = $_REQUEST['lat']; $_SESSION['lon'] = $_REQUEST['lon']; } else { - $contents = geocode(var_filter($_REQUEST['geolocate'],FILTER_SANITIZE_URL),true); + $contents = geocode(filter_var($_REQUEST['geolocate'],FILTER_SANITIZE_URL),true); if (isset($contents[0]->centroid)) { $_SESSION['lat'] = $contents[0]->centroid->coordinates[0]; $_SESSION['lon'] = $contents[0]->centroid->coordinates[1]; @@ -33,7 +33,7 @@ } } } -//print_r ($_SESSION); +debug(print_r($_SESSION,true)); function isDebug() { return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME']; @@ -48,7 +48,9 @@ if (isDebug()) echo "\n\n"; } function isFastDevice() { + $ua = $_SERVER['HTTP_USER_AGENT']; $fastDevices = Array("Mozilla/5.0 (X11;", "Mozilla/5.0 (Windows;", "Mozilla/5.0 (iP", "Mozilla/5.0 (Linux; U; Android", "Mozilla/4.0 (compatible; MSIE"); + $slowDevices = Array("J2ME","MIDP","Opera/","Mozilla/2.0 (compatible;","Mozilla/3.0 (compatible;"); return true; } @@ -105,7 +107,7 @@ function success(position) { $('#geolocate').val(position.coords.latitude+','+position.coords.longitude); -// setCookie('geolocate',position.coords.latitude+','+position.coords.longitude,1); +$.ajax({ url: \"common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude }); $('#here').click(function(event) { $('#geolocate').val(doAJAXrequestForGeolocSessionHere()); return false;}); $('#here').show(); } @@ -454,11 +456,11 @@
- +
- Current Time? + Current Time?
--- a/feedback.php +++ b/feedback.php @@ -1,6 +1,32 @@ verifyEmailAddress($address); +//$con->listVerifiedEmailAddresses(); + +$m = new SimpleEmailServiceMessage(); +$m->addTo($address); +$m->setFrom($address); +$m->setSubject($topic); +$m->setMessageFromString($message); +$con->sendEmail($m); +} else { +// In case any of our lines are larger than 70 characters, we should use wordwrap() +$message = wordwrap($message, 70); + +// Send +mail($address, $topic, $message); +} +} + + ?>

Add/Move/Delete a Bus Stop Location

StopID: @@ -8,7 +34,11 @@ Suggested Stop Location (lat/long or words): +Submit! +

Bug Report/Feedback

+ + +Submit! --- a/layar_api.php +++ b/layar_api.php @@ -26,7 +26,7 @@ $hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']); if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $_REQUEST['radius']) { $hotspot['actions'] = Array(Array("label" => 'View more trips/information', 'uri' => 'http://bus.lambdacomplex.org/'.'stop.php?stopid='.$row[0])); - $url = $APIurl."/json/stoptrips?stop=".$row[0]."&time=".midnight_seconds()."&service_period=".service_period(); + $url = $APIurl."/json/stoptrips?stop=".$row[0]."&time=".midnight_seconds()."&service_period=".service_period()."&limit=4"; $trips = json_decode(getPage($url)); debug(print_r($trips,true)); foreach ($trips as $key => $row) --- a/schedule_viewer.py +++ b/schedule_viewer.py @@ -428,6 +428,7 @@ schedule = self.server.schedule stop = schedule.GetStop(params.get('stop', None)) time = int(params.get('time', 0)) + limit = int(params.get('limit', 15)) service_period = params.get('service_period', None) time_trips = stop.GetStopTimeTrips(schedule) time_trips.sort() # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N) @@ -437,6 +438,8 @@ time_trips = time_trips[:15] result = [] for time, (trip, index), tp in time_trips: + if len(result) > limit: + break headsign = None # Find the most recent headsign from the StopTime objects for stoptime in trip.GetStopTimes()[index::-1]: --- /dev/null +++ b/ses.php @@ -1,1 +1,704 @@ - +__accessKey; } + public function getSecretKey() { return $this->__secretKey; } + public function getHost() { return $this->__host; } + + protected $__verifyHost = 1; + protected $__verifyPeer = 1; + + // verifyHost and verifyPeer determine whether curl verifies ssl certificates. + // It may be necessary to disable these checks on certain systems. + // These only have an effect if SSL is enabled. + public function verifyHost() { return $this->__verifyHost; } + public function enableVerifyHost($enable = true) { $this->__verifyHost = $enable; } + + public function verifyPeer() { return $this->__verifyPeer; } + public function enableVerifyPeer($enable = true) { $this->__verifyPeer = $enable; } + + /** + * Constructor + * + * @param string $accessKey Access key + * @param string $secretKey Secret key + * @return void + */ + public function __construct($accessKey = null, $secretKey = null, $host = 'email.us-east-1.amazonaws.com') { + if ($accessKey !== null && $secretKey !== null) { + $this->setAuth($accessKey, $secretKey); + } + $this->__host = $host; + } + + /** + * Set AWS access key and secret key + * + * @param string $accessKey Access key + * @param string $secretKey Secret key + * @return void + */ + public function setAuth($accessKey, $secretKey) { + $this->__accessKey = $accessKey; + $this->__secretKey = $secretKey; + } + + /** + * Lists the email addresses that have been verified and can be used as the 'From' address + * + * @return An array containing two items: a list of verified email addresses, and the request id. + */ + public function listVerifiedEmailAddresses() { + $rest = new SimpleEmailServiceRequest($this, 'GET'); + $rest->setParameter('Action', 'ListVerifiedEmailAddresses'); + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('listVerifiedEmailAddresses', $rest->error); + return false; + } + + $response = array(); + if(!isset($rest->body)) { + return $response; + } + + $addresses = array(); + foreach($rest->body->ListVerifiedEmailAddressesResult->VerifiedEmailAddresses->member as $address) { + $addresses[] = (string)$address; + } + + $response['Addresses'] = $addresses; + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + + return $response; + } + + /** + * Requests verification of the provided email address, so it can be used + * as the 'From' address when sending emails through SimpleEmailService. + * + * After submitting this request, you should receive a verification email + * from Amazon at the specified address containing instructions to follow. + * + * @param string email The email address to get verified + * @return The request id for this request. + */ + public function verifyEmailAddress($email) { + $rest = new SimpleEmailServiceRequest($this, 'POST'); + $rest->setParameter('Action', 'VerifyEmailAddress'); + $rest->setParameter('EmailAddress', $email); + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('verifyEmailAddress', $rest->error); + return false; + } + + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + return $response; + } + + /** + * Removes the specified email address from the list of verified addresses. + * + * @param string email The email address to remove + * @return The request id for this request. + */ + public function deleteVerifiedEmailAddress($email) { + $rest = new SimpleEmailServiceRequest($this, 'DELETE'); + $rest->setParameter('Action', 'DeleteVerifiedEmailAddress'); + $rest->setParameter('EmailAddress', $email); + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('deleteVerifiedEmailAddress', $rest->error); + return false; + } + + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + return $response; + } + + /** + * Retrieves information on the current activity limits for this account. + * See http://docs.amazonwebservices.com/ses/latest/APIReference/API_GetSendQuota.html + * + * @return An array containing information on this account's activity limits. + */ + public function getSendQuota() { + $rest = new SimpleEmailServiceRequest($this, 'GET'); + $rest->setParameter('Action', 'GetSendQuota'); + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('getSendQuota', $rest->error); + return false; + } + + $response = array(); + if(!isset($rest->body)) { + return $response; + } + + $response['Max24HourSend'] = (string)$rest->body->GetSendQuotaResult->Max24HourSend; + $response['MaxSendRate'] = (string)$rest->body->GetSendQuotaResult->MaxSendRate; + $response['SentLast24Hours'] = (string)$rest->body->GetSendQuotaResult->SentLast24Hours; + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + + return $response; + } + + /** + * Retrieves statistics for the last two weeks of activity on this account. + * See http://docs.amazonwebservices.com/ses/latest/APIReference/API_GetSendStatistics.html + * + * @return An array of activity statistics. Each array item covers a 15-minute period. + */ + public function getSendStatistics() { + $rest = new SimpleEmailServiceRequest($this, 'GET'); + $rest->setParameter('Action', 'GetSendStatistics'); + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('getSendStatistics', $rest->error); + return false; + } + + $response = array(); + if(!isset($rest->body)) { + return $response; + } + + $datapoints = array(); + foreach($rest->body->GetSendStatisticsResult->SendDataPoints->member as $datapoint) { + $p = array(); + $p['Bounces'] = (string)$datapoint->Bounces; + $p['Complaints'] = (string)$datapoint->Complaints; + $p['DeliveryAttempts'] = (string)$datapoint->DeliveryAttempts; + $p['Rejects'] = (string)$datapoint->Rejects; + $p['Timestamp'] = (string)$datapoint->Timestamp; + + $datapoints[] = $p; + } + + $response['SendDataPoints'] = $datapoints; + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + + return $response; + } + + + /** + * Given a SimpleEmailServiceMessage object, submits the message to the service for sending. + * + * @return An array containing the unique identifier for this message and a separate request id. + * Returns false if the provided message is missing any required fields. + */ + public function sendEmail($sesMessage) { + if(!$sesMessage->validate()) { + return false; + } + + $rest = new SimpleEmailServiceRequest($this, 'POST'); + $rest->setParameter('Action', 'SendEmail'); + + $i = 1; + foreach($sesMessage->to as $to) { + $rest->setParameter('Destination.ToAddresses.member.'.$i, $to); + $i++; + } + + if(is_array($sesMessage->cc)) { + $i = 1; + foreach($sesMessage->cc as $cc) { + $rest->setParameter('Destination.CcAddresses.member.'.$i, $cc); + $i++; + } + } + + if(is_array($sesMessage->bcc)) { + $i = 1; + foreach($sesMessage->bcc as $bcc) { + $rest->setParameter('Destination.BccAddresses.member.'.$i, $bcc); + $i++; + } + } + + if(is_array($sesMessage->replyto)) { + $i = 1; + foreach($sesMessage->replyto as $replyto) { + $rest->setParameter('ReplyToAddresses.member.'.$i, $replyto); + $i++; + } + } + + $rest->setParameter('Source', $sesMessage->from); + + if($sesMessage->returnpath != null) { + $rest->setParameter('ReturnPath', $sesMessage->returnpath); + } + + if($sesMessage->subject != null && strlen($sesMessage->subject) > 0) { + $rest->setParameter('Message.Subject.Data', $sesMessage->subject); + if($sesMessage->subjectCharset != null && strlen($sesMessage->subjectCharset) > 0) { + $rest->setParameter('Message.Subject.Charset', $sesMessage->subjectCharset); + } + } + + + if($sesMessage->messagetext != null && strlen($sesMessage->messagetext) > 0) { + $rest->setParameter('Message.Body.Text.Data', $sesMessage->messagetext); + if($sesMessage->messageTextCharset != null && strlen($sesMessage->messageTextCharset) > 0) { + $rest->setParameter('Message.Body.Text.Charset', $sesMessage->messageTextCharset); + } + } + + if($sesMessage->messagehtml != null && strlen($sesMessage->messagehtml) > 0) { + $rest->setParameter('Message.Body.Html.Data', $sesMessage->messagehtml); + if($sesMessage->messageHtmlCharset != null && strlen($sesMessage->messageHtmlCharset) > 0) { + $rest->setParameter('Message.Body.Html.Charset', $sesMessage->messageHtmlCharset); + } + } + + $rest = $rest->getResponse(); + if($rest->error === false && $rest->code !== 200) { + $rest->error = array('code' => $rest->code, 'message' => 'Unexpected HTTP status'); + } + if($rest->error !== false) { + $this->__triggerError('sendEmail', $rest->error); + return false; + } + + $response['MessageId'] = (string)$rest->body->SendEmailResult->MessageId; + $response['RequestId'] = (string)$rest->body->ResponseMetadata->RequestId; + return $response; + } + + /** + * Trigger an error message + * + * @internal Used by member functions to output errors + * @param array $error Array containing error information + * @return string + */ + public function __triggerError($functionname, $error) + { + if($error == false) { + trigger_error(sprintf("SimpleEmailService::%s(): Encountered an error, but no description given", $functionname), E_USER_WARNING); + } + else if(isset($error['curl']) && $error['curl']) + { + trigger_error(sprintf("SimpleEmailService::%s(): %s %s", $functionname, $error['code'], $error['message']), E_USER_WARNING); + } + else if(isset($error['Error'])) + { + $e = $error['Error']; + $message = sprintf("SimpleEmailService::%s(): %s - %s: %s\nRequest Id: %s\n", $functionname, $e['Type'], $e['Code'], $e['Message'], $error['RequestId']); + trigger_error($message, E_USER_WARNING); + } + } + + /** + * Callback handler for 503 retries. + * + * @internal Used by SimpleDBRequest to call the user-specified callback, if set + * @param $attempt The number of failed attempts so far + * @return The retry delay in microseconds, or 0 to stop retrying. + */ + public function __executeServiceTemporarilyUnavailableRetryDelay($attempt) + { + if(is_callable($this->__serviceUnavailableRetryDelayCallback)) { + $callback = $this->__serviceUnavailableRetryDelayCallback; + return $callback($attempt); + } + return 0; + } +} + +final class SimpleEmailServiceRequest +{ + private $ses, $verb, $parameters = array(); + public $response; + + /** + * Constructor + * + * @param string $ses The SimpleEmailService object making this request + * @param string $action action + * @param string $verb HTTP verb + * @return mixed + */ + function __construct($ses, $verb) { + $this->ses = $ses; + $this->verb = $verb; + $this->response = new STDClass; + $this->response->error = false; + } + + /** + * Set request parameter + * + * @param string $key Key + * @param string $value Value + * @param boolean $replace Whether to replace the key if it already exists (default true) + * @return void + */ + public function setParameter($key, $value, $replace = true) { + if(!$replace && isset($this->parameters[$key])) + { + $temp = (array)($this->parameters[$key]); + $temp[] = $value; + $this->parameters[$key] = $temp; + } + else + { + $this->parameters[$key] = $value; + } + } + + /** + * Get the response + * + * @return object | false + */ + public function getResponse() { + + $params = array(); + foreach ($this->parameters as $var => $value) + { + if(is_array($value)) + { + foreach($value as $v) + { + $params[] = $var.'='.$this->__customUrlEncode($v); + } + } + else + { + $params[] = $var.'='.$this->__customUrlEncode($value); + } + } + + sort($params, SORT_STRING); + + // must be in format 'Sun, 06 Nov 1994 08:49:37 GMT' + $date = gmdate('D, d M Y H:i:s e'); + + $query = implode('&', $params); + + $headers = array(); + $headers[] = 'Date: '.$date; + $headers[] = 'Host: '.$this->ses->getHost(); + + $auth = 'AWS3-HTTPS AWSAccessKeyId='.$this->ses->getAccessKey(); + $auth .= ',Algorithm=HmacSHA256,Signature='.$this->__getSignature($date); + $headers[] = 'X-Amzn-Authorization: '.$auth; + + $url = 'https://'.$this->ses->getHost().'/'; + + // Basic setup + $curl = curl_init(); + curl_setopt($curl, CURLOPT_USERAGENT, 'SimpleEmailService/php'); + + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, ($this->ses->verifyHost() ? 1 : 0)); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, ($this->ses->verifyPeer() ? 1 : 0)); + + // Request types + switch ($this->verb) { + case 'GET': + $url .= '?'.$query; + break; + case 'POST': + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb); + curl_setopt($curl, CURLOPT_POSTFIELDS, $query); + $headers[] = 'Content-Type: application/x-www-form-urlencoded'; + break; + case 'DELETE': + $url .= '?'.$query; + curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE'); + break; + default: break; + } + curl_setopt($curl, CURLOPT_HTTPHEADER, $headers); + curl_setopt($curl, CURLOPT_HEADER, false); + + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, false); + curl_setopt($curl, CURLOPT_WRITEFUNCTION, array(&$this, '__responseWriteCallback')); + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); + + // Execute, grab errors + if (curl_exec($curl)) { + $this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE); + } else { + $this->response->error = array( + 'curl' => true, + 'code' => curl_errno($curl), + 'message' => curl_error($curl), + 'resource' => $this->resource + ); + } + + @curl_close($curl); + + // Parse body into XML + if ($this->response->error === false && isset($this->response->body)) { + $this->response->body = simplexml_load_string($this->response->body); + + // Grab SES errors + if (!in_array($this->response->code, array(200, 201, 202, 204)) + && isset($this->response->body->Error)) { + $error = $this->response->body->Error; + $output = array(); + $output['curl'] = false; + $output['Error'] = array(); + $output['Error']['Type'] = (string)$error->Type; + $output['Error']['Code'] = (string)$error->Code; + $output['Error']['Message'] = (string)$error->Message; + $output['RequestId'] = (string)$this->response->body->RequestId; + + $this->response->error = $output; + unset($this->response->body); + } + } + + return $this->response; + } + + /** + * CURL write callback + * + * @param resource &$curl CURL resource + * @param string &$data Data + * @return integer + */ + private function __responseWriteCallback(&$curl, &$data) { + $this->response->body .= $data; + return strlen($data); + } + + /** + * Contributed by afx114 + * URL encode the parameters as per http://docs.amazonwebservices.com/AWSECommerceService/latest/DG/index.html?Query_QueryAuth.html + * PHP's rawurlencode() follows RFC 1738, not RFC 3986 as required by Amazon. The only difference is the tilde (~), so convert it back after rawurlencode + * See: http://www.morganney.com/blog/API/AWS-Product-Advertising-API-Requires-a-Signed-Request.php + * + * @param string $var String to encode + * @return string + */ + private function __customUrlEncode($var) { + return str_replace('%7E', '~', rawurlencode($var)); + } + + /** + * Generate the auth string using Hmac-SHA256 + * + * @internal Used by SimpleDBRequest::getResponse() + * @param string $string String to sign + * @return string + */ + private function __getSignature($string) { + return base64_encode(hash_hmac('sha256', $string, $this->ses->getSecretKey(), true)); + } +} + + +final class SimpleEmailServiceMessage { + + // these are public for convenience only + // these are not to be used outside of the SimpleEmailService class! + public $to, $cc, $bcc, $replyto; + public $from, $returnpath; + public $subject, $messagetext, $messagehtml; + public $subjectCharset, $messageTextCharset, $messageHtmlCharset; + + function __construct() { + $to = array(); + $cc = array(); + $bcc = array(); + $replyto = array(); + + $from = null; + $returnpath = null; + + $subject = null; + $messagetext = null; + $messagehtml = null; + + $subjectCharset = null; + $messageTextCharset = null; + $messageHtmlCharset = null; + } + + + /** + * addTo, addCC, addBCC, and addReplyTo have the following behavior: + * If a single address is passed, it is appended to the current list of addresses. + * If an array of addresses is passed, that array is merged into the current list. + */ + function addTo($to) { + if(!is_array($to)) { + $this->to[] = $to; + } + else { + $this->to = array_merge($this->to, $to); + } + } + + function addCC($cc) { + if(!is_array($cc)) { + $this->cc[] = $cc; + } + else { + $this->cc = array_merge($this->cc, $cc); + } + } + + function addBCC($bcc) { + if(!is_array($bcc)) { + $this->bcc[] = $bcc; + } + else { + $this->bcc = array_merge($this->bcc, $bcc); + } + } + + function addReplyTo($replyto) { + if(!is_array($replyto)) { + $this->replyto[] = $replyto; + } + else { + $this->replyto = array_merge($this->replyto, $replyto); + } + } + + function setFrom($from) { + $this->from = $from; + } + + function setReturnPath($returnpath) { + $this->returnpath = $returnpath; + } + + function setSubject($subject) { + $this->subject = $subject; + } + + function setSubjectCharset($charset) { + $this->subjectCharset = $charset; + } + + function setMessageFromString($text, $html = null) { + $this->messagetext = $text; + $this->messagehtml = $html; + } + + function setMessageFromFile($textfile, $htmlfile = null) { + if(file_exists($textfile) && is_file($textfile) && is_readable($textfile)) { + $this->messagetext = file_get_contents($textfile); + } + if(file_exists($htmlfile) && is_file($htmlfile) && is_readable($htmlfile)) { + $this->messagehtml = file_get_contents($htmlfile); + } + } + + function setMessageFromURL($texturl, $htmlurl = null) { + $this->messagetext = file_get_contents($texturl); + if($htmlurl !== null) { + $this->messagehtml = file_get_contents($htmlurl); + } + } + + function setMessageCharset($textCharset, $htmlCharset = null) { + $this->messageTextCharset = $textCharset; + $this->messageHtmlCharset = $htmlCharset; + } + + /** + * Validates whether the message object has sufficient information to submit a request to SES. + * This does not guarantee the message will arrive, nor that the request will succeed; + * instead, it makes sure that no required fields are missing. + * + * This is used internally before attempting a SendEmail or SendRawEmail request, + * but it can be used outside of this file if verification is desired. + * May be useful if e.g. the data is being populated from a form; developers can generally + * use this function to verify completeness instead of writing custom logic. + * + * @return boolean + */ + public function validate() { + if(count($this->to) == 0) + return false; + if($this->from == null || strlen($this->from) == 0) + return false; + if($this->messagetext == null) + return false; + return true; + } +} + --- a/stopList.php +++ b/stopList.php @@ -12,7 +12,6 @@
'; - timePlaceSettings(); } // By suburb if (isset($_REQUEST['suburbs'])) { @@ -30,11 +29,12 @@ $url = $APIurl."/json/stops"; include_header("All Stops","stopList"); navbar(); + timePlaceSettings(); } else if ($_REQUEST['nearby']) { $url = $APIurl."/json/neareststops?lat={$_SESSION['lat']}&lon={$_SESSION['lon']}&limit=15"; include_header("Nearby Stops","stopList"); navbar(); - timePlaceSettings(); + timePlaceSettings(true); } 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)),"stopList"); @@ -57,6 +57,7 @@ $url = $APIurl."/json/timingpoints"; include_header("Timing Points / Major Stops","stopList"); navbar(); + timePlaceSettings(); } echo '
Go to letter: '; foreach(range('A','Z') as $letter) @@ -84,7 +85,12 @@ echo ""; $firstletter = substr($row[1],0,1); } - echo '
  • '.bracketsMeanNewLine($row[1]).'
    • '; + echo '
  • '; + if (isset($_SESSION['lat']) && isset($_SESSION['lon'])){ + echo ''.floor(distance($row[2], $row[3], $_SESSION['lat'], $_SESSION['lon'])).'m away'; + } + echo bracketsMeanNewLine($row[1]); + echo '
    • '; } echo ''; }