projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
unified | plain
Merge branch 'master' of https://github.com/maxious/ACTBus-ui
Merge branch 'master' of https://github.com/maxious/ACTBus-ui

file:b/.gitignore (new)
 
  /labs/tiles/12
  /labs/tiles/13
  /labs/tiles/14
  /labs/tiles/15
  /labs/tiles/16
  /labs/tiles/17
  /labs/tiles/19
file:a/about.php -> file:b/about.php
<?php <?php
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 last updated <?php
echo date("F d Y.", @filemtime('cbrfeed.zip')); ?>)<br /> 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 />
<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>) and Android (<a href="https://market.android.com/details?id=com.action">MyBus 2.0 by Imagine Team</a>)
<br /> <br />
  GTFS-realtime API;
  Alerts and Trip Updates (but only Cancelled or Stop Skipped)
  Default format binary but can get JSON by adding ?ascii=yes
  <br />
<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. <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, 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 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. "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, 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 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> without prior notice. </small>
<?php <?php
include_footer(); include_footer();
?> ?>
   
file:a/aws/busuiphp.sh -> file:b/aws/busuiphp.sh
cp /root/aws.php /tmp/ cp /root/aws.php /tmp/
mkdir /var/www/lib/staticmaplite/cache mkdir /var/www/lib/staticmaplite/cache
chcon -h system_u:object_r:httpd_sys_content_t /var/www 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 -h root:object_r:httpd_sys_content_t /var/www/*
   
chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache chcon -R -t httpd_sys_content_rw_t /var/www/lib/staticmaplite/cache
chmod -R 777 /var/www/lib/staticmaplite/cache chmod -R 777 /var/www/lib/staticmaplite/cache
   
chcon -R -t httpd_sys_content_rw_t /var/www/labs/tiles chcon -R -t httpd_sys_content_rw_t /var/www/labs/tiles
chmod -R 777 /var/www/labs/tiles chmod -R 777 /var/www/labs/tiles
   
  chcon -R -t httpd_sys_content_rw_t /var/www/lib/openid-php/oid_store
  chmod -R 777 /var/www/lib/openid-php/oid_store
   
wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \ wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
-O /var/www/cbrfeed.zip -O /var/www/cbrfeed.zip
file:b/include/common-auth.inc.php (new)
  <?php
  function getScheme()
  {
  $scheme = 'http';
  if (isset($_SERVER['HTTPS']) and $_SERVER['HTTPS'] == 'on') {
  $scheme .= 's';
  }
  return $scheme;
  }
 
  function getTrustRoot()
  {
  return sprintf("%s://%s:%s%s/",
  getScheme(), $_SERVER['SERVER_NAME'],
  $_SERVER['SERVER_PORT'],
  dirname($_SERVER['PHP_SELF']));
  }
 
 
  // Includes required files
  set_include_path(get_include_path() . PATH_SEPARATOR . $labsPath."lib/openid-php/");
  require_once "Auth/OpenID/Consumer.php";
  require_once "Auth/OpenID/FileStore.php";
  require_once "Auth/OpenID/AX.php";
 
 
 
  function login()
  {
  // Just tested this with/for Google, needs trying with others ...
  $oid_identifier = 'https://www.google.com/accounts/o8/id';
  // Create file storage area for OpenID data
  $store = new Auth_OpenID_FileStore('lib/openid-php/oid_store');
  // Create OpenID consumer
  $consumer = new Auth_OpenID_Consumer($store);
  // Create an authentication request to the OpenID provider
  $auth = $consumer -> begin($oid_identifier);
 
  // Create attribute request object
  // See http://code.google.com/apis/accounts/docs/OpenID.html#Parameters for parameters
  // Usage: make($type_uri, $count=1, $required=false, $alias=null)
  $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/contact/email', 2, 1, 'email');
  $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/namePerson/first', 1, 1, 'firstname');
  $attribute[] = Auth_OpenID_AX_AttrInfo :: make('http://axschema.org/namePerson/last', 1, 1, 'lastname');
 
  // Create AX fetch request
  $ax = new Auth_OpenID_AX_FetchRequest;
 
  // Add attributes to AX fetch request
  foreach($attribute as $attr) {
  $ax -> add($attr);
  }
 
  // Add AX fetch request to authentication request
  $auth -> addExtension($ax);
  $_SESSION['returnURL'] = curPageURL();
  // Redirect to OpenID provider for authentication
  $url = $auth -> redirectURL(getTrustRoot(), $_SESSION['returnURL']);
  header('Location: ' . $url);
  }
 
 
  function auth()
 
  {
  if ($_SESSION['authed'] == true) return true;
 
  // Create file storage area for OpenID data
  $store = new Auth_OpenID_FileStore('lib/openid-php/oid_store');
  // Create OpenID consumer
  $consumer = new Auth_OpenID_Consumer($store);
  // Create an authentication request to the OpenID provider
  $response = $consumer -> complete($_SESSION['returnURL']);
 
  if ($response -> status == Auth_OpenID_SUCCESS) {
  // Get registration informations
  $ax = new Auth_OpenID_AX_FetchResponse();
  $obj = $ax -> fromSuccessResponse($response);
  $email = $obj -> data['http://axschema.org/contact/email'][0];
  var_dump($email);
  if ($email != "maxious@gmail.com") {
  die("Access Denied");
  } else {
  $_SESSION['authed'] = true;
  }
  } else {
  login();
  }
  }
  if ($_REQUEST['janrain_nonce']) auth();
  ?>
file:a/include/common-template.inc.php -> file:b/include/common-template.inc.php
<?php <?php
// Copyright 2009 Google Inc. All Rights Reserved. // Copyright 2009 Google Inc. All Rights Reserved.
$GA_ACCOUNT = "MO-22173039-1"; $GA_ACCOUNT