From aa8a26271cf7eef11c2884f73e097c525d75bfc1 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 1 Aug 2014 11:51:20 -0400 Subject: [PATCH 1/3] Fix zend routing on Trusty (weird error due to REST module) --- airtime_mvc/application/configs/application.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/configs/application.ini b/airtime_mvc/application/configs/application.ini index a9302c71d..8c54af91e 100644 --- a/airtime_mvc/application/configs/application.ini +++ b/airtime_mvc/application/configs/application.ini @@ -6,11 +6,11 @@ bootstrap.class = "Bootstrap" appnamespace = "Application" resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers" resources.frontController.params.displayExceptions = 0 -resources.frontController.moduleDirectory = APPLICATION_PATH "/modules" +;resources.frontController.moduleDirectory = APPLICATION_PATH "/modules" resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandler" ;load everything in the modules directory including models -resources.modules[] = "" resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/" +resources.modules[] = "" resources.view[] = ; These are no longer needed. They are specified in /etc/airtime/airtime.conf: ;resources.db.adapter = "Pdo_Pgsql" From 716cc5a754cf2ec3ecf0145d671d97582d911681 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 27 Aug 2014 18:51:06 -0400 Subject: [PATCH 2/3] Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. --- airtime_mvc/application/models/Cache.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/models/Cache.php b/airtime_mvc/application/models/Cache.php index fc473395a..af4e6417b 100644 --- a/airtime_mvc/application/models/Cache.php +++ b/airtime_mvc/application/models/Cache.php @@ -2,7 +2,6 @@ class Cache { - private function createCacheKey($key, $isUserValue, $userId = null) { $CC_CONFIG = Config::getConfig(); @@ -20,13 +19,13 @@ class Cache public function store($key, $value, $isUserValue, $userId = null) { - $cacheKey = self::createCacheKey($key, $userId); - return apc_store($cacheKey, $value); + //$cacheKey = self::createCacheKey($key, $userId); + return false; ///apc_store($cacheKey, $value); } public function fetch($key, $isUserValue, $userId = null) { - $cacheKey = self::createCacheKey($key, $isUserValue, $userId); - return apc_fetch($cacheKey); + //$cacheKey = self::createCacheKey($key, $isUserValue, $userId); + return false; //apc_fetch($cacheKey); } -} \ No newline at end of file +} From 0ccc7e7dc9df3e46ac34f7f0b69e1f5a571cefeb Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 28 Aug 2014 16:52:47 -0400 Subject: [PATCH 3/3] SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04 The Bootstrap.php in the modules directory didn't like short php tags. --- airtime_mvc/application/configs/application.ini | 2 +- airtime_mvc/application/modules/rest/Bootstrap.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/configs/application.ini b/airtime_mvc/application/configs/application.ini index 8c54af91e..79f4f9c78 100644 --- a/airtime_mvc/application/configs/application.ini +++ b/airtime_mvc/application/configs/application.ini @@ -6,7 +6,7 @@ bootstrap.class = "Bootstrap" appnamespace = "Application" resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers" resources.frontController.params.displayExceptions = 0 -;resources.frontController.moduleDirectory = APPLICATION_PATH "/modules" +resources.frontController.moduleDirectory = APPLICATION_PATH "/modules" resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandler" ;load everything in the modules directory including models resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/" diff --git a/airtime_mvc/application/modules/rest/Bootstrap.php b/airtime_mvc/application/modules/rest/Bootstrap.php index 31691ca96..999798ee5 100644 --- a/airtime_mvc/application/modules/rest/Bootstrap.php +++ b/airtime_mvc/application/modules/rest/Bootstrap.php @@ -1,4 +1,4 @@ -