Consistently indent class and function braces

core/ApiController.php

@@ -216,4 +216,4 @@ public function optionsAction()
     $this->_response->setHeader('Allow', 'OPTIONS');
     }
 
-  } //end class
+  } // end class

core/AppController.php

@@ -668,4 +668,4 @@ protected function t($text)
   var $Setting;
 
   /**end completion eclipse */
-  }//end class
+  } // end class

core/AppForm.php

@@ -35,4 +35,4 @@ protected  function t($text)
     Zend_Loader::loadClass("InternationalizationComponent", BASE_PATH.'/core/controllers/components');
     return InternationalizationComponent::translate($text);
     }//en method t
-  }//end class
+  } // end class

core/GlobalComponent.php

@@ -23,7 +23,7 @@
  *  Provides global function to the components
  */
 class MIDAS_GlobalComponent extends Zend_Controller_Action_Helper_Abstract
-{
+  {
   /**
    * Get Logger
    * @return Zend_Log
@@ -32,4 +32,4 @@ public function getLogger()
     {
     return Zend_Registry::get('logger');
     }
-} // end class
+  } // end class

core/GlobalController.php

@@ -17,6 +17,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 =========================================================================*/
+
 require_once BASE_PATH.'/core/controllers/components/UtilityComponent.php';
 
 /**
@@ -25,7 +26,6 @@
  */
 class MIDAS_GlobalController extends Zend_Controller_Action
   {
-
   protected $Models = array();
 
   /** contructor*/
@@ -345,4 +345,4 @@ public function getFormAsArray(Zend_Form $form)
       }
     return $array;
     }
-} // end class
+  } // end class

core/MidasLoader.php

@@ -23,7 +23,7 @@
  * It handles importing the required file and instantiating the object of the desired type.
  */
 class MidasLoader
-{
+  {
   /**
    * Load a component
    * @param component The name of the component to load
@@ -187,4 +187,4 @@ public static function newDao($name, $module = 'core')
       return new $classname;
       }
     }
-} // end class
+  } // end class

core/Notification.php

@@ -96,4 +96,4 @@ public function tokenAuth($params)
     $token = $params['authToken'];
     return $this->Component->Authentication->getUser(array('token' => $token), null);
     }
-  } //end class
+  } // end class

core/controllers/AdminController.php

@@ -22,7 +22,7 @@
  * Admin Controller
  */
 class AdminController extends AppController
-{
+  {
   public $_models = array('Assetstore', 'Bitstream', 'Errorlog', 'Item', 'ItemRevision', 'Folder', 'License');
   public $_daos = array();
   public $_components = array('Upgrade', 'Utility', 'MIDAS2Migration', 'Demo');
@@ -715,5 +715,4 @@ function migratemidas2Action()
 
     // Display the form
     }
-
-} // end class
+  } // end class

core/controllers/ApidocsController.php

@@ -22,7 +22,7 @@
  * Apidocs Controller for WebApi
  **/
 class ApidocsController extends AppController
-{
+  {
   public $_components = array('Apidocs');
 
   /** init api actions*/
@@ -79,5 +79,4 @@ public function __call($name, $args)
     $results = $this->Component->Apidocs->getResourceApiDocs($resource, $module);
     echo JsonComponent::encode($results);
     }
-
-}
+  }

core/controllers/ApikeyController.php

@@ -20,7 +20,7 @@
 
 /** Apikey controller for Web Api */
 class ApikeyController extends AppController
-{
+  {
   public $_models = array('User', 'Userapi');
   public $_forms = array('Apikey');
   public $_components = array('Date');
@@ -92,5 +92,4 @@ function usertabAction()
     $this->view->userapiDaos = $userapiDaos;
     $this->view->user = $user;
     }
-
-}//end class
+  } // end class

core/controllers/AssetstoreController.php

