STYLE: Fixed BrowseController.php and AssetstoreController.php

Author: Charles Marion

core/AppController.php

@@ -70,7 +70,7 @@ public function preDispatch()
         }
       $this->userSession = $user;
       $this->view->recentItems = array();
-      if($user->Dao != null)
+      if($user->Dao != null && $user->Dao instanceof UserDao)
         {
         if($fc->getRequest()->getControllerName() != 'install' && $fc->getRequest()->getControllerName() != 'error' && $user->Dao->isAdmin() && $this->isUpgradeNeeded())
           {

core/configs/database.local.mysql.ini

@@ -19,7 +19,7 @@ database.params.port=3306
 database.params.username=root
 database.params.password=
 database.params.dbname=midas
-version=3.0.4
+version=3.0.7
 
 
 [testing]

core/controllers/AdminController.php

@@ -93,15 +93,15 @@ function indexAction()
                 }
               break;
             case 'PDO_PGSQL':
-               if(file_exists(BASE_PATH.'/modules/'.$key.'/database/pgsql/'.$allModules[$moduleName]->version.'.sql'))
-                 {
-                 $this->Component->Utility->run_pgsql_from_file(BASE_PATH.'/modules/'.$key.'/database/pgsql/'.$allModules[$moduleName]->version.'.sql',
+              if(file_exists(BASE_PATH.'/modules/'.$key.'/database/pgsql/'.$allModules[$moduleName]->version.'.sql'))
+                {
+                $this->Component->Utility->run_pgsql_from_file(BASE_PATH.'/modules/'.$key.'/database/pgsql/'.$allModules[$moduleName]->version.'.sql',
                                            Zend_Registry::get('configDatabase')->database->params->host,
                                            Zend_Registry::get('configDatabase')->database->params->username,
                                            Zend_Registry::get('configDatabase')->database->params->password,
                                            Zend_Registry::get('configDatabase')->database->params->dbname,
                                            Zend_Registry::get('configDatabase')->database->params->port);
-                 }
+                }
               break;
             default:
               break;
@@ -164,9 +164,9 @@ function showlogAction()
       throw new Zend_Exception("You should be an administrator");
       }
     if(!$this->getRequest()->isXmlHttpRequest())
-     {
-     throw new Zend_Exception("Why are you here ? Should be ajax.");
-     }
+      {
+      throw new Zend_Exception("Why are you here ? Should be ajax.");
+      }
     $this->_helper->layout->disableLayout();
 
     $start = $this->_getParam("startlog");
@@ -244,9 +244,9 @@ function upgradeAction()
       throw new Zend_Exception("You should be an administrator");
       }
     if(!$this->getRequest()->isXmlHttpRequest())
-     {
-     throw new Zend_Exception("Why are you here ? Should be ajax.");
-     }
+      {
+      throw new Zend_Exception("Why are you here ? Should be ajax.");
+      }
     $this->_helper->layout->disableLayout();
 
     $db = Zend_Registry::get('dbAdapter');

core/controllers/AssetstoreController.php

@@ -7,10 +7,10 @@
 class AssetstoreController extends AppController
   {
 
-  public $_models=array('Assetstore');
-  public $_daos=array('Assetstore');
-  public $_components=array('Utility');
-  public $_forms=array('Assetstore');
+  public $_models = array('Assetstore');
+  public $_daos = array('Assetstore');
+  public $_components = array('Utility');
+  public $_forms = array('Assetstore');
 
   /**
    * @method init()
@@ -59,10 +59,10 @@ function addAction()
                        'assetstore_id' => $assetstoreDao->getAssetstoreId(),
                        'assetstore_name' => $assetstoreDao->getName(),
                        'assetstore_type' => $assetstoreDao->getType(),
-                       'totalSpace'=>disk_total_space($assetstoreDao->getPath()),
-                       'totalSpaceText'=>$this->Component->Utility->formatSize(disk_total_space($assetstoreDao->getPath())),
-                       'freeSpace'=>disk_free_space($assetstoreDao->getPath()),
-                       'freeSpaceText'=>$this->Component->Utility->formatSize(disk_free_space($assetstoreDao->getPath())),
+                       'totalSpace' => disk_total_space($assetstoreDao->getPath()),
+                       'totalSpaceText' => $this->Component->Utility->formatSize(disk_total_space($assetstoreDao->getPath())),
+                       'freeSpace' => disk_free_space($assetstoreDao->getPath()),
+                       'freeSpaceText' => $this->Component->Utility->formatSize(disk_free_space($assetstoreDao->getPath())),
                        ));  
       return true;
       }