Minor tweaks and fixes

Author: Jamie Snape

core/GlobalController.php

@@ -243,12 +243,7 @@ public function loadElements()
      */
     public function isDebug()
     {
-        $config = Zend_Registry::get('config');
-        if ($config->environment == 'production') {
-            return true;
-        } else {
-            return false;
-        }
+        return Zend_Registry::get('configGlobal')->environment !== 'production';
     }
 
     /**
@@ -258,9 +253,7 @@ public function isDebug()
      */
     public function getEnvironment()
     {
-        $config = Zend_Registry::get('configGlobal');
-
-        return $config->environment;
+        return Zend_Registry::get('configGlobal')->environment;
     }
 
     /**

core/Notification.php

@@ -41,7 +41,6 @@ public function init()
     public function getDasboard()
     {
         $return = array();
-        $return['Config Folder Writable'] = array(is_writable(LOCAL_CONFIGS_PATH));
         $return['Data Folder Writable'] = array(is_writable(UtilityComponent::getDataDirectory()));
         // pass in empty string since we want to check the overall root temp directory
         $return['Temporary Folder Writable'] = array(is_writable(UtilityComponent::getTempDirectory('')));

core/controllers/AdminController.php

@@ -33,7 +33,7 @@ public function init()
     {
         $config = Zend_Registry::get('configGlobal'); // set admin part to english
         $config->application->lang = 'en';
-        Zend_Registry::get('configGlobal', $config);
+        Zend_Registry::set('configGlobal', $config);
         if ($this->isDemoMode()) {
             $this->disableView();
 

core/controllers/UserController.php

@@ -986,6 +986,7 @@ public function settingsAction()
         $this->Component->Sortdao->order = 'asc';
         usort($communities, array($this->Component->Sortdao, 'sortByName'));
 
+        $this->view->useGravatar = Zend_Registry::get('configGlobal')->gravatar;
         $this->view->isGravatar = $this->User->getGravatarUrl($userDao->getEmail());
 
         $this->view->communities = $communities;

core/controllers/components/ApihelperComponent.php

@@ -61,8 +61,7 @@ public function getApiSetup()
     {
         $apiSetup = array();
         $apiSetup['testing'] = Zend_Registry::get('configGlobal')->environment == 'testing';
-        $utilityComponent = MidasLoader::loadComponent('Utility');
-        $apiSetup['tmpDirectory'] = $utilityComponent->getTempDirectory();
+        $apiSetup['tmpDirectory'] = UtilityComponent::getTempDirectory();
 
         return $apiSetup;
     }

core/controllers/components/ApisystemComponent.php

@@ -392,7 +392,6 @@ public function uploadGeneratetoken($args)
         $uploadComponent = MidasLoader::loadComponent('Httpupload');
         $apiSetup = $apihelperComponent->getApiSetup();
         $uploadComponent->setTestingMode($apiSetup['testing']);
-        $uploadComponent->setTmpDirectory($apiSetup['tmpDirectory']);
 
         return $uploadComponent->generateToken($args, $userDao->getKey().'/'.$item->getKey());
     }
@@ -462,7 +461,6 @@ public function uploadPerform($args)
         $httpUploadComponent = MidasLoader::loadComponent('Httpupload');
         $apiSetup = $apihelperComponent->getApiSetup();
         $httpUploadComponent->setTestingMode($apiSetup['testing']);
-        $httpUploadComponent->setTmpDirectory($apiSetup['tmpDirectory']);
 
         if (array_key_exists('testingmode', $args)) {
             $httpUploadComponent->setTestingMode(true);
@@ -558,7 +556,6 @@ public function uploadGetoffset($args)
         $apihelperComponent = MidasLoader::loadComponent('Apihelper');
         $apiSetup = $apihelperComponent->getApiSetup();
         $uploadComponent->setTestingMode($apiSetup['testing']);
-        $uploadComponent->setTmpDirectory($apiSetup['tmpDirectory']);
 
         return $uploadComponent->getOffset($args);
     }

core/controllers/components/HttpuploadComponent.php

@@ -34,16 +34,9 @@
  */
 class HttpuploadComponent extends AppComponent
 {
-    public $tmpDirectory = '';
     public $tokenParamName = 'uploadtoken';
     public $testingEnable = false;
 
-    /** Set the upload temporary directory */
-    public function setTmpDirectory($dir)
-    {
-        $this->tmpDirectory = $dir;
-    }
-
     /** Set whether we are in testing mode or not (boolean) */
     public function setTestingMode($testing)
     {
@@ -68,7 +61,7 @@ public function generateToken($args, $dirname = '')
             throw new Exception('Parameter filename is not defined', MIDAS_HTTPUPLOAD_FILENAME_PARAM_UNDEFINED);
         }
         $dir = $dirname == '' ? '' : '/'.$dirname;
-        $dir = $this->tmpDirectory.$dir;
+        $dir = UtilityComponent::getTempDirectory().$dir;
 
         if (!file_exists($dir)) {
             if (!mkdir($dir, 0700, true)) {
@@ -79,10 +72,10 @@ public function generateToken($args, $dirname = '')
         if ($dirname != '') {
             $unique_identifier = $dirname.'/'.$unique_identifier;
         }
-        if (file_exists($this->tmpDirectory.'/'.$unique_identifier)) {
+        if (file_exists(UtilityComponent::getTempDirectory().'/'.$unique_identifier)) {
             throw new Exception('Failed to generate upload token', MIDAS_HTTPUPLOAD_UPLOAD_TOKEN_GENERATION_FAILED);
         }
-        touch($this->tmpDirectory.'/'.$unique_identifier);
+        touch(UtilityComponent::getTempDirectory().'/'.$unique_identifier);
 
         return array('token' => $unique_identifier);
     }
@@ -113,7 +106,7 @@ public function process($args)
         }
 
         // check if the temporary file exists
-        $pathTemporaryFilename = $this->tmpDirectory.'/'.$uploadToken;
+        $pathTemporaryFilename = UtilityComponent::getTempDirectory().'/'.$uploadToken;
         if (!file_exists($pathTemporaryFilename)) {
             throw new Exception(
                 'Invalid upload token '.$pathTemporaryFilename, MIDAS_HTTPUPLOAD_INVALID_UPLOAD_TOKEN
@@ -192,7 +185,7 @@ public function getOffset($args)
             );
         }
         $uploadToken = $args[$this->tokenParamName];
-        $offset = UtilityComponent::fileSize($this->tmpDirectory.'/'.$uploadToken);
+        $offset = UtilityComponent::fileSize(UtilityComponent::getTempDirectory().'/'.$uploadToken);
 
         return array('offset' => $offset);
     }

core/controllers/components/InternationalizationComponent.php

@@ -62,11 +62,6 @@ public static function translate($text)
      */
     public static function isDebug()
     {
-        $config = Zend_Registry::get('config');
-        if ($config->mode->debug == 1) {
-            return true;
-        } else {
-            return false;
-        }
+        return Zend_Registry::get('configGlobal')->environment !== 'production';
     }
 }

core/models/MIDASModel.php

@@ -146,7 +146,7 @@ public function getLogger()
      * Initialize a DAO.
      *
      * @param string $name name of the DAO
-     * @param array $data array of values
+     * @param array|Zend_Db_Table_Row_Abstract $data array or table row of values
      * @param string $module
      * @returns false|MIDAS_GlobalDao
      * @throws Zend_Exception

core/views/user/settings.phtml

@@ -156,8 +156,7 @@ foreach ($this->customTabs as $moduleName => $module) {
         <input type="submit" name='modifyPicture' value="<?php echo $this->t('Upload new avatar') ?>">
         <br/>
         <?php
-        $useGravatar = Zend_Registry::get('configGlobal')->gravatar;
-        if ($useGravatar) {
+        if ($this->useGravatar) {
             echo "<br/>";
             if (strpos($this->thumbnail, 'http://') === false && $this->isGravatar
             ) {