@@ -24,7 +24,6 @@
  */
 class AssetstoreController extends AppController
   {
-
   public $_models = array('Assetstore', 'Bitstream', 'Progress', 'Setting');
   public $_daos = array('Assetstore');
   public $_components = array('Utility');
@@ -262,5 +261,4 @@ function movecontentsAction()
 
     echo JsonComponent::encode(array('status' => 'ok', 'message' => 'Bitstreams moved'));
     }
-} // end class
-
+  } // end class

core/controllers/BrowseController.php

@@ -22,7 +22,7 @@
  *  AJAX request for the admin Controller
  */
 class BrowseController extends AppController
-{
+  {
   public $_models = array('User', 'Community', 'Folder', 'Item', 'ItemRevision');
   public $_daos = array('User', 'Community', 'Folder', 'Item');
   public $_components = array('Date', 'Utility', 'Sortdao');
@@ -645,4 +645,4 @@ public function deleteAction()
       }
     echo JsonComponent::encode($resp);
     }
-} // end class
+  } // end class

core/controllers/CommunityController.php

@@ -814,4 +814,4 @@ public function selectgroupAction()
         }
       }
     }
-  }//end class
+  } // end class

core/controllers/DownloadController.php

@@ -22,7 +22,7 @@
  *  Controller for downloading elements.
  */
 class DownloadController extends AppController
-{
+  {
   public $_models = array('Folder', 'Item', 'Community', 'User', 'Bitstream');
   public $_daos = array();
   public $_components = array('DownloadBitstream');
@@ -546,4 +546,4 @@ private function _downloadEmptyItem($item)
     $zip->finish();
     exit();
     }
-} // end class
+  } // end class

core/controllers/ErrorController.php

@@ -20,7 +20,7 @@
 
 /** Error Controller*/
 class ErrorController extends AppController
-{
+  {
   public $_models = array();
   public $_daos = array();
   public $_components = array('NotifyError', 'Utility');
@@ -154,4 +154,4 @@ private function _applicationError()
         $this->view->message = nl2br($fullMessage);
       }
     }
-}
+  }

core/controllers/FeedController.php

@@ -22,7 +22,7 @@
  *  AJAX request for the admin Controller
  */
 class FeedController extends AppController
-{
+  {
   public $_models = array('Feed', 'Item', 'User', 'Community');
   public $_daos = array();
   public $_components = array();
@@ -87,7 +87,5 @@ public function deleteajaxAction()
       return;
       }
     $this->Feed->delete($feed);
-    }//end deleteajaxAction
-
-} // end class
-
+    } //end deleteajaxAction
+  } // end class

core/controllers/FolderController.php

@@ -420,4 +420,4 @@ public function createfolderAction()
       }
     }// end createfolderAction
 
-  }//end class
+  } // end class

core/controllers/ImportController.php

@@ -419,4 +419,4 @@ function stopAction()
     return false;
     } // end stopAction
 
-} // end class
+  } // end class

core/controllers/IndexController.php

@@ -58,4 +58,4 @@ function nobrowserAction()
     $this->disableLayout();
     } // end method indexAction
 
-}//end class
+  } // end class

core/controllers/InstallController.php

@@ -22,7 +22,7 @@
  *  InstallController
  */
 class InstallController extends AppController
-{
+  {
   public $_models = array('User', 'Assetstore');
   public $_daos = array('Assetstore');
   public $_components = array('Utility');
@@ -353,6 +353,4 @@ public function testconnexionAction()
       }
     echo JsonComponent::encode($return);
     }//end getElementInfo
-
-} // end class
-
+  } // end class

core/controllers/ItemController.php

@@ -722,4 +722,4 @@ public function thumbnailAction()
       $downloadBitstreamComponent->download($bitstream);
       }
     }
-  }//end class
+  } // end class

core/controllers/LicenseController.php

@@ -23,7 +23,6 @@
  */
 class LicenseController extends AppController
   {
-
   public $_models = array('License');
   public $_daos = array('License');
   public $_components = array();
@@ -123,4 +122,4 @@ function createAction()
     $this->License->save($license);
     echo JsonComponent::encode(array(true, 'Created new license'));
     }
-}
+  }

