ENH: refs #237. Test: change password changes default API key

Author: zachmullen

modules/api/controllers/ConfigController.php

@@ -1,20 +1,21 @@
 <?php
 
+/** api config controller */
 class Api_ConfigController extends Api_AppController
 {
-   public $_moduleForms=array('Config');
-   public $_components=array('Utility', 'Date');
-   public $_moduleModels=array('Userapi');
+  public $_moduleForms = array('Config');
+  public $_components = array('Utility', 'Date');
+  public $_moduleModels = array('Userapi');
+
+  /** user config*/
+  function usertabAction()
+    {
+    $this->_helper->layout->disableLayout();
+    if(!$this->logged)
+      {
+      throw new Zend_Exception('Please Log in');
+      }
 
-   /** user config*/
-   function usertabAction()
-     {
-     $this->_helper->layout->disableLayout();
-      if(!$this->logged)  
-        {
-        throw new Zend_Exception('Please Log in');
-        }
-        
     $this->view->Date = $this->Component->Date;
 
     $form = $this->ModuleForm->Config->createKeyForm();
@@ -29,7 +30,7 @@ function usertabAction()
       $this->_helper->viewRenderer->setNoRender();
       $applicationName      = $this->_getParam('appplication_name');
       $tokenExperiationTime = $this->_getParam('expiration');
-      $userapiDao = $this->Api_Userapi->createKey($this->userSession->Dao,$applicationName,$tokenExperiationTime);
+      $userapiDao = $this->Api_Userapi->createKey($this->userSession->Dao, $applicationName, $tokenExperiationTime);
       if($userapiDao != false)
         {
         echo JsonComponent::encode(array(true, $this->t('Changes saved')));
@@ -45,7 +46,7 @@ function usertabAction()
       $element = $this->_getParam('element');
       $userapiDao = $this->Api_Userapi->load($element);
       // Make sure the key belongs to the user
-      if($userapiDao !=false && ($userapiDao->getUserId() == $this->userSession->Dao->getKey() ||$this->userSession->Dao->isAdmin()))
+      if($userapiDao != false && ($userapiDao->getUserId() == $this->userSession->Dao->getKey() || $this->userSession->Dao->isAdmin()))
         {
         $this->Api_Userapi->delete($userapiDao);
         echo JsonComponent::encode(array(true, $this->t('Changes saved')));
@@ -61,15 +62,15 @@ function usertabAction()
     $userapiDaos = $this->Api_Userapi->getByUser($this->userSession->Dao);
     $this->view->userapiDaos = $userapiDaos;
     }
-   
-   /** index action*/
-   function indexAction()
+
+  /** index action*/
+  function indexAction()
     {
-    if(!$this->logged||!$this->userSession->Dao->getAdmin()==1)
+    if(!$this->logged || !$this->userSession->Dao->getAdmin() == 1)
       {
       throw new Zend_Exception("You should be an administrator");
       }
-      
+
     if(file_exists(BASE_PATH."/core/configs/api.local.ini"))
       {
       $applicationConfig = parse_ini_file(BASE_PATH."/core/configs/api.local.ini", true);
@@ -79,12 +80,12 @@ function indexAction()
       $applicationConfig = parse_ini_file(BASE_PATH.'/modules/api/configs/module.ini', true);
       }
     $configForm = $this->ModuleForm->Config->createConfigForm();
-    
-    $formArray = $this->getFormAsArray($configForm);    
+
+    $formArray = $this->getFormAsArray($configForm);
     $formArray['methodprefix']->setValue($applicationConfig['global']['methodprefix']);
-    
+
     $this->view->configForm = $formArray;
-    
+
     if($this->_request->isPost())
       {
       $this->_helper->layout->disableLayout();
@@ -98,13 +99,13 @@ function indexAction()
           }
         if(file_exists(BASE_PATH."/core/configs/api.local.ini"))
           {
-          rename(BASE_PATH."/core/configs/api.local.ini",BASE_PATH."/core/configs/api.local.ini.old");
+          rename(BASE_PATH."/core/configs/api.local.ini", BASE_PATH."/core/configs/api.local.ini.old");
           }
         $applicationConfig['global']['methodprefix'] = $this->_getParam('methodprefix');
         $this->Component->Utility->createInitFile(BASE_PATH."/core/configs/api.local.ini", $applicationConfig);
         echo JsonComponent::encode(array(true, 'Changed saved'));
         }
       }
-    } 
-    
+    }
+
 }//end class