gitphp 0.2.9.1 :: busui.git/commitdiff

Disable all database calls on feedback page

6 files changed: (show all)
.box (deleted)
Boxfile (new)
about.php
feedback.php
include/db/route-dao.inc.php
myway/myway_timeliness_reconcile.php

file:a/.box (deleted)

shared_writable_dirs:
- /labs/tiles
- /lib/staticmaplite/cache
php_extensions: [pgsql, pdo, pdo_pgsql, curl]

file:b/Boxfile (new)

	web1:
	php_extensions:
	- pgsql
	- pdo
	- pdo_pgsql
	- curl

file:a/about.php -> file:b/about.php

file:a/feedback.php -> file:b/feedback.php

file:a/include/db/route-dao.inc.php -> file:b/include/db/route-dao.inc.php

<?php	<?php

/*	/*
* Copyright 2010,2011 Alexander Sadleir	* 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 not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	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.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/

function getRoute($routeID) {	function getRoute($routeID) {
global $conn;	global $conn;
$query = "Select * from routes where route_id = :routeID LIMIT 1";	$query = "Select * from routes where route_id = :routeID LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}
function getRoutesByShortName($routeShortName) {	function getRoutesByShortName($routeShortName) {
global $conn;	global $conn;
$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";	$query = "Select distinct route_id, route_short_name from routes where route_short_name = :routeShortName";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeShortName", $routeShortName);	$query->bindParam(":routeShortName", $routeShortName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteHeadsigns($routeID) {	function getRouteHeadsigns($routeID) {
global $conn;	global $conn;
$query = "select distinct trip_headsign,direction_id from routes join trips on trips.route_id = routes.route_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 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");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteByFullName($routeFullName) {	function getRouteByFullName($routeFullName) {
global $conn;	global $conn;
$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";	$query = "Select * from routes where route_short_name\|\|route_long_name = :routeFullName LIMIT 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":routeFullName", $routeFullName);	$query->bindParam(":routeFullName", $routeFullName);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetch(PDO :: FETCH_ASSOC);	return $query->fetch(PDO :: FETCH_ASSOC);
}	}

function getRoutes() {	function getRoutes() {
global $conn;	global $conn;
$query = "Select * from routes order by route_short_name;";	$query = "Select * from routes order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByNumber($routeNumber = "") {	function getRoutesByNumber($routeNumber = "") {
global $conn;	global $conn;
if ($routeNumber != "") {	if ($routeNumber != "") {
$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =	$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
routes.route_id join stop_times on stop_times.trip_id = trips.trip_id	routes.route_id join stop_times on stop_times.trip_id = trips.trip_id
where route_short_name = :routeNumber OR route_short_name LIKE :routeNumber2 order by route_short_name;";	where route_short_name = :routeNumber OR route_short_name LIKE :routeNumber2 order by route_short_name;";
} else {	} else {
$query = "SELECT DISTINCT route_short_name from routes order by route_short_name";	$query = "SELECT DISTINCT route_short_name from routes order by route_short_name";
}	}
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
if ($routeNumber != "") {	if ($routeNumber != "") {
$query->bindParam(":routeNumber", $routeNumber);	$query->bindParam(":routeNumber", $routeNumber);
$routeNumber2 = "% " . $routeNumber;	$routeNumber2 = "% " . $routeNumber;
$query->bindParam(":routeNumber2", $routeNumber2);	$query->bindParam(":routeNumber2", $routeNumber2);
}	}
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRoutesByNumberSeries($routeNumberSeries = "") {	function getRoutesByNumberSeries($routeNumberSeries = "") {
global $conn;	global $conn;
if (strlen($routeNumberSeries) == 1) {	if (strlen($routeNumberSeries) == 1) {
return getRoutesByNumber($routeNumberSeries);	return getRoutesByNumber($routeNumberSeries);
}	}
$seriesMin = substr($routeNumberSeries, 0, -1) . "0";	$seriesMin = substr($routeNumberSeries, 0, -1) . "0";
$seriesMax = substr($routeNumberSeries, 0, -1) . "9";	$seriesMax = substr($routeNumberSeries, 0, -1) . "9";
$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =	$query = "Select distinct routes.route_id,routes.route_short_name,routes.route_long_name,service_id from routes join trips on trips.route_id =
routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";	routes.route_id join stop_times on stop_times.trip_id = trips.trip_id where to_number(route_short_name, 'FM999') between :seriesMin and :seriesMax OR route_short_name LIKE :routeNumberSeries order by route_short_name;";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":seriesMin", $seriesMin);	$query->bindParam(":seriesMin", $seriesMin);
$query->bindParam(":seriesMax", $seriesMax);	$query->bindParam(":seriesMax", $seriesMax);
$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";	$routeNumberSeries = "% " . substr($routeNumberSeries, 0, -1) . "%";
$query->bindParam(":routeNumberSeries", $routeNumberSeries);	$query->bindParam(":routeNumberSeries", $routeNumberSeries);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
return $query->fetchAll();	return $query->fetchAll();
}	}

function getRouteNextTrip($routeID) {	function getRouteNextTrip($routeID) {
global $conn;	global $conn;
$query = "select * from routes join trips on trips.route_id = routes.route_id	$query = "select * from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where	join stop_times on stop_times.trip_id = trips.trip_id where
arrival_time > :currentTime and routes.route_id = :routeID order by	arrival_time > :currentTime and routes.route_id = :routeID order by
arrival_time limit 1";	arrival_time limit 1";
debug($query, "database");	debug($query, "database");
$query = $conn->prepare($query);	$query = $conn->prepare($query);
$query->bindParam(":currentTime", current_time());	$query->bindParam(":currentTime", current_time());
$query->bindParam(":routeID", $routeID);	$query->bindParam(":routeID", $routeID);
$query->execute();	$query->execute();
if (!$query) {	if (!$query) {
databaseError($conn->errorInfo());	databaseError($conn->errorInfo());
return Array();	return Array();
}	}
$r = $query->fetch(PDO :: FETCH_ASSOC);	$r = $query->fetch(PDO :: FETCH_ASSOC);

// past last trip of the day special case	// past last trip of the day special case
if (sizeof($r) < 16) {	if (sizeof($r) < 16) {
$query = "select * from routes join trips on trips.route_id = routes.route_id	$query = "select * from routes join trips on trips.route_id = routes.route_id
join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :routeID order by	join stop_times on stop_times.trip_id = trips.trip_id where routes.route_id = :route

<?php	<?php
include ("include/common.inc.php");	include ("include/common.inc.php");
	$GTFSREnabled = false;
include_header("Feedback", "feedback");	include_header("Feedback", "feedback");
function sendEmail($topic, $message)	function sendEmail($topic, $message)
{	{
$address = "maxious@lambdacomplex.org";	$address = "maxious@lambdacomplex.org";
if (file_exists("/tmp/aws.php")) {	if (file_exists("/tmp/aws.php")) {
include_once ("lib/ses.php");	include_once ("lib/ses.php");
include_once ("/tmp/aws.php");	include_once ("/tmp/aws.php");
$con = new SimpleEmailService($accessKey, $secretKey);	$con = new SimpleEmailService($accessKey, $secretKey);
//$con->verifyEmailAddress($address);	//$con->verifyEmailAddress($address);
//$con->listVerifiedEmailAddresses();	//$con->listVerifiedEmailAddresses();
$m = new SimpleEmailServiceMessage();	$m = new SimpleEmailServiceMessage();
$m->addTo($address);	$m->addTo($address);
$m->setFrom($address);	$m->setFrom($address);
$m->setSubject($topic);	$m->setSubject($topic);
$m->setMessageFromString($message);	$m->setMessageFromString($message);
$con->sendEmail($m);	$con->sendEmail($m);
}	}
else {	else {
// In case any of our lines are larger than 70 characters, we should use wordwrap()	// In case any of our lines are larger than 70 characters, we should use wordwrap()
$message = wordwrap($message, 70);	$message = wordwrap($message, 70);
// Send	// Send
mail($address, $topic, $message);	mail($address, $topic, $message);
}	}
}	}
if (isset($_REQUEST['feedback']) \|\| isset($_REQUEST['newlocation'])){	if (isset($_REQUEST['feedback']) \|\| isset($_REQUEST['newlocation'])){
sendEmail("bus.lambda feedback",print_r($_REQUEST,true));	sendEmail("bus.lambda feedback",print_r($_REQUEST,true));
echo "<h2 style='text-align: center;'>Thank you for your feedback!</h2>";	echo "<h2 style='text-align: center;'>Thank you for your feedback!</h2>";
} else {	} else {
$stopid = "";	$stopid = "";
$stopcode = "";	$stopcode = "";
$urlparts = explode("?",$_SERVER["HTTP_REFERER"]);	$urlparts = explode("?",$_SERVER["HTTP_REFERER"]);
if (isset($urlparts[1])) {	if (isset($urlparts[1])) {
$getparams = explode("&",$urlparts[1]);	$getparams = explode("&",$urlparts[1]);
foreach ($getparams as $param) {	foreach ($getparams as $param) {
$paramparts=explode("=",$param);	$paramparts=explode("=",$param);
if ($paramparts[0] == "stopid") $stopid = $paramparts[1];	if ($paramparts[0] == "stopid") $stopid = $paramparts[1];
if ($paramparts[0] == "stopcode") $stopcode = $paramparts[1];	if ($paramparts[0] == "stopcode") $stopcode = $paramparts[1];
}	}
}	}

?>	?>
<h3>Add/Move/Delete a Bus Stop Location</h3>	<h3>Add/Move/Delete a Bus Stop Location</h3>
<form action="feedback.php" method="post">	<form action="feedback.php" method="post">
StopID: <input type="text" name="stopid" value="<?php echo $stopid ?>"/><br>	StopID: <input type="text" name="stopid" value="<?php echo $stopid ?>"/><br>
or StopCode: <input type="text" name="stopcode" value="<?php echo $stopcode ?>"/><br>	or StopCode: <input type="text" name="stopcode" value="<?php echo $stopcode ?>"/><br>
<small> if you click on feedback from a stop page, these will get filled in automatically. else describe the location/street of the stop in one of these boxes </small><br>	<small> if you click on feedback from a stop page, these will get filled in automatically. else describe the location/street of the stop in one of these boxes </small><br>

Suggested Stop Location (lat/long or words): <input type="text" name="newlocation"/><br>	Suggested Stop Location (lat/long or words): <input type="text" name="newlocation"/><br>
<!--<small> if your device supports javascript, you can pick a location from the map above</small><br>-->	<!--<small> if your device supports javascript, you can pick a location from the map above</small><br>-->

<input type="submit" value="Submit!"/>	<input type="submit" value="Submit!"/>
</form>	</form>
<h3>Bug Report/Feedback</h3>	<h3>Bug Report/Feedback</h3>
Please leave feedback about bugs/errors or general suggestions about improvements that could be made to the way the data is presented!	Please leave feedback about bugs/errors or general suggestions about improvements that could be made to the way the data is presented!
<form action="feedback.php" method="post">	<form action="feedback.php" method="post">
<textarea name="feedback">	<textarea name="feedback">
</textarea>	</textarea>
<textarea name="extrainfo" id="extrainfo">	<textarea name="extrainfo" id="extrainfo">
<?php	<?php
echo "Referrer URL: ".$_SERVER["HTTP_REFERER"];	echo "Referrer URL: ".$_SERVER["HTTP_REFERER"];
echo "\nCurrent page URL: ".curPageURL();	echo "\nCurrent page URL: ".curPageURL();
echo "\nUser Agent: ".$_SERVER["HTTP_USER_AGENT"];	echo "\nUser Agent: ".$_SERVER["HTTP_USER_AGENT"];
echo "\nUser host/IP: ".$_SERVER["HTTP_X_FORWARDED_FOR"]." ".$_SERVER["REMOTE_ADDR"];	echo "\nUser host/IP: ".$_SERVER["HTTP_X_FORWARDED_FOR"]." ".$_SERVER["REMOTE_ADDR"];
echo "\nServer host/IP: ".php_uname("n");	echo "\nServer host/IP: ".php_uname("n");
echo "\nCurrent date/time: ". date("c");	echo "\nCurrent date/time: ". date("c");
echo "\nCurrent code revision: ".exec("git rev-parse --short HEAD");	echo "\nCurrent code revision: ".exec("git rev-parse --short HEAD");
echo "\nCurrent timetables version: ".date("c",@filemtime('cbrfeed.zip'));	echo "\nCurrent timetables version: ".date("c",@filemtime('cbrfeed.zip'));
echo "\nDump of session: ".print_r($_SESSION,true);	echo "\nDump of session: ".print_r($_SESSION,true);
?>	?>
</textarea>	</textarea>

<input type="submit" value="Submit!"/>	<input type="submit" value="Submit!"/>
</form>	</form>
<?php	<?php
}	}
include_footer();	include_footer();
?>	?>

<?php	<?php
/*	/*
* Copyright 2010,2011 Alexander Sadleir	* 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 not use this file except in compliance with the License.
You may obtain a copy of the License at	You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0	http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software	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.	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and	See the License for the specific language governing permissions and
limitations under the License.	limitations under the License.
*/	*/
include ('include/common.inc.php');	include ('include/common.inc.php');
include_header("About", "about")	include_header("About", "about")
?>	?>
<p>	<p>
Busness Time - An ACT bus timetable webapp<br />	Busness Time - An ACT bus timetable webapp<br />
Based on the maxious-canberra-transit-feed (<a	Based on the maxious-canberra-transit-feed (<a
href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,	href="http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip">download</a>,
last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />	last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />
Source code for the <a	Source code for the <a
href="https://github.com/maxious/ACTBus-data">transit	href="https://github.com/maxious/ACTBus-data">transit
feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this	feed</a> and <a href="https://github.com/maxious/ACTBus-ui">this
site</a> available from github.<br />	site</a> available from github.<br />
Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />	Uses jQuery Mobile, PHP, PostgreSQL, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />
Suburb Geocoding Based on <A href="http://www.abs.gov.au/AUSSTATS/abs@.nsf/Lookup/1270.0.55.003Main+Features1July%202011?OpenDocument">Australian Bureau of Statistics data.</a><br />	Suburb Geocoding Based on <A href="http://www.abs.gov.au/AUSSTATS/abs@.nsf/Lookup/1270.0.55.003Main+Features1July%202011?OpenDocument">Australian Bureau of Statistics data.</a><br />
Street geocoding based on work by OpenStreetMap contributors<br>	Street geocoding based on work by OpenStreetMap contributors<br>
<br />	<br />
Feedback encouraged; contact maxious@lambdacomplex.org<br />	Feedback encouraged; contact maxious@lambdacomplex.org<br />
<br />	<br />
Some icons by Joseph Wain / glyphish.com<br />	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>	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>)	, <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 />	<br />