Add query to collate routes serviced at a stop
--- a/aws/awsStartup.sh
+++ b/aws/awsStartup.sh
@@ -5,6 +5,7 @@
#http://www.how2forge.org/installing-lighttpd-with-php5-and-mysql-support-on-fedora-12
cp -rfv /tmp/busui/* /var/www
+cp /root/aws.php /tmp/
chcon -h system_u:object_r:httpd_sys_content_t /var/www
chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
chcon -R -t httpd_sys_content_rw_t /var/www/staticmaplite/cache
--- a/aws/fastcgi.conf
+++ b/aws/fastcgi.conf
--- a/aws/modules.conf
+++ b/aws/modules.conf
--- a/aws/php.ini
+++ b/aws/php.ini
--- a/aws/rc.local
+++ b/aws/rc.local
--- a/common.inc.php
+++ b/common.inc.php
@@ -4,42 +4,75 @@
$cloudmadeAPIkey="daa03470bb8740298d4b10e3f03d63e6";
$googleMapsAPIkey="ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";
$otpAPIurl = 'http://localhost:8080/opentripplanner-api-webapp/';
-if (isDebug()) error_reporting(E_ALL ^ E_NOTICE);
+$owaSiteID = 'fe5b819fa8c424a99ff0764d955d23f3';
+//$debugOkay = Array("session","json","phperror","other");
+$debugOkay = Array("session","json","phperror");
+if (isDebug("phperror")) error_reporting(E_ALL ^ E_NOTICE);
// 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");
// you have to open the session to be able to modify or remove it
session_start();
- if (isset($_REQUEST['service_period'])) $_SESSION['service_period'] = filter_var($_REQUEST['service_period'],FILTER_SANITIZE_STRING);
- if (isset($_REQUEST['time'])) $_SESSION['time'] = filter_var($_REQUEST['time'],FILTER_SANITIZE_STRING);
+ if (isset($_REQUEST['service_period'])) {
+ $_SESSION['service_period'] = filter_var($_REQUEST['service_period'],FILTER_SANITIZE_STRING);
+ }
+ if (isset($_REQUEST['time'])) {
+ $_SESSION['time'] = filter_var($_REQUEST['time'],FILTER_SANITIZE_STRING);
+ }
if (isset($_REQUEST['geolocate'])) {
- $contents = geocode(var_filter($_REQUEST['geolocate'],FILTER_SANITIZE_URL),true);
+ $geocoded = false;
+ if (isset($_REQUEST['lat']) && isset($_REQUEST['lon'])) {
+ $_SESSION['lat'] = $_REQUEST['lat'];
+ $_SESSION['lon'] = $_REQUEST['lon'];
+ } else {
+ $contents = geocode(filter_var($_REQUEST['geolocate'],FILTER_SANITIZE_URL),true);
if (isset($contents[0]->centroid)) {
- $session['lat'] = $contents[0]->centroid->coordinates[0];
- $session['lon'] = $contents[0]->centroid->coordinates[1];
- }
- else {
- $session['lat'] = "";
- $session['lon'] = "";
+ $geocoded = true;
+ $_SESSION['lat'] = $contents[0]->centroid->coordinates[0];
+ $_SESSION['lon'] = $contents[0]->centroid->coordinates[1];
+ }
+ else {
+ $_SESSION['lat'] = "";
+ $_SESSION['lon'] = "";
+ }
+ }
+ if ($_SESSION['lat'] != "" && isMetricsOn()) {
+// Create a new Instance of the tracker
+$owa = new owa_php($config);
+// Set the ID of the site being tracked
+$owa->setSiteId($owaSiteID);
+// Create a new event object
+$event = $owa->makeEvent();
+// Set the Event Type, in this case a "video_play"
+$event->setEventType('geolocate');
+// Set a property
+$event->set('lat',$_SESSION['lat']);
+$event->set('lon',$_SESSION['lon']);
+$event->set('geocoded',$geocoded);
+// Track the event
+$owa->trackEvent($event);
}
}
-//print_r ($_SESSION);
-function isDebug()
-{
- return $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME'];
+debug(print_r($_SESSION,true));
+function isDebug($debugReason = "other")
+{
+ global $debugOkay;
+ return in_array($debugReason,$debugOkay,false) && $_SERVER['SERVER_NAME'] == "10.0.1.154" || $_SERVER['SERVER_NAME'] == "localhost" || $_SERVER['SERVER_NAME'] == "127.0.0.1" || !$_SERVER['SERVER_NAME'];
}
function isMetricsOn()
{
- return true;
-}
-
-function debug($msg) {
- if (isDebug()) echo "<!-- $msg -->";
+ return !isDebug();
+}
+
+function debug($msg, $debugReason = "other") {
+ if (isDebug($debugReason)) echo "\n<!-- ".date(DATE_RFC822)."\n $msg -->\n";
}
function isFastDevice() {
+ $ua = $_SERVER['HTTP_USER_AGENT'];
$fastDevices = Array("Mozilla/5.0 (X11;", "Mozilla/5.0 (Windows;", "Mozilla/5.0 (iP", "Mozilla/5.0 (Linux; U; Android", "Mozilla/4.0 (compatible; MSIE");
+
$slowDevices = Array("J2ME","MIDP","Opera/","Mozilla/2.0 (compatible;","Mozilla/3.0 (compatible;");
return true;
}
@@ -96,7 +129,7 @@
function success(position) {
$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);
-// setCookie('geolocate',position.coords.latitude+','+position.coords.longitude,1);
+$.ajax({ url: \"common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude });
$('#here').click(function(event) { $('#geolocate').val(doAJAXrequestForGeolocSessionHere()); return false;});
$('#here').show();
}
@@ -117,7 +150,8 @@
require_once('owa/owa_env.php');
require_once(OWA_DIR.'owa_php.php');
$owa = new owa_php();
- $owa->setSiteId('bus.lambdacomplex.org');
+ global $owaSiteID;
+ $owa->setSiteId($owaSiteID);
$owa->setPageTitle($pageTitle);
$owa->setPageType($pageType);
$owa->trackPageView();
@@ -199,7 +233,7 @@
curl_setopt( $ch, CURLOPT_HEADER, 0 );
curl_setopt($ch,CURLOPT_TIMEOUT,30);
$page = curl_exec($ch);
- if(curl_errno($ch)) echo "<font color=red> Database temporarily unavailable: ".curl_errno($ch)." ".curl_error($ch)."</font>";
+ if(curl_errno($ch)) echo "<font color=red> Database temporarily unavailable: ".curl_errno($ch)." ".curl_error($ch)."</font><br>";
curl_close($ch);
return $page;
}
@@ -212,7 +246,15 @@
return $f;
}
-function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb")
+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.dirname($_SERVER['PHP_SELF'])."/";
+return $url;
+}
+
+function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true)
{
$width = 300;
$height = 300;
@@ -236,7 +278,7 @@
if (sizeof($mapPoints) === 1) {
if ($zoom == 0) $zoom = 14;
$markers .= "{$mapPoints[0][0]},{$mapPoints[0][1]},$markerimage";
- $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
+ $center = "{$mapPoints[0][0]},{$mapPoints[0][1]}";
} else {
foreach ($mapPoints as $index => $mapPoint) {
$markers .= $mapPoint[0].",".$mapPoint[1].",".$markerImage.($index+1);
@@ -258,9 +300,9 @@
$center = $totalLat/sizeof($mapPoints).",".$totalLon/sizeof($mapPoints);
}
$output = "";
- if(basename($_SERVER['PHP_SELF']) != "tripPlanner.php") $output .= '<div data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
- $output .= '<center><img src="staticmaplite/staticmap.php?center='.$center.'&zoom='.$zoom.'&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width='.$width.' height='.$height.'></center>';
- if(basename($_SERVER['PHP_SELF']) != "tripPlanner.php") $output .= '</div>';
+ if ($collapsible) $output .= '<div data-role="collapsible" data-collapsed="true"><h3>Open Map...</h3>';
+ $output .= '<center><img src="'.curPageURL().'staticmaplite/staticmap.php?center='.$center.'&zoom='.$zoom.'&size='.$width.'x'.$height.'&maptype=mapnik&markers='.$markers.'" width='.$width.' height='.$height.'></center>';
+ if ($collapsible) $output .= '</div>';
return $output;
}
@@ -368,7 +410,7 @@
function geocode($query, $giveOptions) {
global $cloudmadeAPIkey;
- $url = "http://geocoding.cloudmade.com/$cloudmadeAPIkey/geocoding/v2/find.js?query=".$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];
@@ -445,11 +487,11 @@
<div class="ui-body">
<div data-role="fieldcontain">
<label for="geolocate"> Current Location: </label>
- <input type="text" id="geolocate" name="geolocate" value="Enter co-ordinates or address here"/> <a href="#" style="display:none" name="here" id="here"/>Here?</a>
+ <input type="text" id="geolocate" name="geolocate" value="'. (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] .",". $_SESSION['lon'] :"Enter co-ordinates or address here"). '"/> <a href="#" style="display:none" name="here" id="here"/>Here?</a>
</div>
<div data-role="fieldcontain">
<label for="time"> Time: </label>
- <input type="time" name="time" id="time" value="'. ($_SESSION['time'] ? $_SESSION['time'] : date("H:m")).'"/> <a href="#" name="currentTime" id="currentTime"/>Current Time?</a>
+ <input type="time" name="time" id="time" value="'. (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")).'"/> <a href="#" name="currentTime" id="currentTime"/>Current Time?</a>
</div>
<div data-role="fieldcontain">
<label for="service_period"> Service Period: </label>
@@ -466,5 +508,7 @@
</form>
</div></div>';
}
+
+
?>
Binary files a/css/images/ajax-loader.png and b/css/images/ajax-loader.png differ
Binary files a/css/images/form-check-off.png and b/css/images/form-check-off.png differ
Binary files a/css/images/form-check-on.png and b/css/images/form-check-on.png differ
Binary files a/css/images/form-radio-off.png and b/css/images/form-radio-off.png differ
Binary files a/css/images/form-radio-on.png and b/css/images/form-radio-on.png differ
Binary files a/css/images/icon-search-black.png and b/css/images/icon-search-black.png differ
Binary files a/css/images/icons-18-black.png and b/css/images/icons-18-black.png differ
Binary files a/css/images/icons-18-white.png and b/css/images/icons-18-white.png differ
Binary files a/css/images/icons-36-black.png and b/css/images/icons-36-black.png differ
Binary files a/css/images/icons-36-white.png and b/css/images/icons-36-white.png differ
--- a/css/jquery-mobile-1.0a3.css
+++ b/css/jquery-mobile-1.0a3.css
--- a/css/jquery.ui.datepicker.mobile.css
+++ b/css/jquery.ui.datepicker.mobile.css
--- a/feedback.php
+++ b/feedback.php
@@ -1,18 +1,54 @@
<?php
include('common.inc.php');
-include_header("Feedback","feedback")
+include_header("Feedback","feedback");
+function sendEmail($topic, $message) {
+ $address = "maxious@lambdacomplex.org";
+
+ if (file_exists("/tmp/aws.php") ) {
+ include_once('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);
+}
+}
+
+
?>
<h3>Add/Move/Delete a Bus Stop Location</h3>
StopID:
or StopCode:
+<small> if you click on feedback from a stop page, these will get filled in automatically. else describe the location/street of the stop <input type="text" name="stoplocation" /> </small>
Suggested Stop Location (lat/long or words):
+<small> if your device supports javascript, you can pick a location from the map above</small>
+
+Submit!
<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!
+<textarea id="feedback">
+</textarea>
<textarea id="extrainfo">
Referrer URL
User Agent
User host/IP
+ Server host/IP
Current date/time
Dump of $_SESSION
</textarea>
+
+Submit!
--- a/js/jQuery.ui.datepicker.js
+++ b/js/jQuery.ui.datepicker.js
--- a/js/jquery-1.5.js
+++ b/js/jquery-1.5.js
--- a/js/jquery-mobile-1.0a3.js
+++ b/js/jquery-mobile-1.0a3.js
--- a/js/jquery.effects.core.js
+++ b/js/jquery.effects.core.js
--- a/js/jquery.ui.autocomplete.js
+++ b/js/jquery.ui.autocomplete.js
--- a/js/jquery.ui.datepicker.mobile.js
+++ b/js/jquery.ui.datepicker.mobile.js
--- a/js/jquery.ui.position.js
+++ b/js/jquery.ui.position.js
--- a/js/jquery.ui.widget.js
+++ b/js/jquery.ui.widget.js
--- a/layar_api.php
+++ b/layar_api.php
@@ -26,7 +26,7 @@
$hotspot['distance'] = distance($row[2], $row[3], $_REQUEST['lat'], $_REQUEST['lon']);
if (!isset($_REQUEST['radius']) || $hotspot['distance'] < $_REQUEST['radius']) {
$hotspot['actions'] = Array(Array("label" => 'View more trips/information', 'uri' => 'http://bus.lambdacomplex.org/'.'stop.php?stopid='.$row[0]));
- $url = $APIurl."/json/stoptrips?stop=".$row[0]."&time=".midnight_seconds()."&service_period=".service_period();
+ $url = $APIurl."/json/stoptrips?stop=".$row[0]."&time=".midnight_seconds()."&service_period=".service_period()."&limit=4&time_range=".str(90*60);
$trips = json_decode(getPage($url));
debug(print_r($trips,true));
foreach ($trips as $key => $row)
--- a/schedule_viewer.py
+++ b/schedule_viewer.py
@@ -32,6 +32,7 @@
import simplejson
import socket
import time
+import datetime
import transitfeed
from transitfeed import util
import urllib
@@ -95,6 +96,8 @@
float(stop.stop_lon), stop.location_type, stop.stop_code, stop.zone_id)
class ScheduleRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+ cache = {}
+
def do_GET(self):
scheme, host, path, x, params, fragment = urlparse.urlparse(self.path)
parsed_params = {}
@@ -114,7 +117,7 @@
handler_name = 'handle_json_GET_%s' % m.group(1)
handler = getattr(self, handler_name, None)
if callable(handler):
- return self.handle_json_wrapper_GET(handler, parsed_params)
+ return self.handle_json_wrapper_GET(handler, parsed_params, handler_name)
# Restrict allowable file names to prevent relative path attacks etc
m = re.match(r'/file/([a-z0-9_-]{1,64}\.?[a-z0-9_-]{1,64})$', path)
@@ -243,11 +246,22 @@
patterns.sort()
return patterns
- def handle_json_wrapper_GET(self, handler, parsed_params):
+ def handle_json_wrapper_GET(self, handler, parsed_params, handler_name):
"""Call handler and output the return value in JSON."""
schedule = self.server.schedule
- result = handler(parsed_params)
- content = ResultEncoder().encode(result)
+ # round times to nearest 100 seconds
+ if "time" in parsed_params:
+ parsed_params['time'] = int(round(float(parsed_params['time']),-2))
+ paramkey = tuple(sorted(parsed_params.items()))
+ if handler_name in self.cache and paramkey in self.cache[handler_name] :
+ print ("Cache hit for ",handler_name," params ",parsed_params)
+ else:
+ print ("Cache miss for ",handler_name," params ",parsed_params)
+ result = handler(parsed_params)
+ if not handler_name in self.cache:
+ self.cache[handler_name] = {}
+ self.cache[handler_name][paramkey] = ResultEncoder().encode(result)
+ content = self.cache[handler_name][paramkey]
self.send_response(200)
self.send_header('Content-Type', 'text/plain')
self.send_header('Content-Length', str(len(content)))
@@ -407,22 +421,71 @@
if s.stop_id.lower() == query:
return StopToTuple(s)
return []
+ def handle_json_GET_stoproutes(self, params):
+ """Given a stop_id return all routes to visit the stop."""
+ schedule = self.server.schedule
+ stop = schedule.GetStop(params.get('stop', None))
+ service_period = params.get('service_period', None)
+ trips = stop.GetTrips(schedule)
+ result = {}
+ for trip in trips:
+ route = schedule.GetRoute(trip.route_id)
+ if not trip.route_id in result:
+ result[trip.route_id] = (route.route_id, route.route_short_name, route.route_long_name, trip.trip_id)
+ return result
+
+ def handle_json_GET_stopalltrips(self, params):
+ """Given a stop_id return all trips to visit the stop."""
+ schedule = self.server.schedule
+ stop = schedule.GetStop(params.get('stop', None))
+ service_period = params.get('service_period', None)
+ time_trips = stop.GetStopTimeTrips(schedule)
+ result = []
+ for time, (trip, index), tp in time_trips:
+ headsign = None
+ # Find the most recent headsign from the StopTime objects
+ for stoptime in trip.GetStopTimes()[index::-1]:
+ if stoptime.stop_headsign:
+ headsign = stoptime.stop_headsign
+ break
+ # If stop_headsign isn't found, look for a trip_headsign
+ if not headsign:
+ headsign = trip.trip_headsign
+ route = schedule.GetRoute(trip.route_id)
+ trip_name = ''
+ if route.route_short_name:
+ trip_name += route.route_short_name
+ if route.route_long_name:
+ if len(trip_name):
+ trip_name += " - "
+ trip_name += route.route_long_name
+ if service_period == None or trip.service_id == service_period:
+ result.append((time, (trip.trip_id, trip_name, trip.service_id), tp))
+ return result
def handle_json_GET_stoptrips(self, params):
"""Given a stop_id and time in seconds since midnight return the next
trips to visit the stop."""
schedule = self.server.schedule
stop = schedule.GetStop(params.get('stop', None))
- time = int(params.get('time', 0))
+ requested_time = int(params.get('time', 0))
+ limit = int(params.get('limit', 15))
service_period = params.get('service_period', None)
- time_trips = stop.GetStopTimeTrips(schedule)
- time_trips.sort() # OPT: use bisect.insort to make this O(N*ln(N)) -> O(N)
- # Keep the first 15 after param 'time'.
- # Need make a tuple to find correct bisect point
- time_trips = time_trips[bisect.bisect_left(time_trips, (time, 0)):]
- time_trips = time_trips[:15]
+ time_range = params.get('time_range', 24*60*60)
+
+
+ filtered_time_trips = []
+ for trip, index in stop._GetTripIndex(schedule):
+ tripstarttime = trip.GetStartTime()
+ if tripstarttime > requested_time and tripstarttime < (requested_time + time_range):
+ time, stoptime, tp = trip.GetTimeInterpolatedStops()[index]
+ if time > requested_time and time < (requested_time + time_range):
+ bisect.insort(filtered_time_trips, (time, (trip, index), tp))
+
result = []
- for time, (trip, index), tp in time_trips:
+ for time, (trip, index), tp in filtered_time_trips:
+ if len(result) > limit:
+ break
headsign = None
# Find the most recent headsign from the StopTime objects
for stoptime in trip.GetStopTimes()[index::-1]:
@@ -566,12 +629,13 @@
if options.key and os.path.isfile(options.key):
options.key = open(options.key).read().strip()
-
+
schedule = transitfeed.Schedule(problem_reporter=transitfeed.ProblemReporter())
print 'Loading data from feed "%s"...' % options.feed_filename
print '(this may take a few minutes for larger cities)'
+ t0 = datetime.datetime.now()
schedule.Load(options.feed_filename)
-
+ print ("Loaded in", (datetime.datetime.now() - t0).seconds , "seconds")
server = StoppableHTTPServer(server_address=('', options.port),
RequestHandlerClass=RequestHandlerClass)
server.key = options.key
@@ -579,6 +643,8 @@
server.file_dir = options.file_dir
server.host = options.host
server.feed_path = options.feed_filename
+
+
print ("To view, point your browser at http://localhost:%d/" %
(server.server_port))
--- /dev/null
+++ b/ses.php
@@ -1,1 +1,704 @@
-
+<?php
+/**
+*
+* Copyright (c) 2011, Dan Myers.
+* Parts copyright (c) 2008, Donovan Schonknecht.
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
+* - Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+* POSSIBILITY OF SUCH DAMAGE.
+*
+* This is a modified BSD license (the third clause has been removed).
+* The BSD license may be found here:
+* http://www.opensource.org/licenses/bsd-license.php
+*
+* Amazon Simple Email Service is a trademark of Amazon.com, Inc. or its affiliates.
+*
+* SimpleEmailService is based on Donovan Schonknecht's Amazon S3 PHP class, found here:
+* http://undesigned.org.za/2007/10/22/amazon-s3-php-class
+*
+*/
+
+/**
+* Amazon SimpleEmailService PHP class
+*
+* @link http://sourceforge.net/projects/php-aws-ses/
+* version 0.8.1
+*
+*/
+class SimpleEmailService
+{
+ protected $__accessKey; // AWS Access key
+ protected $__secretKey; // AWS Secret key
+ protect