From 721e4e1a4a1f170710474f229cd4e06557eba21a Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 1 May 2014 10:58:51 -0400 Subject: [PATCH 1/2] CC-5806: Airtime Analyzer: Please implement "remove all files" --- .../application/modules/rest/controllers/MediaController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php index 65f30b7e9..34bd5ac55 100644 --- a/airtime_mvc/application/modules/rest/controllers/MediaController.php +++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php @@ -83,7 +83,6 @@ class Rest_MediaController extends Zend_Rest_Controller public function clearAction() { - //TODO:: make this not accessible via public api?? if (!$this->verifyAuth(true, true)) { return; @@ -97,6 +96,7 @@ class Rest_MediaController extends Zend_Rest_Controller $updateCriteria->add(CcFilesPeer::FILE_EXISTS, false); BasePeer::doUpdate($selectCriteria, $updateCriteria, $con); + //delete all files and directories under .../imported $path = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/imported/*" : "/srv/airtime/stor/imported/*"; exec("rm -rf $path"); From 2d6748457c006e4de364a5b98540decbe49ddbdd Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 2 May 2014 15:50:37 -0400 Subject: [PATCH 2/2] Remove database credentials from application.ini --- airtime_mvc/application/configs/application.ini | 13 +++++++------ airtime_mvc/application/models/Auth.php | 13 +++++++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/airtime_mvc/application/configs/application.ini b/airtime_mvc/application/configs/application.ini index 71bcd5c46..a9302c71d 100644 --- a/airtime_mvc/application/configs/application.ini +++ b/airtime_mvc/application/configs/application.ini @@ -12,12 +12,13 @@ resources.frontController.plugins.putHandler = "Zend_Controller_Plugin_PutHandle resources.modules[] = "" resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/" resources.view[] = -resources.db.adapter = "Pdo_Pgsql" -resources.db.params.charset = "utf8" -resources.db.params.host = "localhost" -resources.db.params.username = "airtime" -resources.db.params.password = "airtime" -resources.db.params.dbname = "airtime" +; These are no longer needed. They are specified in /etc/airtime/airtime.conf: +;resources.db.adapter = "Pdo_Pgsql" +;resources.db.params.charset = "utf8" +;resources.db.params.host = "localhost" +;resources.db.params.username = "airtime" +;resources.db.params.password = "airtime" +;resources.db.params.dbname = "airtime" [staging : production] diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php index 104ee8050..ee539c7c1 100644 --- a/airtime_mvc/application/models/Auth.php +++ b/airtime_mvc/application/models/Auth.php @@ -74,8 +74,17 @@ class Application_Model_Auth */ public static function getAuthAdapter() { - $dbAdapter = Zend_Db_Table::getDefaultAdapter(); - $authAdapter = new Zend_Auth_Adapter_DbTable($dbAdapter); + $CC_CONFIG = Config::getConfig(); + + // Database config + $db = Zend_Db::factory('PDO_' . $CC_CONFIG['dsn']['phptype'], array( + 'host' => $CC_CONFIG['dsn']['hostspec'], + 'username' => $CC_CONFIG['dsn']['username'], + 'password' => $CC_CONFIG['dsn']['password'], + 'dbname' => $CC_CONFIG['dsn']['database'] + )); + Zend_Db_Table_Abstract::setDefaultAdapter($db); + $authAdapter = new Zend_Auth_Adapter_DbTable($db); $authAdapter->setTableName('cc_subjs') ->setIdentityColumn('login')