bb-drummer / my-application

module/Admin/src/Admin/Entity/User.php

Indentation +6 added lines, -6 removed lines

@@ -23,21 +23,21 @@ 
     
     /**
      * user's confirmation/activation token
-  *
+     *
      * @var string
      */
     protected $token;
 
     /**
      * user's ACL role
-  *
+     *
      * @var string
      */
     protected $aclrole;
 
     /**
      * user's ID
-  *
+     *
      * @var int
      */
     protected $user_id;
@@ -118,7 +118,7 @@ 
     
     /**
      * set user's object property data
-  *
+     *
      * @param  array   $data
      * @param  boolean $forceEncryptPassword
      * @return \Admin\Entity\User
@@ -156,7 +156,7 @@ 
     
     /**
      * get copy of user's object properties in an assosiative array
-  *
+     *
      * @return array
      */
     public function __getArrayCopy()
@@ -177,7 +177,7 @@ 
     
     /**
      * get copy of user's object properties in an assosiative array
-  *
+     *
      * @return array
      * /
     public function getArrayCopy() 

Spacing +9 added lines, -9 removed lines

@@ -125,30 +125,30 @@
      */
     public function exchangeArray($data = array(), $forceEncryptPassword = false)
     {
-        if (isset($data['id']) && !empty($data["id"]) ) {
+        if (isset($data['id']) && !empty($data["id"])) {
             $this->id            = ($data['id']);
             $this->user_id        = ($data['id']);
-        } elseif (isset($data['user_id']) && !empty($data["user_id"]) ) {
+        } elseif (isset($data['user_id']) && !empty($data["user_id"])) {
             $this->id            = ($data['user_id']);
             $this->user_id        = ($data['user_id']);
         }
-        $this->username        = (isset($data['username'])) ? $data['username'] : $this->username;
-        $this->email        = (isset($data['email'])) ? $data['email'] : $this->email;
-        if (isset($data['displayName']) ) {
+        $this->username = (isset($data['username'])) ? $data['username'] : $this->username;
+        $this->email = (isset($data['email'])) ? $data['email'] : $this->email;
+        if (isset($data['displayName'])) {
             $this->display_name    = $data['displayName'];
             $this->displayName    = $data['displayName'];
-        } elseif (isset($data['display_name']) ) {
+        } elseif (isset($data['display_name'])) {
             $this->display_name    = $data['display_name'];
             $this->displayName    = $data['display_name'];
         }
-        if (isset($data["password"]) && $forceEncryptPassword ) {
+        if (isset($data["password"]) && $forceEncryptPassword) {
             $bcrypt = new Bcrypt;
             $bcrypt->setCost(null); // @TODO $this->getUserService()->getOptions()->getPasswordCost());
             $data["password"] = $bcrypt->create($data['password']);
         }
-        $this->password        = (isset($data['password'])) ? $data['password'] : $this->password;
+        $this->password = (isset($data['password'])) ? $data['password'] : $this->password;
         $this->state        = (isset($data['state'])) ? $data['state'] : $this->state;
-        $this->aclrole        = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
+        $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole;
         $this->token        = (isset($data['token'])) ? $data['token'] : $this->token;
         
         return $this;

module/Admin/src/Admin/Controller/UsersController.php

Spacing +18 added lines, -18 removed lines

@@ -78,11 +78,11 @@ 
     {
         $tmplVars = $this->getTemplateVars();
         $aUserlist = $this->getUserTable()->fetchAll();
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $aUserlist->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                     '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                         'admin/default',
@@ -139,7 +139,7 @@ 
                 $user->exchangeArray($form->getData());
                 $this->getUserTable()->saveUser($user);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -175,7 +175,7 @@ 
             return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
         }
 
-        $form    = new UserForm();
+        $form = new UserForm();
         $form->bind($user);
 
         $roles = $this->getAclroleTable()->fetchAll()->toArray();
@@ -192,7 +192,7 @@ 
             if ($form->isValid()) {
                 $this->getUserTable()->saveUser($user);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -240,7 +240,7 @@ 
                 $id = (int) $request->getPost('id');
                 $this->getUserTable()->deleteUser($id);
                 $this->flashMessenger()->addSuccessMessage($this->translate("user has been deleted"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/default', array('controller' => 'users'));
@@ -265,23 +265,23 @@ 
         $config = $this->getServiceLocator()->get('Config');
         $users = $this->getServiceLocator()->get('zfcuser_user_mapper');
         
-        $user_id    = $this->params()->fromRoute('user_id', '');
-        $token        = $this->params()->fromRoute('confirmtoken', '');
+        $user_id = $this->params()->fromRoute('user_id', '');
+        $token = $this->params()->fromRoute('confirmtoken', '');
         if (empty($user_id) || empty($token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("missing parameters"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
         
-        if (is_numeric($user_id) ) {
+        if (is_numeric($user_id)) {
             $oUser = $users->findById($user_id);
         } else {
             $oUser = $users->findByUsername($user_id);
         }
-        if (!$oUser ) {
+        if (!$oUser) {
             $this->flashMessenger()->addWarningMessage($this->translate("user could not be found"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
-        if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) {
+        if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("confirmation token is invalid"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
@@ -321,26 +321,26 @@ 
             $this->params()->fromPost(),
             array()
         );
-        $config    = $this->getServiceLocator()->get('Config');
-        $users    = $this->getServiceLocator()->get('zfcuser_user_mapper');
+        $config = $this->getServiceLocator()->get('Config');
+        $users = $this->getServiceLocator()->get('zfcuser_user_mapper');
         
-        $user_id    = $this->params()->fromRoute('user_id', '');
-        $token        = $this->params()->fromRoute('activatetoken', '');
+        $user_id = $this->params()->fromRoute('user_id', '');
+        $token = $this->params()->fromRoute('activatetoken', '');
         if (empty($user_id) || empty($token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("missing parameters"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
 
-        if (is_numeric($user_id) ) {
+        if (is_numeric($user_id)) {
             $oUser = $users->findById($user_id);
         } else {
             $oUser = $users->findByUsername($user_id);
         }
-        if (!$oUser ) {
+        if (!$oUser) {
             $this->flashMessenger()->addWarningMessage($this->translate("user could not be found"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }
-        if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) {
+        if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) {
             $this->flashMessenger()->addWarningMessage($this->translate("activation token is invalid"));
             return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array());
         }

Indentation +9 added lines, -9 removed lines

@@ -26,15 +26,15 @@
 class UsersController extends BaseActionController
 {
 
-	/**
-	 * @var array|\Admin\Model\UserTable
-	 */
-	protected $userTable;
-
-	/**
-	 * @var array|\Admin\Model\AclroleTable
-	 */
-	protected $AclroleTable;
+    /**
+     * @var array|\Admin\Model\UserTable
+     */
+    protected $userTable;
+
+    /**
+     * @var array|\Admin\Model\AclroleTable
+     */
+    protected $AclroleTable;
 
     /**
      * initialize titles and toolbar items

module/Admin/src/Admin/Controller/RedirectCallback.php

Indentation +1 added lines, -2 removed lines

@@ -144,6 +144,5 @@
             return $this->router->assemble(array(), array('name' => 'zfcuser'));
         }
     } 
-    
-    */
+     */
 }

module/Admin/src/Admin/Controller/AclController.php

Indentation +17 added lines, -17 removed lines

@@ -32,20 +32,20 @@ 
 class AclController extends BaseActionController
 {
 	
-	/**
-	 * @var array|\Admin\Model\AclTable
-	 */
-	protected $AclTable;
+    /**
+     * @var array|\Admin\Model\AclTable
+     */
+    protected $AclTable;
 	
-	/**
-	 * @var array|\Admin\Model\AclroleTable
-	 */
-	protected $AclroleTable;
+    /**
+     * @var array|\Admin\Model\AclroleTable
+     */
+    protected $AclroleTable;
 	
-	/**
-	 * @var array|\Admin\Model\AclresourceTable
-	 */
-	protected $AclresourceTable;
+    /**
+     * @var array|\Admin\Model\AclresourceTable
+     */
+    protected $AclresourceTable;
 
     /**
      * initialize titles and toolbar items
@@ -96,8 +96,8 @@ 
                         'action' => 'roles',
                         'resource' => 'mvc:user',
                     ),
-                  ),
-               "roles" => array(
+                    ),
+                "roles" => array(
                     array(
                         'label' => 'add role',
                         'icon' => 'plus',
@@ -127,8 +127,8 @@ 
                         'action' => 'resources',
                         'resource' => 'mvc:user',
                     ),
-               ),
-               "resources" => array(
+                ),
+                "resources" => array(
                     array(
                         'label' => 'add resource',
                         'icon' => 'plus',
@@ -158,7 +158,7 @@ 
                         'action' => 'roles',
                         'resource' => 'mvc:user',
                     ),
-               ),
+                ),
             )
         );
         $this->setActionTitles(

Spacing +19 added lines, -19 removed lines

@@ -212,7 +212,7 @@ 
      */
     public function acldataAction()
     {
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $roles = $this->getAclroleTable()->fetchAll()->toArray();
             $resources = $this->getAclresourceTable()->fetchAll()->toArray();
             $acls = array();
@@ -235,7 +235,7 @@ 
             );
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                         (empty($row["acl_id"]) ? 
                             '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
@@ -269,11 +269,11 @@ 
     public function rolesAction()
     {
 
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $this->getAclroleTable()->fetchAll()->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                         '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                             'admin/acledit',
@@ -305,11 +305,11 @@ 
      */
     public function resourcesAction()
     {
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $this->getAclresourceTable()->fetchAll()->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                     '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                         'admin/acledit',
@@ -387,7 +387,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array());
@@ -466,7 +466,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array());
@@ -521,7 +521,7 @@ 
             }
 
             // Redirect to list of albums
-            if ( $this->isXHR() ) {
+            if ($this->isXHR()) {
                 $tmplVars["showForm"] = false;
             } else {
                 return $this->redirect()->toRoute('admin/acledit', array());
@@ -561,7 +561,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles'));
@@ -600,7 +600,7 @@ 
             return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles'));
         }
 
-        $form  = new AclroleForm();
+        $form = new AclroleForm();
         $form->bind($Aclrole);
 
         $request = $this->getRequest();
@@ -615,7 +615,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles'));
@@ -671,7 +671,7 @@ 
             }
 
             // Redirect to list of albums
-            if ( $this->isXHR() ) {
+            if ($this->isXHR()) {
                 $tmplVars["showForm"] = false;
             } else {
                 return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles'));
@@ -713,7 +713,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources'));
@@ -752,7 +752,7 @@ 
             return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources'));
         }
 
-        $form  = new AclresourceForm();
+        $form = new AclresourceForm();
         $form->bind($Aclresource);
 
         $request = $this->getRequest();
@@ -767,7 +767,7 @@ 
                 
                 // Redirect to list of Acl
                 $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources'));
@@ -824,7 +824,7 @@ 
             }
             
             // Redirect to list of albums
-            if ( $this->isXHR() ) {
+            if ($this->isXHR()) {
                 $tmplVars["showForm"] = false;
             } else {
                 return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources'));
@@ -839,8 +839,8 @@ 
      * re-initialize, respectively clear ACL cache entries
      * @return self
      */
-    private function reinitACLCache () {
-        if ( \Application\Module::getService('CacheService') ) {
+    private function reinitACLCache() {
+        if (\Application\Module::getService('CacheService')) {
             \Application\Module::getService('CacheService')->removeItem('ACL');
             \Admin\Module::initACL($this->getServiceLocator());
         }

module/Admin/src/Admin/Controller/ApplicationsController.php

Indentation +8 added lines, -8 removed lines

@@ -23,15 +23,15 @@
 class ApplicationsController extends BaseActionController
 {
 	
-	/**
-	 * @var array|\Admin\Model\ClientsTable
-	 */
-	protected $clientsTable;
+    /**
+     * @var array|\Admin\Model\ClientsTable
+     */
+    protected $clientsTable;
 	
-	/**
-	 * @var array|\Admin\Model\ApplicationsTable
-	 */
-	protected $applicationsTable;
+    /**
+     * @var array|\Admin\Model\ApplicationsTable
+     */
+    protected $applicationsTable;
     
     /**
      * initialize titles and toolbar items

Spacing +7 added lines, -7 removed lines

@@ -83,12 +83,12 @@ 
         $dataObj = array();
         foreach ($aApplicationslist as $row) {
             $data[] = $row;
-            $dataObj[] = (object)$row;
+            $dataObj[] = (object) $row;
         }
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $data);
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                     '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                         'admin/applicationsedit',
@@ -143,7 +143,7 @@ 
                 $applications->exchangeArray($form->getData());
                 $this->getApplicationsTable()->saveApplication($applications);
                 $this->flashMessenger()->addSuccessMessage($this->translate('application has been saved'));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index'));
@@ -183,7 +183,7 @@ 
             return $this->redirect()->toRoute('admin/applicationsedit');
         }
 
-        $form  = new ApplicationsForm();
+        $form = new ApplicationsForm();
         $form->bind($applications);
 
         $clients = $this->getClientsTable()->fetchAll()->toArray();
@@ -201,7 +201,7 @@ 
             if ($form->isValid()) {
                 $this->getApplicationsTable()->saveApplication($applications);
                 $this->flashMessenger()->addSuccessMessage($this->translate("application has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index'));
@@ -249,7 +249,7 @@ 
                 $id = (int) $request->getPost('id');
                 $this->getApplicationsTable()->deleteApplication($id);
                 $this->flashMessenger()->addSuccessMessage($this->translate("application has been deleted"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index'));

module/Admin/src/Admin/Controller/IndexController.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      * redirect to acl section
      * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel
      */
-	public function indexAction()
+    public function indexAction()
     {
         return $this->redirect()->toRoute('admin/acledit', array());
     }

module/Admin/src/Admin/Controller/ZfcuserController.php

Indentation +7 added lines, -7 removed lines

@@ -46,9 +46,9 @@ 
  */
 class ZfcuserController extends UserController
 {
-	use ControllerTranslatorTrait;
-	use ControllerActiontitlesTrait;
-	use ControllerToolbarTrait;
+    use ControllerTranslatorTrait;
+    use ControllerActiontitlesTrait;
+    use ControllerToolbarTrait;
 	
     /**
      * 
@@ -210,7 +210,7 @@ 
             // ...redirect to the login redirect route
             return $this->redirect()->toRoute('zfcuser/login'); //$this->getOptions()->getLoginRedirectRoute());
         }
-    	$oIdentity = $this->zfcUserAuthentication()->getIdentity();
+        $oIdentity = $this->zfcUserAuthentication()->getIdentity();
         $oProfile = new \Admin\Model\UserProfile();
         $oProfile->load($oIdentity->getId());
         
@@ -766,7 +766,7 @@ 
             $sm = $this->getServiceLocator();
             $this->userTable = $sm->get('Admin\Model\UserTable');
             if (!$this->userTable instanceof \Admin\Model\UserTable) {
-            	throw new \Exception("invalid user table object: ".gettype($this->userTable));
+                throw new \Exception("invalid user table object: ".gettype($this->userTable));
             }
         }
         return $this->userTable;
@@ -784,7 +784,7 @@ 
             $sm = $this->getServiceLocator();
             $this->aclroleTable = $sm->get('Admin\Model\AclroleTable');
             if (!$this->aclroleTable instanceof \Admin\Model\AclroleTable) {
-            	throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable));
+                throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable));
             }
         }
         return $this->aclroleTable;
@@ -798,7 +798,7 @@ 
      */
     public function getOptions()
     {
-    	return \Application\Module::getService('zfcuser_module_options');
+        return \Application\Module::getService('zfcuser_module_options');
     } 
     
 }

Spacing +30 added lines, -30 removed lines

@@ -377,8 +377,8 @@ 
         $request    = $this->getRequest();
         //$service    = $this->getUserService();
         $service    = \Application\Module::getService('zfcuser_user_service');
-        $form        = new RequestPasswordResetForm(null, $options);
-        $translator    = $this->getTranslator();
+        $form = new RequestPasswordResetForm(null, $options);
+        $translator = $this->getTranslator();
         
         // if password reset is disabled
         if (!$config['zfcuser']['enable_passwordreset']) {
@@ -391,7 +391,7 @@ 
             $redirect = false;
         }
 
-        $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset') . ($redirect ? '?redirect=' . rawurlencode($redirect) : '');
+        $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset').($redirect ? '?redirect='.rawurlencode($redirect) : '');
         
         if (!$request->isPost()) {
             return array(
@@ -439,7 +439,7 @@ 
             sprintf($translator->translate("password reset email has been sent to user '%s'"), $identity)
         );
         
-        return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) . ($redirect ? '?redirect='. rawurlencode($redirect) : ''));
+        return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]).($redirect ? '?redirect='.rawurlencode($redirect) : ''));
             
     }
 
@@ -465,8 +465,8 @@ 
         $request    = $this->getRequest();
         //$service    = $this->getUserService();
         $service    = \Application\Module::getService('zfcuser_user_service');
-        $form        = new ResetPasswordForm(null, $options);
-        $translator    = $this->getTranslator();
+        $form = new ResetPasswordForm(null, $options);
+        $translator = $this->getTranslator();
         
         // if password reset is disabled
         if (!$config['zfcuser']['enable_passwordreset']) {
@@ -479,9 +479,9 @@ 
             $redirect = false;
         }
 
-        $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN) . ($redirect ? '?redirect=' . rawurlencode($redirect) : '');
+        $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN).($redirect ? '?redirect='.rawurlencode($redirect) : '');
         
-        if (!$request->isPost() ) {
+        if (!$request->isPost()) {
             
             $user = false;
             $userId = (int) $this->params()->fromRoute('user_id');
@@ -490,14 +490,14 @@ 
             $userTable = \Application\Module::getService('zfcuser_user_mapper');
             $user = $userTable->findById($userId);
             
-            if (!$user ) {
+            if (!$user) {
                 $this->flashMessenger()->addWarningMessage(
                     sprintf($translator->translate("invalid request"), '')
                 );
                 return $this->redirect()->toUrl($redirectUrl);
             }
             
-            if (empty($resetToken) || ($resetToken != $user->getToken()) ) {
+            if (empty($resetToken) || ($resetToken != $user->getToken())) {
                 $this->flashMessenger()->addWarningMessage(
                     sprintf($translator->translate("invalid request"), '')
                 );
@@ -526,23 +526,23 @@ 
         $userTable = \Application\Module::getService('zfcuser_user_mapper');
         $user = $userTable->findByEmail($userId);
             
-        if (!$user ) {
+        if (!$user) {
             $this->flashMessenger()->addWarningMessage(
                 sprintf($translator->translate("invalid request"), $userId)
             );
             return $this->redirect()->toUrl($redirectUrl);
         }
         
-        if (empty($resetToken) || ($resetToken != $user->getToken()) ) {
+        if (empty($resetToken) || ($resetToken != $user->getToken())) {
             $this->flashMessenger()->addWarningMessage(
                 sprintf($translator->translate("invalid request"), $resetToken)
             );
             return $this->redirect()->toUrl($redirectUrl);
         }
         
-        $form->setData((array)$this->params()->fromPost());
+        $form->setData((array) $this->params()->fromPost());
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             return array(
             'user' => $user,
@@ -568,7 +568,7 @@ 
             );
             return $this->redirect()->toUrl(
                 $this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) 
-                . ($redirect ? '?redirect='. rawurlencode($redirect) : '')
+                . ($redirect ? '?redirect='.rawurlencode($redirect) : '')
             );
             
         }
@@ -603,11 +603,11 @@ 
             return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());
         }
         
-        $form        = new UserDataForm();
-        $translator    = $this->getTranslator();
+        $form = new UserDataForm();
+        $translator = $this->getTranslator();
         
         /** @var \Admin\Entity\User $oIdentity */
-        $oIdentity        = $this->zfcUserAuthentication()->getIdentity();
+        $oIdentity = $this->zfcUserAuthentication()->getIdentity();
         /** @var \Admin\Model\UserData $oUser */
         $oUser         = new \Admin\Model\UserData();
         
@@ -616,7 +616,7 @@ 
 
         $form->bind($oUser);
     
-        if (!$this->getRequest()->isPost() ) {
+        if (!$this->getRequest()->isPost()) {
             
             return new ViewModel(
                 array(
@@ -629,10 +629,10 @@ 
             
         }
         
-        $data = (array)$this->params()->fromPost();
+        $data = (array) $this->params()->fromPost();
         $form->setData($data);
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             $this->flashMessenger()->addWarningMessage(
                 $translator->translate("user data could not be changed")
@@ -658,7 +658,7 @@ 
                 $translator->translate("user data has been changed")
             );
 
-            if ($this->getRequest()->isXmlHttpRequest() ) {
+            if ($this->getRequest()->isXmlHttpRequest()) {
                 return new ViewModel(
                     array(
                     'showForm'      => false,
@@ -688,19 +688,19 @@ 
             return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());
         }
         
-        $form        = new UserProfileForm();
-        $translator    = $this->getTranslator();
+        $form = new UserProfileForm();
+        $translator = $this->getTranslator();
         /**
          * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request
          */
         $request    = $this->getRequest();
-        $user        = $this->zfcUserAuthentication()->getIdentity();
-        $userId        = (int) $user->getId();
+        $user = $this->zfcUserAuthentication()->getIdentity();
+        $userId = (int) $user->getId();
         $profile    = new UserProfile;
         $profile->load($userId);
         $form->bind($profile);
         
-        if (!$this->getRequest()->isPost() ) {
+        if (!$this->getRequest()->isPost()) {
             
             return array(
                 'showForm'        => true,
@@ -711,10 +711,10 @@ 
             
         }
         
-        $data = (array)$this->params()->fromPost();
+        $data = (array) $this->params()->fromPost();
         $form->setData($data);
         
-        if (!$form->isValid() ) {
+        if (!$form->isValid()) {
             
             $this->flashMessenger()->addWarningMessage(
                 $translator->translate("user profile data could not be changed")
@@ -735,7 +735,7 @@ 
                 $translator->translate("user profile data has been changed")
             );
             
-            if ($request->isXmlHttpRequest() ) {
+            if ($request->isXmlHttpRequest()) {
                 $response = array(
                     'showForm'          => false,
                     'user'                => $user,

module/Admin/src/Admin/Controller/ClientsController.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 class ClientsController extends BaseActionController
 {
 	
-	/**
-	 * @var array|\Admin\Model\ClientsTable
-	 */
-	protected $clientsTable;
+    /**
+     * @var array|\Admin\Model\ClientsTable
+     */
+    protected $clientsTable;
     
     /**
      * initialize titles and toolbar items

Spacing +6 added lines, -6 removed lines

@@ -69,11 +69,11 @@ 
     {
         $tmplVars = $this->getTemplateVars();
         $aClientslist = $this->getClientsTable()->fetchAll();
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $aClientslist->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                         '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                             'admin/clientsedit',
@@ -121,7 +121,7 @@ 
                 $clients->exchangeArray($form->getData());
                 $this->getClientsTable()->saveClients($clients);
                 $this->flashMessenger()->addSuccessMessage($this->translate('client has been saved'));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index'));
@@ -161,7 +161,7 @@ 
             return $this->redirect()->toRoute('admin/clientsedit');
         }
 
-        $form  = new ClientsForm();
+        $form = new ClientsForm();
         $form->bind($clients);
 
         $request = $this->getRequest();
@@ -172,7 +172,7 @@ 
             if ($form->isValid()) {
                 $this->getClientsTable()->saveClients($clients);
                 $this->flashMessenger()->addSuccessMessage($this->translate("client has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index'));
@@ -221,7 +221,7 @@ 
                 $id = (int) $request->getPost('id');
                 $this->getClientsTable()->deleteClients($id);
                 $this->flashMessenger()->addSuccessMessage($this->translate("client has been deleted"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index'));

module/Admin/src/Admin/Controller/SettingsController.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 class SettingsController extends BaseActionController
 {
 	
-	/**
-	 * @var array|\Admin\Model\SettingsTable
-	 */
+    /**
+     * @var array|\Admin\Model\SettingsTable
+     */
     protected $settingsTable;
     
     /**

Spacing +6 added lines, -6 removed lines

@@ -69,11 +69,11 @@ 
     {
         $tmplVars = $this->getTemplateVars();
         $aSettingslist = $this->getSettingsTable()->fetchAll();
-        if ( $this->isXHR() ) {
+        if ($this->isXHR()) {
             $datatablesData = array('data' => $aSettingslist->toArray());
             $oController = $this;
             $datatablesData['data'] = array_map(
-                function ($row) use ($oController) {
+                function($row) use ($oController) {
                     $actions = '<div class="button-group tiny btn-group btn-group-xs">'.
                     '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute(
                         'admin/settingsedit',
@@ -121,7 +121,7 @@ 
                 $settings->exchangeArray($form->getData());
                 $this->getSettingsTable()->saveSettings($settings);
                 $this->flashMessenger()->addSuccessMessage($this->translate('setting has been saved'));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index'));
@@ -161,7 +161,7 @@ 
             return $this->redirect()->toRoute('admin/settingsedit');
         }
 
-        $form  = new SettingsForm();
+        $form = new SettingsForm();
         $form->bind($settings);
 
         $request = $this->getRequest();
@@ -172,7 +172,7 @@ 
             if ($form->isValid()) {
                 $this->getSettingsTable()->saveSettings($settings);
                 $this->flashMessenger()->addSuccessMessage($this->translate("setting has been saved"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index'));
@@ -221,7 +221,7 @@ 
                 $id = (int) $request->getPost('id');
                 $this->getSettingsTable()->deleteSettings($id);
                 $this->flashMessenger()->addSuccessMessage($this->translate("setting has been deleted"));
-                if ( $this->isXHR() ) {
+                if ($this->isXHR()) {
                     $tmplVars["showForm"] = false;
                 } else {
                     return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index'));