Merge branch 'master' of ssh://apples.lambdacomplex.org/git/bus
Merge branch 'master' of ssh://apples.lambdacomplex.org/git/bus

file:a/busui/about.php (deleted)
<?php  
include('common.inc.php');  
include_header("About")  
?>  
<p>  
Busness Time - An ACT bus timetable webapp<br />  
Based on the maxious-canberra-transit-feed (<a href="cbrfeed.zip">download</a>, last updated <?php echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br />  
Source code for the transit feed and this site @ <a href="http://maxious.lambdacomplex.org/git">http://maxious.lambdacomplex.org/git</a><br />  
Uses jQuery Mobile, PHP, Ruby, Python, Google Transit Feed Specification tools, OpenTripPlanner, OpenLayers, OpenStreetMap, Cloudmade Geocoder and Tile Service<br />  
<br />  
Feedback encouraged; contact maxious@lambdacomplex.org<br />  
<br />  
Some icons by Joseph Wain / glyphish.com<br />  
<br />  
<small>Disclaimer: The content of this website is of a general and informative nature. Please check with printed timetables or those available on http://action.act.gov.au before your trip.  
Whilst every effort has been made to ensure the high quality and accuracy of the Site, the Author makes no warranty,  
express or implied concerning the topicality, correctness, completeness or quality of the information, which is provided  
"as is". The Author expressly disclaims all warranties, including but not limited to warranties of fitness for a particular purpose and warranties of merchantability.  
All offers are not binding and without obligation. The Author expressly reserves the right, in his discretion, to suspend,  
change, modify, add or remove portions of the Site and to restrict or terminate the use and accessibility of the Site  
without prior notice. </small>  
<?  
include_footer();  
?>  
 
file:a/busui/common.inc.php (deleted)
<?php  
date_default_timezone_set('Australia/ACT');  
$APIurl = "http://localhost:8765";  
$cloudmadeAPIkey="daa03470bb8740298d4b10e3f03d63e6";  
$googleMapsAPIkey="ABQIAAAA95XYXN0cki3Yj_Sb71CFvBTPaLd08ONybQDjcH_VdYtHHLgZvRTw2INzI_m17_IoOUqH3RNNmlTk1Q";  
$otpAPIurl = 'http://10.1.0.243:5080/opentripplanner-api-webapp/';  
if (isDebug()) 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['geolocate'])) {  
$contents = geocode(var_filter($_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'] = "";  
}  
}  
//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'];  
}  
 
function isMetricsOn()  
{  
return true;  
}  
 
function debug($msg) {  
if (isDebug()) echo "<!-- $msg -->";  
}  
function isFastDevice() {  
$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;  
}  
 
function include_header($pageTitle, $opendiv = true, $geolocate = false) {  
echo '  
<!DOCTYPE html>  
<html>  
<head>  
<title>'.$pageTitle.'</title>';  
if (isDebug()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" />  
<script type="text/javascript" src="js/jquery-1.5.js"></script>  
<script type="text/javascript" src="js/jquery-mobile-1.0a3.js"></script>';  
else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.css" />  
<script type="text/javascript" src="http://code.jquery.com/jquery-1.5.js"></script>  
<script type="text/javascript" src="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.js"></script>';  
echo '  
<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />  
<script>  
//reset type=date inputs to text  
$( document ).bind( "mobileinit", function(){  
$.mobile.page.prototype.options.degradeInputs.date = true;  
});  
</script>  
<script src="js/jQuery.ui.datepicker.js"></script>  
<script src="js/jquery.ui.datepicker.mobile.js"></script>  
<style type="text/css">  
.ui-navbar {  
width: 100%;  
}  
.ui-btn-inner {  
white-space: normal !important;  
}  
.ui-li-heading {  
white-space: normal !important;  
}  
.ui-listview-filter {  
margin: 0 !important;  
}  
#footer {  
text-size: 0.75em;  
text-align: center;  
}  
body {  
background-color: #F0F0F0;  
}  
</style>  
<meta name="apple-mobile-web-app-capable" content="yes" />  
<meta name="apple-mobile-web-app-status-bar-style" content="black" />  
<link rel="apple-touch-startup-image" href="startup.png" />  
<link rel="apple-touch-icon" href="apple-touch-icon.png" />';  
if ($geolocate) {  
echo "<script>  
 
function success(position) {  
$('#geolocate').val(position.coords.latitude+','+position.coords.longitude);  
// setCookie('geolocate',position.coords.latitude+','+position.coords.longitude,1);  
$('#here').click(function(event) { $('#geolocate').val(doAJAXrequestForGeolocSessionHere()); return false;});  
$('#here').show();  
}  
function error(msg) {  
console.log(msg);  
}  
 
if (navigator.geolocation) {  
navigator.geolocation.getCurrentPosition(success, error);  
}  
 
</script> ";  
}  
echo '</head>  
<body>  
 
';  
if ($opendiv) {  
echo '<div data-role="page">  
<script>  
$(document).ready(function ()  
{  
document.title = "'.$pageTitle.'";