Don't get referrer if undefined
--- a/.box
+++ /dev/null
@@ -1,5 +1,1 @@
-shared_writable_dirs:
- - /labs/tiles
- - /lib/staticmaplite/cache
-php_extensions: [pgsql, pdo, pdo_pgsql, curl]
--- /dev/null
+++ b/Boxfile
@@ -1,1 +1,7 @@
+web1:
+ php_extensions:
+ - pgsql
+ - pdo
+ - pdo_pgsql
+ - curl
--- a/about.php
+++ b/about.php
@@ -35,7 +35,8 @@
Some icons by Joseph Wain / glyphish.com<br />
Native clients also available for iPhone(<a href="http://itunes.apple.com/au/app/cbrtimetable/id444287349?mt=8">cbrTimetable by Sandor Kolotenko</a>
, <a href="http://itunes.apple.com/au/app/act-buses/id376634797?mt=8">ACT Buses by David Sullivan</a>)
- and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
+ , Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
+ and Windows Phone 7 (<a href="http://www.windowsphone.com/en-AU/apps/d840375e-429c-4aa4-a358-80eec6ea9e66">TransHub Canberra by Soul Solutions</a>)
<br />
GTFS-realtime API:
Alerts and Trip Updates (but only Cancelled or Stop Skipped)
--- a/feedback.php
+++ b/feedback.php
@@ -1,5 +1,6 @@
<?php
include ("include/common.inc.php");
+ $GTFSREnabled = false;
include_header("Feedback", "feedback");
function sendEmail($topic, $message)
{
@@ -30,7 +31,7 @@
} else {
$stopid = "";
$stopcode = "";
-$urlparts = explode("?",$_SERVER["HTTP_REFERER"]);
+if (isset($_SERVER["HTTP_REFERER"])) $urlparts = explode("?",$_SERVER["HTTP_REFERER"]);
if (isset($urlparts[1])) {
$getparams = explode("&",$urlparts[1]);
foreach ($getparams as $param) {
@@ -59,7 +60,7 @@
</textarea>
<textarea name="extrainfo" id="extrainfo">
<?php
- echo "Referrer URL: ".$_SERVER["HTTP_REFERER"];
+ echo "Referrer URL: ".($_SERVER["HTTP_REFERER"] ? $_SERVER["HTTP_REFERER"] : "");
echo "\nCurrent page URL: ".curPageURL();
echo "\nUser Agent: ".$_SERVER["HTTP_USER_AGENT"];
echo "\nUser host/IP: ".$_SERVER["HTTP_X_FORWARDED_FOR"]." ".$_SERVER["REMOTE_ADDR"];
--- a/include/common-template.inc.php
+++ b/include/common-template.inc.php
@@ -27,7 +27,7 @@
$url.= $GA_PIXEL . "?";
$url.= "utmac=" . $GA_ACCOUNT;
$url.= "&utmn=" . rand(0, 0x7fffffff);
- $referer = $_SERVER["HTTP_REFERER"];
+ $referer = (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "");
$query = $_SERVER["QUERY_STRING"];
$path = $_SERVER["REQUEST_URI"];
if (empty($referer)) {
@@ -169,6 +169,7 @@
</div><!-- /header -->
<a name="maincontent" id="maincontent"></a>
<div data-role="content"> ';
+ if ($GTFSREnabled) {
$overrides = getServiceOverride();
if ($overrides['service_id']) {
if ($overrides['service_id'] == "noservice") {
@@ -178,7 +179,6 @@
echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>';
}
}
- if ($GTFSREnabled) {
$serviceAlerts = getServiceAlertsAsArray("agency", "0");
if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) {
foreach ($serviceAlerts['entity'] as $entity) {
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -63,7 +63,9 @@
include_once ("common-geo.inc.php");
include_once ("common-net.inc.php");
include_once ("common-transit.inc.php");
-include_once ("common-db.inc.php");
+if (!strstr($_SERVER['PHP_SELF'], "feedback")) {
+ include_once ("common-db.inc.php");
+}
include_once ("common-request.inc.php");
include_once ("common-session.inc.php");
--- a/include/db/route-dao.inc.php
+++ b/include/db/route-dao.inc.php
@@ -45,8 +45,8 @@
function getRouteHeadsigns($routeID) {
global $conn;
- $query = "select distinct trip_headsign,direction_id from routes join trips on trips.route_id = routes.route_id
-join stop_times on stop_times.trip_id = trips.trip_id ";
+ $query = "select distinct stops.stop_name, trip_headsign,direction_id from routes join trips on trips.route_id = routes.route_id
+join stop_times on stop_times.trip_id = trips.trip_id join stops on stop_times.stop_id = stops.stop_id where trips.route_id = :routeID and stop_times.stop_sequence = 1";
debug($query, "database");
$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);
--- a/myway/myway_timeliness_reconcile.php
+++ b/myway/myway_timeliness_reconcile.php
@@ -19,12 +19,16 @@
foreach ($_REQUEST as $key => $value) {
if (strstr($key, "route") && !strstr($value, "Select")) {
$myway_route = str_replace("route", "", $key);
- $route_id = $value;
- $query = "update myway_routes set route_id = :route_id where myway_route = :myway_route";
+ $vparts = explode("-",$value);
+ $route_short_name = $vparts[0];
+ $trip_headsign = $vparts[1];
+ $query = "update myway_routes set route_short_name = :route_short_name, trip_headsign = :trip_headsign where myway_route = :myway_route";
debug($query, "database");
$query = $conn->prepare($query);
$query->bindParam(":myway_route", $myway_route, PDO::PARAM_STR, 5);
- $query->bindParam(":route_id", $route_id, PDO::PARAM_STR, 42);
+
+ $query->bindParam(":route_short_name", $route_short_name, PDO::PARAM_STR, 42);
+ $query->bindParam(":trip_headsign", $trip_headsign, PDO::PARAM_STR, 42);
$query->execute();
die(print_r($conn->errorInfo(), true));
}
@@ -132,8 +136,8 @@
<option>Select a from/to pair...</option>';
foreach (getRoutesByShortName($searchRouteNo) as $routeResult) {
foreach(getRouteHeadsigns($routeResult['route_id']) as $headsign ) {
- echo "<option value=\"{$routeResult['route_short_name']}{$routeResult['route_long_name']}\">
- {$routeResult['route_short_name']}{$routeResult['route_long_name']} {$headsign['trip_headsign']}</option>\n";
+ echo "<option value=\"{$routeResult['route_short_name']}-{$headsign['trip_headsign']}\">
+ {$routeResult['route_short_name']}{$routeResult['route_long_name']} - {$headsign['trip_headsign']} {$headsign['direction_id']} @ {$headsign['stop_name']} </option>\n";
}
}