From 4c1e6d3fe3aab5241ac3b20b1a208de0e20a416c Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 14 Aug 2014 17:22:01 -0400
Subject: [PATCH] Fixed base URL

Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
---
 airtime_mvc/application/Bootstrap.php                    | 3 ++-
 airtime_mvc/application/common/OsPath.php                | 9 ++++++---
 airtime_mvc/application/controllers/LocaleController.php | 5 ++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 5bafe0fad..fddd5911e 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -193,7 +193,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     {
         $front = Zend_Controller_Front::getInstance();
         $router = $front->getRouter();
-
+        $front->setBaseUrl(Application_Common_OsPath::getBaseDir());
+        
         $router->addRoute(
             'password-change',
             new Zend_Controller_Router_Route('password-change/:user_id/:token', array(
diff --git a/airtime_mvc/application/common/OsPath.php b/airtime_mvc/application/common/OsPath.php
index 64c1c1e4a..f052187ba 100644
--- a/airtime_mvc/application/common/OsPath.php
+++ b/airtime_mvc/application/common/OsPath.php
@@ -65,8 +65,10 @@ class Application_Common_OsPath{
     }
     
     public static function getBaseDir() {
-        $baseUrl = dirname($_SERVER['SCRIPT_NAME']);
-
+        
+        $CC_CONFIG = Config::getConfig();
+        $baseUrl = $CC_CONFIG['baseDir'];
+        
         if ($baseUrl[0] != "/") {
             $baseUrl = "/".$baseUrl;
         }
@@ -74,7 +76,8 @@ class Application_Common_OsPath{
         if ($baseUrl[strlen($baseUrl) -1] != "/") {
             $baseUrl = $baseUrl."/";
         }
-
+        
+        
         return $baseUrl;
     }
 }
diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php
index da921f055..3eb346d0b 100644
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/airtime_mvc/application/controllers/LocaleController.php
@@ -12,12 +12,11 @@ class LocaleController extends Zend_Controller_Action
         $this->_helper->viewRenderer->setNoRender(true);
         header("Content-type: text/javascript");
 
-        $baseUrl = Application_Common_OsPath::getBaseDir();
         $locale = Application_Model_Preference::GetLocale();
         echo "var datatables_dict =" .
             file_get_contents(Application_Common_OsPath::join(
-                dirname(__file__),
-                "../../public/js/datatables/i18n/",
+                $_SERVER["DOCUMENT_ROOT"],
+                "js/datatables/i18n/",
                 $locale.".txt")
             );
     }