core/controllers/ProgressController.php

@@ -23,7 +23,6 @@
  */
 class ProgressController extends AppController
   {
-
   public $_models = array('Progress');
   public $_daos = array();
   public $_components = array();
@@ -76,4 +75,4 @@ public function getAction()
       echo JsonComponent::encode($progress->toArray());
       }
     }
-}
+  }

core/controllers/SearchController.php

@@ -22,7 +22,7 @@
  *  Search controller
  */
 class SearchController extends AppController
-{
+  {
   public $_models = array('Item', 'Folder', 'User', 'Community', 'Group');
   public $_daos = array('Item', 'Folder', 'User', 'Community');
   public $_components = array('Sortdao', 'Date', 'Utility', 'Search');
@@ -336,6 +336,5 @@ public function liveAction()
 
     echo JsonComponent::encode($results);
     }
-
-} // end class
+  } // end class
 

core/controllers/ShareController.php

@@ -378,5 +378,5 @@ function linksAction()
     $this->view->viewUrl = $baseUrl.'/'.$type.'/'.$id;
     $this->view->downloadUrl = $baseUrl.'/download/'.$type.'/'.$id.'/'.urlencode($name);
     }
-  }//end class
+  } // end class
 

core/controllers/UploadController.php

@@ -788,4 +788,4 @@ public function reviewAction()
       $this->_redirect('/community/');
       }
     }
-}//end class
+  } // end class

core/controllers/UserController.php

@@ -1284,4 +1284,4 @@ public function deleteAction()
     $this->getLogger()->info('User '.$name.' successfully deleted');
     echo JsonComponent::encode(array(true, 'User '.$name.' successfully deleted'));
     }
-  }//end class
+  } // end class

core/controllers/api/BitstreamController.php

@@ -22,7 +22,7 @@
  *  WebApi Controller for Bitstream Resource
  */
 class Rest_BitstreamController extends ApiController
-{
+  {
   /**
    * The index action handles index/list requests; it should respond with a
    * list of the requested resources.
@@ -91,4 +91,4 @@ public function deleteAction()
     $apiFunctions['default'] = 'bitstreamDelete';
     $this->_genericAction($this->_request->getParams(), $this->_request->getControllerName(), 'delete', $apiFunctions);
     }
-}
+  }

core/controllers/api/CommunityController.php

@@ -22,8 +22,7 @@
  *  WebApi Controller for Community Resource
  */
 class Rest_CommunityController extends ApiController
-{
-
+  {
   /**
    * The index action handles index/list requests; it should respond with a
    * list of the requested resources.
@@ -89,5 +88,4 @@ public function optionsAction()
     {
     $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, DELETE');
     }
-
-}
+  }

core/controllers/api/FolderController.php

@@ -22,7 +22,7 @@
  *  WebApi Controller for Folder Resource
  */
 class Rest_FolderController extends ApiController
-{
+  {
   /**
    * The index action handles index/list requests; it should respond with a
    * list of the requested resources.
@@ -107,5 +107,4 @@ public function optionsAction()
     {
     $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, POST, PUT, DELETE');
     }
-
-}
+  }

core/controllers/api/GroupController.php

@@ -22,7 +22,7 @@
  *  WebApi Controller for Group Resource
  */
 class Rest_GroupController extends ApiController
-{
+  {
   /**
    * The index action handles index/list requests; it should respond with a
    * list of the requested resources.
@@ -98,5 +98,4 @@ public function optionsAction()
     {
     $this->_response->setHeader('Allow', 'OPTIONS, HEAD, GET, PUT, POST, DELETE');
     }
-
-}
+  }

core/controllers/api/IndexController.php

@@ -22,7 +22,7 @@
  * Index Controller for WebApi
  **/
 class Rest_IndexController extends AppController
-{
+  {
   public function preDispatch()
     {
     parent::preDispatch();
@@ -38,4 +38,4 @@ function indexAction()
     $this->view->header = $header;
     $this->view->serverURL = $this->getServerURL();
     }
-}
+  }