From b9b3e95caa12d19ceb989ec189d485f161e65964 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Thu, 10 Apr 2014 09:28:23 -0400
Subject: [PATCH] CC-5781: Upgrade script for new storage quota implementation

Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
---
 airtime_mvc/application/controllers/UpgradeController.php | 8 ++++----
 .../application/controllers/plugins/Acl_plugin.php        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php
index e1606b98d..a01eb5eca 100644
--- a/airtime_mvc/application/controllers/UpgradeController.php
+++ b/airtime_mvc/application/controllers/UpgradeController.php
@@ -17,10 +17,11 @@ class UpgradeController extends Zend_Controller_Action
         
         //Decode the API key that was passed to us in the HTTP request.
         $authHeader = $this->getRequest()->getHeader("Authorization");
+
         $encodedRequestApiKey = substr($authHeader, strlen("Basic "));
         $encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":");
-        
-        if (!$encodedRequestApiKey === $encodedStoredApiKey)
+
+        if ($encodedRequestApiKey !== $encodedStoredApiKey)
         {
             $this->getResponse()
                 ->setHttpResponseCode(401)
@@ -46,8 +47,7 @@ class UpgradeController extends Zend_Controller_Action
         $database = $values['database']['dbname'];
         $dir = __DIR__;
         
-        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
-        
+        passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_$airtime_upgrade_version/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
         
         $musicDir = CcMusicDirsQuery::create()
             ->filterByType('stor')
diff --git a/airtime_mvc/application/controllers/plugins/Acl_plugin.php b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
index 4cf9f97b5..c5dc4b9f4 100644
--- a/airtime_mvc/application/controllers/plugins/Acl_plugin.php
+++ b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
@@ -117,7 +117,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
             return;
         }
 
-        if (in_array($controller, array("api", "auth", "locale"))) {
+        if (in_array($controller, array("api", "auth", "locale", "upgrade"))) {
 
             $this->setRoleName("G");
         } elseif (!Zend_Auth::getInstance()->hasIdentity()) {