gitphp 0.2.9.1 :: busui.git/commitdiff

Remove AWS SES from feedback email

2 files changed: (show all)
feedback.php
myway/myway_timeliness_stop.php

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

<?php	<?php
include ("include/common.inc.php");	include ("include/common.inc.php");
$GTFSREnabled = false;	$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")) {
include_once ("lib/ses.php");
include_once ("/tmp/aws.php");
$con = new SimpleEmailService($accessKey, $secretKey);
//$con->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()	// 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 = "";
if (isset($_SERVER["HTTP_REFERER"])) $urlparts = explode("?",$_SERVER["HTTP_REFERER"]);	if (isset($_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"] ? $_SERVER["HTTP_REFERER"] : "");	echo "Referrer URL: ".($_SERVER["HTTP_REFERER"] ? $_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('../busresources/cbrfeed.zip'));	echo "\nCurrent timetables version: ".date("c",@filemtime('../busresources/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();
?>	?>

file:a/myway/myway_timeliness_stop.php -> file:b/myway/myway_timeliness_stop.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.
*/	*/
include ('../include/common.inc.php');	include ('../include/common.inc.php');
include_header("MyWay Deltas", "mywayDelta");	include_header("MyWay Deltas", "mywayDelta");
?>	?>

<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../js/flot/excanvas.min.js"></script><![endif]-->

<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>	<script language="javascript" type="text/javascript" src="../js/flot/jquery.flot.js"></script>
<form method="get" action="">	<form method="get" action="">
<select id="stopid" name="stopid">	<select id="stopid" name="stopid">
<?php	<?php
$query = "select distinct myway_stop from myway_timingdeltas where myway_stop != '' order by myway_stop";	$query = "select distinct myway_stop from myway_timingdeltas where myway_stop != '' order by myway_stop";
$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();
}	}
foreach ($query->fetchAll() as $stop) {	foreach ($query->fetchAll() as $stop) {
echo "<option value=\"{$stop['myway_stop']}\">{$stop['myway_stop']}</option>";	echo "<option value=\"{$stop['myway_stop']}\">{$stop['myway_stop']}</option>";
};	};
?> </select> <center><div id="placeholder" style="width:900px;height:550px"></div></center>	?> </select> <center><div id="placeholder" style="width:900px;height:550px"></div></center>
<script type="text/javascript">	<script type="text/javascript">
$(function () {	$(function () {
var d = new Date();	var d = new Date();
d.setUTCMinutes(0);	d.setUTCMinutes(0);
d.setUTCHours(0);	d.setUTCHours(0);
var midnight = d.getTime();	var midnight = d.getTime();

var placeholder = $("#placeholder");	var placeholder = $("#placeholder");
var data = [];	var data = [];
var options = {	var options = {
xaxis: {	xaxis: {
mode: "time"	mode: "time"
},	},
yaxis: {	yaxis: {
tickFormatter: yformatter	tickFormatter: yformatter
},	},
grid: { hoverable: true, clickable: true, labelMargin: 32 },	grid: { hoverable: true, clickable: true, labelMargin: 32 },
series: {	series: {
lines: { show: false },	lines: { show: false },
points: { show: true }	points: { show: true }
}	}
};	};

var plot = $.plot(placeholder, data, options);	var plot = $.plot(placeholder, data, options);
var o;	var o;
o = plot.pointOffset({ x: midnight+ (96060*1000), y: -1.2});	o = plot.pointOffset({ x: midnight+ (96060*1000), y: -1.2});
placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">9am</div>');	placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">9am</div>');
o = plot.pointOffset({ x: midnight+ (166060*1000), y: -1.2});	o = plot.pointOffset({ x: midnight+ (166060*1000), y: -1.2});
placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">4pm</div>');	placeholder.append('<div style="position:absolute;left:' + (o.left + 4) + 'px;top:' + o.top + 'px;color:#666;font-size:smaller">4pm</div>');
// fetch one series, adding to what we got	// fetch one series, adding to what we got
var alreadyFetched = {};	var alreadyFetched = {};

$("#stopid").change(function () {	$("#stopid").change(function () {
var select = $(this);	var select = $(this);

// find the URL in the link right next to us	// find the URL in the link right next to us
// var dataurl = button.siblings('a').attr('href');	// var dataurl = button.siblings('a').attr('href');
var dataurl = "myway_timeliness_stop.json.php?stopid=" + select.val();	var dataurl = "myway_timeliness_stop.json.php?stopid=" + select.val();
// then fetch the data with jQuery	// then fetch the data with jQuery
function onDataReceived(series) {	function onDataReceived(series) {
// extract the first coordinate pair so you can see that
// data is now an ordinary Javascript object
var firstcoordinate = '(' + series.data[0][0] + ', ' + series.data[0][1] + ')';


// let's add it to our current data	// let's add it to our current data
if (!alreadyFetched[series.label]) {	if (!alreadyFetched[series.label]) {
alreadyFetched[series.label] = true;	alreadyFetched[series.label] = true;
data.push(series);	data.push(series);
}	}

// and plot all we got	// and plot all we got
$.plot(placeholder, data, options);	$.plot(placeholder, data, options);
}	}

$.ajax({	$.ajax({
url: dataurl,	url: dataurl,
method: 'GET',	method: 'GET',
dataType: 'json',	dataType: 'json',
success: onDataReceived	success: onDataReceived
});	});
});	});

});	});
function yformatter(v) {	function yformatter(v) {
if (Math.floor(v/60) < -9) return "";	if (Math.floor(v/60) < -9) return "";
return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))	return Math.abs(Math.floor(v/60)) + " min " + (v == 0 ? "" : (v >0 ? "early":"late"))
}	}
function showTooltip(x, y, contents) {	function showTooltip(x, y, contents) {
$('<div id="tooltip">' + contents + '</div>').css( {	$('<div id="tooltip">' + contents + '</div>').css( {
position: 'absolute',	position: 'absolute',
display: 'none',	display: 'none',
top: y + 5,	top: y + 5,
left: x + 5,	left: x + 5,
border: '1px solid #fdd',	border: '1px solid #fdd',
padding: '2px',	padding: '2px',
'background-color': '#fee',	'background-color': '#fee',
opacity: 0.80	opacity: 0.80
}).appendTo("body").fadeIn(200);	}).appendTo("body").fadeIn(200);
}	}

var previousPoint = null;	var previousPoint = null;
$("#placeholder").bind("plothover", function (event, pos, item) {	$("#placeholder").bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2));	$("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2));	$("#y").text(pos.y.toFixed(2));

if (item) {	if (item) {
if (previousPoint != item.dataIndex) {	if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex;	previousPoint = item.dataIndex;

$("#tooltip").remove();	$("#tooltip").remove();
var x = item.datapoint[0].toFixed(2),	var x = item.datapoint[0].toFixed(2),
y = item.datapoint[1].toFixed(2);	y = item.datapoint[1].toFixed(2);

var d = new Date();	var d = new Date();
d.setTime(x);	d.setTime(x);
var time = d.getUTCHours() +':'+ (d.getUTCMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getUTCMinutes())	var time = d.getUTCHours() +':'+ (d.getUTCMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getUTCMinutes())


showTooltip(item.pageX, item.pageY,	showTooltip(item.pageX, item.pageY,
item.series.label + " at "+ time +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));	item.series.label + " at "+ time +" = " + Math.abs(new Number(y/60).toFixed(2))+" minutes "+(y >0 ? "early":"late"));
}	}
}	}
else {	else {
$("#tooltip").remove();	$("#tooltip").remove();
previousPoint = null;	previousPoint = null;
}	}
});	});

</script>	</script>