From 51274920e1430a9842da6f3472ac7f21eaffc919 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 13 Nov 2014 10:20:58 -0500
Subject: [PATCH] Cosmetic updates

---
 .../rest/controllers/MediaController.php      | 49 ++++++-------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index d9416548c..7427509c6 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -26,8 +26,8 @@ class Rest_MediaController extends Zend_Rest_Controller
     public function init()
     {
         $this->view->layout()->disableLayout();
-		// Remove reliance on .phtml files to render requests
-   		$this->_helper->viewRenderer->setNoRender(true);
+        // Remove reliance on .phtml files to render requests
+        $this->_helper->viewRenderer->setNoRender(true);
     }
     
     public function indexAction()
@@ -112,7 +112,7 @@ class Rest_MediaController extends Zend_Rest_Controller
     public function getAction()
     {
         if (!$this->verifyAuth(true, true))
-                {
+        {
             return;
         }
         
@@ -316,11 +316,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         $observed_csrf_token = $token;
         $expected_csrf_token = $current_namespace->authtoken;
 
-        if($observed_csrf_token == $expected_csrf_token){
-            return true;
-        }else{
-            return false;
-        }
+        return ($observed_csrf_token === $expected_csrf_token);
     }
 
     private function verifyAuth($checkApiKey, $checkSession)
@@ -331,7 +327,7 @@ class Rest_MediaController extends Zend_Rest_Controller
             if(!$this->verifyCSRFToken($this->_getParam('csrf_token'))){
                 $resp = $this->getResponse();
                 $resp->setHttpResponseCode(401);
-                $resp->appendBody("ERROR: Token Missmatch."); 
+                $resp->appendBody("ERROR: Token Mismatch."); 
                 return false;
             }
             return true;
@@ -361,24 +357,13 @@ class Rest_MediaController extends Zend_Rest_Controller
         $encodedRequestApiKey = substr($authHeader, strlen("Basic "));
         $encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":");
         
-        if ($encodedRequestApiKey === $encodedStoredApiKey) 
-        {
-            return true;
-        } else {
-            return false;
-        }
-        
-        return false;
+        return ($encodedRequestApiKey === $encodedStoredApiKey);
     }
     
     private function verifySession()
     {
         $auth = Zend_Auth::getInstance();
-        if ($auth->hasIdentity())
-        {
-            return true;
-        }
-        return false;
+        return ($auth->hasIdentity());
         
         //Token checking stub code. We'd need to change LoginController.php to generate a token too, but
         //but luckily all the token code already exists and works.
@@ -488,7 +473,7 @@ class Rest_MediaController extends Zend_Rest_Controller
                 return $service_user->getCurrentUser()->getDbId();
             } else {
                 $defaultOwner = CcSubjsQuery::create()
-                    ->filterByDbType('A')
+                    ->filterByDbType(array('A', 'S'), Criteria::IN)
                     ->orderByDbId()
                     ->findOne();
                 if (!$defaultOwner) {
@@ -504,23 +489,21 @@ class Rest_MediaController extends Zend_Rest_Controller
     }
 
     /**
-     * 
+     *
      * Strips out fields from incoming request data that should never be modified
      * from outside of Airtime
-     * @param array $data
+     * 
+     * @param array $data            
      */
-    private static function removeBlacklistedFieldsFromRequestData($data)
-    {
+    private static function removeBlacklistedFieldsFromRequestData($data) {
         foreach (self::$blackList as $key) {
             unset($data[$key]);
         }
-    
-            return $data;
-        }
+        
+        return $data;
+    }
 
-
-    private function removeEmptySubFolders($path)
-    {
+    private function removeEmptySubFolders($path) {
         exec("find $path -empty -type d -delete");
     }