From: Alexander Sadleir <maxious@lambdacomplex.org>
Date: Tue, 20 Sep 2011 08:27:47 +0000
Subject: Merge branch 'master' of https://github.com/maxious/ACTBus-ui
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=48637583aea22081a84506bc18e90275b40a2a54
---
Merge branch 'master' of https://github.com/maxious/ACTBus-ui
---


--- a/aws/busuiphp.sh
+++ b/aws/busuiphp.sh
@@ -1,4 +1,6 @@
 cp /root/aws.php /tmp/
+chmod  777 /var/cache/lighttpd/compress/
+
 mkdir /var/www/lib/staticmaplite/cache 
 chcon -h system_u:object_r:httpd_sys_content_t /var/www
 chcon -R -h root:object_r:httpd_sys_content_t /var/www/*
@@ -15,3 +17,4 @@
 
 wget http://s3-ap-southeast-1.amazonaws.com/busresources/cbrfeed.zip \
 -O /var/www/cbrfeed.zip
+

--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -48,6 +48,8 @@
 $basePath = "";
 if (strstr($_SERVER['PHP_SELF'], "labs/")
         || strstr($_SERVER['PHP_SELF'], "myway/")
+        || strstr($_SERVER['PHP_SELF'], "lib/")
+        || strstr($_SERVER['PHP_SELF'], "include/")
         || strstr($_SERVER['PHP_SELF'], "servicealerts/"))
     $basePath = "../";