Code standards, fix base path at least for php includes and use single quotes more often
--- a/include/common-auth.inc.php
+++ b/include/common-auth.inc.php
@@ -1,33 +1,32 @@
<?php
-require $basePath.'lib/openid.php';
+
+require ROOT . '/../lib/openid.php';
$openid = new LightOpenID($_SERVER['HTTP_HOST']);
-
-function login()
-{
- global $openid;
- if(!$openid->mode) {
- $openid->required = array('contact/email');
- $openid->identity = 'https://www.google.com/accounts/o8/id';
- header('Location: ' . $openid->authUrl());
- }
- }
+
+function login() {
+ global $openid;
+ if (!$openid->mode) {
+ $openid->required = array('contact/email');
+ $openid->identity = 'https://www.google.com/accounts/o8/id';
+ header('Location: ' . $openid->authUrl());
+ }
+}
+
+function auth() {
+ if ($_SESSION['authed'] == true)
+ return true;
+ global $openid;
+
+ if ($openid->mode) {
+ $attr = $openid->getAttributes();
+ if ($attr['contact/email'] != 'maxious@gmail.com') {
+ die('Access Denied');
+ } else {
+ $_SESSION['authed'] = true;
+ }
+ } else {
+ login();
+ }
+}
-function auth()
-
-{
- if ($_SESSION['authed'] == true) return true;
- global $openid;
-
- if($openid->mode) {
- $attr = $openid->getAttributes();
- if ($attr["contact/email"] != "maxious@gmail.com") {
- die("Access Denied");
- } else {
- $_SESSION['authed'] = true;
- }
- } else {
- login();
- }
- }
-
--- a/include/common-db.inc.php
+++ b/include/common-db.inc.php
@@ -3,31 +3,31 @@
/*
* Copyright 2010,2011 Alexander Sadleir
- Licensed under the Apache License, Version 2.0 (the "License");
+ 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,
+ 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 (strstr(php_uname('n'),"actbus")) {
- $conn = new PDO("pgsql:dbname=transitdata;user=transitdata;password=transitdata;host=bus-main.lambdacomplex.org");
+if (strstr(php_uname('n'),'actbus')) {
+ $conn = new PDO('pgsql:dbname=transitdata;user=transitdata;password=transitdata;host=bus-main.lambdacomplex.org');
} else if (isDebugServer()) {
- $conn = new PDO("pgsql:dbname=transitdata;user=postgres;password=snmc;host=localhost");
+ $conn = new PDO('pgsql:dbname=transitdata;user=postgres;password=snmc;host=localhost');
} else {
- $conn = new PDO("pgsql:dbname=transitdata;user=transitdata;password=transitdata;host=localhost");
+ $conn = new PDO('pgsql:dbname=transitdata;user=transitdata;password=transitdata;host=localhost');
}
if (!$conn) {
- die("A database error occurred.\n");
+ die('A database error occurred.'.PHP_EOL);
}
function databaseError($errMsg) {
- if ($errMsg[1] != "") {
+ if ($errMsg[1] != '') {
die(print_r($errMsg,true));
}
}
--- a/include/common-geo.inc.php
+++ b/include/common-geo.inc.php
@@ -3,64 +3,66 @@
/*
* Copyright 2010,2011 Alexander Sadleir
- Licensed under the Apache License, Version 2.0 (the "License");
+ 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,
+ 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.
*/
// SELECT array_to_string(array(SELECT REPLACE(name_2006, ',', '\,') as name FROM suburbs order by name), ',')
-$suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla");
+$suburbs = explode(',', 'Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O\'Connor,O\'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla');
function staticmap($mapPoints, $collapsible = true, $twotone = false, $path = false, $numbered = false) {
- $markers = "";
+ $markers = '';
$height = 300;
$width = $height;
$index = 0;
if (sizeof($mapPoints) < 1)
- return "map error";
+ return 'map error';
if (sizeof($mapPoints) === 1) {
- $markers = "markers={$mapPoints[0][0]},{$mapPoints[0][1]}";
+ $markers = 'markers={$mapPoints[0][0]},{$mapPoints[0][1]}';
} else {
if (!$numbered) {
- $markers = "markers=";
+ $markers = 'markers=';
}
if ($path) {
- $markers.= "markers={$mapPoints[0][0]},{$mapPoints[0][1]}&path=";
+ $markers.= 'markers={$mapPoints[0][0]},{$mapPoints[0][1]}&path=';
}
foreach ($mapPoints as $index => $mapPoint) {
if ($twotone && $index == 0) {
- $markers = "markerd=color:red|".$mapPoint[0] . "," . $mapPoint[1]."&markers=";
+ $markers = 'markerd=color:red|' . $mapPoint[0] . ',' . $mapPoint[1] . '&markers=';
} else {
if ($numbered) {
$label = ($index > 9 ? 9 : $index);
- $markers.= "markers=label:$label|" . $mapPoint[0] . "," . $mapPoint[1];
+ $markers.= 'markers=label:' . $label . '|' . $mapPoint[0] . ',' . $mapPoint[1];
if ($index + 1 != sizeof($mapPoints)) {
- $markers.= "&";
+ $markers.= '&';
}
} else {
- $markers.= $mapPoint[0] . "," . $mapPoint[1];
+ $markers.= $mapPoint[0] . ',' . $mapPoint[1];
if ($index + 1 != sizeof($mapPoints)) {
- $markers.= "|";
+ $markers.= '|';
}
}
$index++;
}
}
}
- $output = "";
+ $output = '';
if ($collapsible)
$output.= '<div class="map" data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
- if (isIOSDevice()) $output.= '<img class="hiresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=2&sensor=true" width=' . $width . ' height=' . $height . ' alt="map of stop location">';
- else $output.= '<img class="lowresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=1&format=jpg&sensor=true" width=' . $width . ' height=' . $height . ' alt="map of stop location">';
-
+ if (isIOSDevice())
+ $output.= '<img class="hiresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=2&sensor=true" width=' . $width . ' height=' . $height . '" alt="map of stop location">';
+ else
+ $output.= '<img class="lowresmap" src="http://maps.googleapis.com/maps/api/staticmap?size=' . $width . 'x' . $height . '&' . $markers . '&scale=1&format=jpg&sensor=true" width=' . $width . ' height=' . $height . '" alt="map of stop location">';
+
if ($collapsible)
$output.= '</div>';
return $output;
@@ -82,7 +84,7 @@
if ($km < 1)
return floor($km * 1000);
else
- return round($km, 2) . "k";
+ return round($km, 2) . 'k';
}
else
return floor($km * 1000);
@@ -151,19 +153,19 @@
function geocode($query, $giveOptions) {
global $cloudmadeAPIkey;
- $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=" . urlencode($query) . "&bbox=-35.5,149.00,-35.15,149.1930&return_location=true&bbox_only=true";
+ $url = 'http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=' . urlencode($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];
+ return $contents->features[0]->centroid->coordinates[0] . ',' . $contents->features[0]->centroid->coordinates[1];
else
- return "";
+ return '';
}
function reverseGeocode($lat, $lng) {
global $cloudmadeAPIkey;
- $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?around=" . $lat . "," . $lng . "&distance=closest&object_type=road";
+ $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;
}
--- a/include/common-net.inc.php
+++ b/include/common-net.inc.php
@@ -3,43 +3,44 @@
/*
* Copyright 2010,2011 Alexander Sadleir
- Licensed under the Apache License, Version 2.0 (the "License");
+ 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,
+ 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.
*/
function getPage($url) {
- debug($url, "json");
+ debug($url, 'json');
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 45);
$page = curl_exec($ch);
if (curl_errno($ch)) {
- echo "<font color=red> Database temporarily unavailable: ";
- echo curl_errno($ch) . " " . curl_error($ch);
+ echo '<font color=red> Database temporarily unavailable: ';
+ echo curl_errno($ch) . ' ' . curl_error($ch);
if (isDebug()) {
echo $url;
}
- echo "</font><br>";
+ echo '</font><br>';
}
curl_close($ch);
- debug(print_r($page, true), "json");
+ debug(print_r($page, true), 'json');
return $page;
}
+
function curPageURL() {
- $isHTTPS = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on");
- $port = (isset($_SERVER["SERVER_PORT"]) && ((!$isHTTPS && $_SERVER["SERVER_PORT"] != "80") || ($isHTTPS && $_SERVER["SERVER_PORT"] != "443")));
- $port = ($port) ? ':' . $_SERVER["SERVER_PORT"] : '';
- $url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER["SERVER_NAME"] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);
+ $isHTTPS = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on');
+ $port = (isset($_SERVER['SERVER_PORT']) && ((!$isHTTPS && $_SERVER['SERVER_PORT'] != '80') || ($isHTTPS && $_SERVER['SERVER_PORT'] != '443')));
+ $port = ($port) ? ':' . $_SERVER['SERVER_PORT'] : '';
+ $url = ($isHTTPS ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $port . htmlentities(dirname($_SERVER['PHP_SELF']), ENT_QUOTES);
return $url;
}
--- a/include/common-session.inc.php
+++ b/include/common-session.inc.php
@@ -3,33 +3,33 @@
/*
* Copyright 2010,2011 Alexander Sadleir
- Licensed under the Apache License, Version 2.0 (the "License");
+ 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,
+ 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.
*/
// you have to open the session to be able to modify or remove it
session_start();
-if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != "Enter co-ordinates or address here") {
+if (isset($_REQUEST['geolocate']) && $_REQUEST['geolocate'] != 'Enter co-ordinates or address here') {
$geocoded = false;
if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
$_SESSION['lat'] = trim(filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
$_SESSION['lon'] = trim(filter_var($_REQUEST['lon'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION));
} else {
- if (startsWith($geolocate, "-")) {
- $locateparts = explode(",", $geolocate);
+ if (startsWith($geolocate, '-')) {
+ $locateparts = explode(',', $geolocate);
$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];
- } else if (strpos($geolocate, "(") !== false) {
- $geoParts = explode("(", $geolocate);
- $locateparts = explode(",", str_replace(")", "", $geoParts[1]));
+ } else if (strpos($geolocate, '(') !== false) {
+ $geoParts = explode('(', $geolocate);
+ $locateparts = explode(',', str_replace(')', '', $geoParts[1]));
$_SESSION['lat'] = $locateparts[0];
$_SESSION['lon'] = $locateparts[1];
} else {
@@ -40,8 +40,8 @@
$_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
$_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
} else {
- $_SESSION['lat'] = "";
- $_SESSION['lon'] = "";
+ $_SESSION['lat'] = '';
+ $_SESSION['lon'] = '';
}
}
}
@@ -55,16 +55,19 @@
// timeoutSession
$TIMEOUT_LIMIT = 60 * 5; // 5 minutes
if (isset($_SESSION['lastUpdated']) && $_SESSION['lastUpdated'] + $TIMEOUT_LIMIT < time()) {
- debug("Session timeout " . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . ">" . time(), "session");
+ debug('Session timeout ' . ($_SESSION['lastUpdated'] + $TIMEOUT_LIMIT) . '>' . time(), 'session');
session_destroy();
session_start();
}
-//debug(print_r($_SESSION, true) , "session");
-function current_time($time = "") {
- if (isset($_REQUEST['time'])) return $_REQUEST['time'];
- else if ($time != "") date("H:i:s",$time);
- else return date("H:i:s");
+//debug(print_r($_SESSION, true) , 'session');
+function current_time($time = '') {
+ if (isset($_REQUEST['time']))
+ return $_REQUEST['time'];
+ else if ($time != '')
+ date('H:i:s', $time);
+ else
+ return date('H:i:s');
}
--- a/include/common-transit.inc.php
+++ b/include/common-transit.inc.php
@@ -3,14 +3,14 @@
/*
* Copyright 2010,2011 Alexander Sadleir
- Licensed under the Apache License, Version 2.0 (the "License");
+ 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,
+ 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.
@@ -21,7 +21,7 @@
'weekday'
);
-function service_period($date = "") {
+function service_period($date = '') {
if (isset($_REQUEST['service_period'])) {
return $_REQUEST['service_period'];
@@ -31,7 +31,7 @@
if (isset($override['service_id'])) {
return strtolower($override['service_id']);
}
- $date = ($date != "" ? $date : time());
+ $date = ($date != '' ? $date : time());
$dow = date('w', $date);
switch ($dow) {
@@ -44,92 +44,92 @@
}
}
-function service_ids($service_period, $date = "") {
+function service_ids($service_period, $date = '') {
switch ($service_period) {
case 'sunday':
- return Array("Sunday", "Sunday");
+ return Array('Sunday', 'Sunday');
case 'saturday':
- return Array("Saturday", "Saturday");
+ return Array('Saturday', 'Saturday');
default:
- $date = ($date != "" ? $date : time());
+ $date = ($date != '' ? $date : time());
// school holidays
$ymd = date('Ymd', $date);
$dow = date('w', $date);
- if (intval($ymd) < "20120203" && $dow != 0 && $dow != 6) {
- return Array("Weekday-SchoolVacation", "Weekday-SchoolVacation");
+ if (intval($ymd) < '20120203' && $dow != 0 && $dow != 6) {
+ return Array('Weekday-SchoolVacation', 'Weekday-SchoolVacation');
} else {
- return Array("Weekday", "Weekday");
+ return Array('Weekday', 'Weekday');
}
}
}
function valid_service_ids() {
- return array_merge(service_ids(""), service_ids('saturday'), service_ids('sunday'));
-}
-
-function midnight_seconds($time = "") {
+ return array_merge(service_ids(''), service_ids('saturday'), service_ids('sunday'));
+}
+
+function midnight_seconds($time = '') {
// from http://www.perturb.org/display/Perlfunc__Seconds_Since_Midnight.html
- if ($time != "") {
- return (date("G", $time) * 3600) + (date("i", $time) * 60) + date("s", $time);
+ if ($time != '') {
+ return (date('G', $time) * 3600) + (date('i', $time) * 60) + date('s', $time);
}
if (isset($_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");
+ return (date('G', $time) * 3600) + (date('i', $time) * 60) + date('s', $time);
+ }
+ return (date('G') * 3600) + (date('i') * 60) + date('s');
}
function midnight_seconds_to_time($seconds) {
if ($seconds > 0) {
- $midnight = mktime(0, 0, 0, date("n"), date("j"), date("Y"));
- return date("h:ia", $midnight + $seconds);
+ $midnight = mktime(0, 0, 0, date('n'), date('j'), date('Y'));
+ return date('h:ia', $midnight + $seconds);
} else {
- return "";
+ return '';
}
}
if ($GTFSREnabled) {
$serviceAlertCause = Array(
- "UNKNOWN_CAUSE" => "Unknown cause",
- "OTHER_CAUSE" => "Other cause",
- "TECHNICAL_PROBLEM" => "Technical problem",
- "STRIKE" => "Strike",
- "DEMONSTRATION" => "Demonstration",
- "ACCIDENT" => "Accident",
- "HOLIDAY" => "Holiday",
- "WEATHER" => "Weather",
- "MAINTENANCE" => "Maintenance",
- "CONSTRUCTION" => "Construction",
- "POLICE_ACTIVITY" => "Police activity",
- "MEDICAL_EMERGENCY" => "Medical emergency"
+ 'UNKNOWN_CAUSE' => 'Unknown cause',
+ 'OTHER_CAUSE' => 'Other cause',
+ 'TECHNICAL_PROBLEM' => 'Technical problem',
+ 'STRIKE' => 'Strike',
+ 'DEMONSTRATION' => 'Demonstration',
+ 'ACCIDENT' => 'Accident',
+ 'HOLIDAY' => 'Holiday',
+ 'WEATHER' => 'Weather',
+ 'MAINTENANCE' => 'Maintenance',
+ 'CONSTRUCTION' => 'Construction',
+ 'POLICE_ACTIVITY' => 'Police activity',
+ 'MEDICAL_EMERGENCY' => 'Medical emergency'
);
$serviceAlertEffect = Array(
- "NO_SERVICE" => "No service",
- "REDUCED_SERVICE" => "Reduced service",
- "SIGNIFICANT_DELAYS" => "Significant delays",
- "DETOUR" => "Detour",
- "ADDITIONAL_SERVICE" => "Additional service",
- "MODIFIED_SERVICE" => "Modified service",
- "OTHER_EFFECT" => "Other effect",
- "UNKNOWN_EFFECT" => "Unknown effect",
- "STOP_MOVED" => "Stop moved");
-
- set_include_path(get_include_path() . PATH_SEPARATOR . ($basePath . "lib/Protobuf-PHP/library/DrSlump/"));
-
- include_once("Protobuf.php");
- include_once("Protobuf/Message.php");
- include_once("Protobuf/Registry.php");
- include_once("Protobuf/Descriptor.php");
- include_once("Protobuf/Field.php");
-
- include_once($basePath . "lib/Protobuf-PHP/gtfs-realtime.php");
- include_once("Protobuf/CodecInterface.php");
- include_once("Protobuf/Codec/PhpArray.php");
- include_once("Protobuf/Codec/Binary.php");
- include_once("Protobuf/Codec/Binary/Writer.php");
- include_once("Protobuf/Codec/Json.php");
-
- function getServiceAlerts($filter_class = "", $filter_id = "") {
+ 'NO_SERVICE' => 'No service',
+ 'REDUCED_SERVICE' => 'Reduced service',
+ 'SIGNIFICANT_DELAYS' => 'Significant delays',
+ 'DETOUR' => 'Detour',
+ 'ADDITIONAL_SERVICE' => 'Additional service',
+ 'MODIFIED_SERVICE' => 'Modified service',
+ 'OTHER_EFFECT' => 'Other effect',
+ 'UNKNOWN_EFFECT' => 'Unknown effect',
+ 'STOP_MOVED' => 'Stop moved');
+
+ set_include_path(get_include_path() . PATH_SEPARATOR . (ROOT. '/../lib/Protobuf-PHP/library/DrSlump/'));
+
+ include_once('Protobuf.php');
+ include_once('Protobuf/Message.php');
+ include_once('Protobuf/Registry.php');
+ include_once('Protobuf/Descriptor.php');
+ include_once('Protobuf/Field.php');
+
+ include_once(ROOT. '/../lib/Protobuf-PHP/gtfs-realtime.php');
+ include_once('Protobuf/CodecInterface.php');
+ include_once('Protobuf/Codec/PhpArray.php');
+ include_once('Protobuf/Codec/Binary.php');
+ include_once('Protobuf/Codec/Binary/Writer.php');
+ include_once('Protobuf/Codec/Json.php');
+
+ function getServiceAlerts($filter_class = '', $filter_id = '') {
/*
also need last modified epoch of client gtfs
@@ -176,16 +176,16 @@
$informed_count++;
$informed = Array();
$es = new transit_realtime\EntitySelector();
- if ($informedEntity['informed_class'] == "agency") {
+ if ($informedEntity['informed_class'] == 'agency') {
$es->setAgencyId($informedEntity['informed_id']);
}
- if ($informedEntity['informed_class'] == "stop") {
+ if ($informedEntity['informed_class'] == 'stop') {
$es->setStopId($informedEntity['informed_id']);
}
- if ($informedEntity['informed_class'] == "route") {
+ if ($informedEntity['informed_class'] == 'route') {
$es->setRouteId($informedEntity['informed_id']);
}
- if ($informedEntity['informed_class'] == "trip") {
+ if ($informedEntity['informed_class'] == 'trip') {
$td = new transit_realtime\TripDescriptor();
$td->setTripId($informedEntity['informed_id']);
$es->setTrip($td);
@@ -193,33 +193,33 @@
$alert->addInformedEntity($es);
}
}
- if ($current_alert['cause'] != "") {
- $alert->setCause(constant("transit_realtime\Alert\Cause::" . $current_alert['cause']));
- }
- if ($current_alert['effect'] != "") {
- $alert->setEffect(constant("transit_realtime\Alert\Effect::" . $current_alert['effect']));
- }
- if ($current_alert['url'] != "") {
+ if ($current_alert['cause'] != '') {
+ $alert->setCause(constant('transit_realtime\Alert\Cause::' . $current_alert['cause']));
+ }
+ if ($current_alert['effect'] != '') {
+ $alert->setEffect(constant('transit_realtime\Alert\Effect::' . $current_alert['effect']));
+ }
+ if ($current_alert['url'] != '') {
$tsUrl = new transit_realtime\TranslatedString();
$tUrl = new transit_realtime\TranslatedString\Translation();
$tUrl->setText($current_alert['url']);
- $tUrl->setLanguage("en");
+ $tUrl->setLanguage('en');
$tsUrl->addTranslation($tUrl);
$alert->setUrl($tsUrl);
}
- if ($current_alert['header'] != "") {
+ if ($current_alert['header'] != '') {
$tsHeaderText = new transit_realtime\TranslatedString();
$tHeaderText = new transit_realtime\TranslatedString\Translation();
$tHeaderText->setText($current_alert['header']);
- $tHeaderText->setLanguage("en");
+ $tHeaderText->setLanguage('en');
$tsHeaderText->addTranslation($tHeaderText);
$alert->setHeaderText($tsHeaderText);
}
- if ($current_alert['description'] != "") {
+ if ($current_alert['description'] != '') {
$tsDescriptionText = new transit_realtime\TranslatedString();
$tDescriptionText = new transit_realtime\TranslatedString\Translation();
$tDescriptionText->setText(trim($current_alert['description']));
- $tDescriptionText->setLanguage("en");
+ $tDescriptionText->setLanguage('en');
$tsDescriptionText->addTranslation($tDescriptionText);
$alert->setDescriptionText($tsDescriptionText);
}
@@ -237,7 +237,7 @@
return null;
}
- function getServiceAlertsAsArray($filter_class = "", $filter_id = "") {
+ function getServiceAlertsAsArray($filter_class = '', $filter_id = '') {
$alerts = getServiceAlerts($filter_class, $filter_id);
if ($alerts != null) {
@@ -249,23 +249,23 @@
}
}
- function getServiceAlertsAsBinary($filter_class = "", $filter_id = "") {
+ function getServiceAlertsAsBinary($filter_class = '', $filter_id = '') {
$codec = new DrSlump\Protobuf\Codec\Binary();
return $codec->encode(getServiceAlerts($filter_class, $filter_id));
}
- function getServiceAlertsAsJSON($filter_class = "", $filter_id = "") {
+ function getServiceAlertsAsJSON($filter_class = '', $filter_id = '') {
$codec = new DrSlump\Protobuf\Codec\Json();
return $codec->encode(getServiceAlerts($filter_class, $filter_id));
}
function getServiceAlertsByClass() {
$return = Array();
- $alerts = getServiceAlertsAsArray("", "");
+ $alerts = getServiceAlertsAsArray('', '');
foreach ($alerts['entities'] as $entity) {
foreach ($entity['informed'] as $informed) {
foreach ($informed as $key => $value) {
- if (strpos("_id", $key) > 0) {
+ if (strpos('_id', $key) > 0) {
$parts = explode($key);
$class = $parts[0];
$id = $value;
@@ -276,7 +276,7 @@
}
}
- function getTripUpdates($filter_class = "", $filter_id = "") {
+ function getTripUpdates($filter_class = '', $filter_id = '') {
$fm = new transit_realtime\FeedMessage();
$fh = new transit_realtime\FeedHeader();
$fh->setGtfsRealtimeVersion(1);
@@ -287,12 +287,12 @@
$stops = Array();
$routestrips = Array();
if (sizeof($informedEntities) > 0) {
- if ($informedEntity['informed_class'] == "stop" && $informed["x-action"] == "remove") {
+ if ($informedEntity['informed_class'] == 'stop' && $informed['x-action'] == 'remove') {
$stops[] = $informedEntity['informed_id'];
}
- if (($informedEntity['informed_class'] == "route" || $informedEntity['informed_class'] == "trip") && $informed["x-action"] == "patch") {
- $routestrips[] = Array("id" => $informedEntity['informed_id'],
- "type" => $informedEntity['informed_class']);
+ if (($informedEntity['informed_class'] == 'route' || $informedEntity['informed_class'] == 'trip') && $informed['x-action'] == 'patch') {
+ $routestrips[] = Array('id' => $informedEntity['informed_id'],
+ 'type' => $informedEntity['informed_class']);
}
}
foreach ($routestrips as $routetrip) {
@@ -301,9 +301,9 @@
$fe->setIsDeleted(false);
$tu = new transit_realtime\TripUpdate();
$td = new transit_realtime\TripDescriptor();
- if ($routetrip['type'] == "route") {
+ if ($routetrip['type'] == 'route') {
$td->setRouteId($routetrip['id']);
- } else if ($routetrip['type'] == "trip") {
+ } else if ($routetrip['type'] == 'trip') {
$td->setTripId($routetrip['id']);
}
$tu->setTrip($td);
@@ -320,17 +320,17 @@
return $fm;
}
- function getTripUpdatesAsArray($filter_class = "", $filter_id = "") {
+ function getTripUpdatesAsArray($filter_class = '', $filter_id = '') {
$codec = new DrSlump\Protobuf\Codec\PhpArray();
return $codec->encode(getTripUpdates($filter_class, $filter_id));
}
- function getTripUpdatesAsBinary($filter_class = "", $filter_id = "") {
+ function getTripUpdatesAsBinary($filter_class = '', $filter_id = '') {
$codec = new DrSlump\Protobuf\Codec\Binary();
return $codec->encode(getTripUpdates($filter_class, $filter_id));
}
- function getTripUpdatesAsJSON($filter_class = "", $filter_id = "") {
+ function getTripUpdatesAsJSON($filter_class = '', $filter_id = '') {
$codec = new DrSlump\Protobuf\Codec\Json();
return $codec->encode(getTripUpdates($filter_class, $filter_id));
}
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -3,14 +3,14 @@
/*
* Copyright 2010