--- a/feedback.php +++ b/feedback.php @@ -5,25 +5,11 @@ function sendEmail($topic, $message) { $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() $message = wordwrap($message, 70); // Send mail($address, $topic, $message); - } + } if (isset($_REQUEST['feedback']) || isset($_REQUEST['newlocation'])){ sendEmail("bus.lambda feedback",print_r($_REQUEST,true)); @@ -31,7 +17,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) { @@ -60,14 +46,14 @@ </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"]; echo "\nServer host/IP: ".php_uname("n"); echo "\nCurrent date/time: ". date("c"); 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('../busresources/cbrfeed.zip')); echo "\nDump of session: ".print_r($_SESSION,true); ?> </textarea>