bb-drummer / my-application

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'));

module/Admin/src/Admin/Form/UserProfileForm.php

Indentation +5 added lines, -5 removed lines

@@ -82,11 +82,11 @@
             array(
             'name' => 'facebook',
             'attributes' => array(
-                   'type'  => 'url',
-               ),
-               'options' => array(
-                   'label' => 'Facebook',
-               ),
+                    'type'  => 'url',
+                ),
+                'options' => array(
+                    'label' => 'Facebook',
+                ),
             )
         );
         $this->add(

module/Admin/src/Admin/Form/AclroleForm.php

Indentation +4 added lines, -4 removed lines

@@ -76,10 +76,10 @@
             array(
             'name' => 'reset',
             'attributes' => array(
-                   'type'  => 'reset',
-                  'value' => 'reset',
-                  'id' => 'resetbutton',
-               ),
+                    'type'  => 'reset',
+                    'value' => 'reset',
+                    'id' => 'resetbutton',
+                ),
             'options' => array(
             'label' => 'reset',
             ),

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             array(
             'name' => 'aclroles_id',
             'attributes' => array(
-            'type'  => 'hidden' ,
+            'type'  => 'hidden',
             ),
             )
         );

module/Admin/src/Admin/Form/RequestPasswordResetForm.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $label = $emailElement->getLabel('label');
         // @TODO: make translation-friendly
         foreach ($this->getAuthenticationOptions()->getAuthIdentityFields() as $mode) {
-            $label = (!empty($label) ? $label . ' or ' : '') . ucfirst($mode);
+            $label = (!empty($label) ? $label.' or ' : '').ucfirst($mode);
         }
         $emailElement->setLabel($label);
         

module/Admin/src/Admin/Factory/UserTableFactory.php

Spacing +4 added lines, -4 removed lines

@@ -39,11 +39,11 @@
      */
     public function createService(ServiceLocatorInterface $serviceLocator)
     {
-        $dbAdapter            = $serviceLocator->get('Zend\Db\Adapter\Adapter');
-        $resultSetPrototype    = new ResultSet();
+        $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter');
+        $resultSetPrototype = new ResultSet();
         $resultSetPrototype->setArrayObjectPrototype(new User());
-        $tableGateway        = new TableGateway('user', $dbAdapter, null, $resultSetPrototype);
-        $table                = new UserTable($tableGateway);
+        $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype);
+        $table = new UserTable($tableGateway);
         return $table;
     }
 }
\ No newline at end of file