@@ -78,11 +78,11 @@ discard block |
||
| 78 | 78 | { |
| 79 | 79 | $tmplVars = $this->getTemplateVars(); |
| 80 | 80 | $aUserlist = $this->getUserTable()->fetchAll(); |
| 81 | - if ( $this->isXHR() ) { |
|
| 81 | + if ($this->isXHR()) { |
|
| 82 | 82 | $datatablesData = array('data' => $aUserlist->toArray()); |
| 83 | 83 | $oController = $this; |
| 84 | 84 | $datatablesData['data'] = array_map( |
| 85 | - function ($row) use ($oController) { |
|
| 85 | + function($row) use ($oController) { |
|
| 86 | 86 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 87 | 87 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 88 | 88 | 'admin/default', |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | $user->exchangeArray($form->getData()); |
| 140 | 140 | $this->getUserTable()->saveUser($user); |
| 141 | 141 | $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved")); |
| 142 | - if ( $this->isXHR() ) { |
|
| 142 | + if ($this->isXHR()) { |
|
| 143 | 143 | $tmplVars["showForm"] = false; |
| 144 | 144 | } else { |
| 145 | 145 | return $this->redirect()->toRoute('admin/default', array('controller' => 'users')); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | return $this->redirect()->toRoute('admin/default', array('controller' => 'users')); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - $form = new UserForm(); |
|
| 178 | + $form = new UserForm(); |
|
| 179 | 179 | $form->bind($user); |
| 180 | 180 | |
| 181 | 181 | $roles = $this->getAclroleTable()->fetchAll()->toArray(); |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | if ($form->isValid()) { |
| 193 | 193 | $this->getUserTable()->saveUser($user); |
| 194 | 194 | $this->flashMessenger()->addSuccessMessage($this->translate("user has been saved")); |
| 195 | - if ( $this->isXHR() ) { |
|
| 195 | + if ($this->isXHR()) { |
|
| 196 | 196 | $tmplVars["showForm"] = false; |
| 197 | 197 | } else { |
| 198 | 198 | return $this->redirect()->toRoute('admin/default', array('controller' => 'users')); |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $id = (int) $request->getPost('id'); |
| 241 | 241 | $this->getUserTable()->deleteUser($id); |
| 242 | 242 | $this->flashMessenger()->addSuccessMessage($this->translate("user has been deleted")); |
| 243 | - if ( $this->isXHR() ) { |
|
| 243 | + if ($this->isXHR()) { |
|
| 244 | 244 | $tmplVars["showForm"] = false; |
| 245 | 245 | } else { |
| 246 | 246 | return $this->redirect()->toRoute('admin/default', array('controller' => 'users')); |
@@ -265,23 +265,23 @@ discard block |
||
| 265 | 265 | $config = $this->getServiceLocator()->get('Config'); |
| 266 | 266 | $users = $this->getServiceLocator()->get('zfcuser_user_mapper'); |
| 267 | 267 | |
| 268 | - $user_id = $this->params()->fromRoute('user_id', ''); |
|
| 269 | - $token = $this->params()->fromRoute('confirmtoken', ''); |
|
| 268 | + $user_id = $this->params()->fromRoute('user_id', ''); |
|
| 269 | + $token = $this->params()->fromRoute('confirmtoken', ''); |
|
| 270 | 270 | if (empty($user_id) || empty($token)) { |
| 271 | 271 | $this->flashMessenger()->addWarningMessage($this->translate("missing parameters")); |
| 272 | 272 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | - if (is_numeric($user_id) ) { |
|
| 275 | + if (is_numeric($user_id)) { |
|
| 276 | 276 | $oUser = $users->findById($user_id); |
| 277 | 277 | } else { |
| 278 | 278 | $oUser = $users->findByUsername($user_id); |
| 279 | 279 | } |
| 280 | - if (!$oUser ) { |
|
| 280 | + if (!$oUser) { |
|
| 281 | 281 | $this->flashMessenger()->addWarningMessage($this->translate("user could not be found")); |
| 282 | 282 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 283 | 283 | } |
| 284 | - if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) { |
|
| 284 | + if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) { |
|
| 285 | 285 | $this->flashMessenger()->addWarningMessage($this->translate("confirmation token is invalid")); |
| 286 | 286 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 287 | 287 | } |
@@ -321,26 +321,26 @@ discard block |
||
| 321 | 321 | $this->params()->fromPost(), |
| 322 | 322 | array() |
| 323 | 323 | ); |
| 324 | - $config = $this->getServiceLocator()->get('Config'); |
|
| 325 | - $users = $this->getServiceLocator()->get('zfcuser_user_mapper'); |
|
| 324 | + $config = $this->getServiceLocator()->get('Config'); |
|
| 325 | + $users = $this->getServiceLocator()->get('zfcuser_user_mapper'); |
|
| 326 | 326 | |
| 327 | - $user_id = $this->params()->fromRoute('user_id', ''); |
|
| 328 | - $token = $this->params()->fromRoute('activatetoken', ''); |
|
| 327 | + $user_id = $this->params()->fromRoute('user_id', ''); |
|
| 328 | + $token = $this->params()->fromRoute('activatetoken', ''); |
|
| 329 | 329 | if (empty($user_id) || empty($token)) { |
| 330 | 330 | $this->flashMessenger()->addWarningMessage($this->translate("missing parameters")); |
| 331 | 331 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - if (is_numeric($user_id) ) { |
|
| 334 | + if (is_numeric($user_id)) { |
|
| 335 | 335 | $oUser = $users->findById($user_id); |
| 336 | 336 | } else { |
| 337 | 337 | $oUser = $users->findByUsername($user_id); |
| 338 | 338 | } |
| 339 | - if (!$oUser ) { |
|
| 339 | + if (!$oUser) { |
|
| 340 | 340 | $this->flashMessenger()->addWarningMessage($this->translate("user could not be found")); |
| 341 | 341 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 342 | 342 | } |
| 343 | - if (($oUser->getState() != 0) || ($oUser->getToken() != $token) ) { |
|
| 343 | + if (($oUser->getState() != 0) || ($oUser->getToken() != $token)) { |
|
| 344 | 344 | $this->flashMessenger()->addWarningMessage($this->translate("activation token is invalid")); |
| 345 | 345 | return $this->redirect()->toRoute($config["zfcuser_registration_redirect_route"], array()); |
| 346 | 346 | } |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | */ |
| 213 | 213 | public function acldataAction() |
| 214 | 214 | { |
| 215 | - if ( $this->isXHR() ) { |
|
| 215 | + if ($this->isXHR()) { |
|
| 216 | 216 | $roles = $this->getAclroleTable()->fetchAll()->toArray(); |
| 217 | 217 | $resources = $this->getAclresourceTable()->fetchAll()->toArray(); |
| 218 | 218 | $acls = array(); |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | ); |
| 236 | 236 | $oController = $this; |
| 237 | 237 | $datatablesData['data'] = array_map( |
| 238 | - function ($row) use ($oController) { |
|
| 238 | + function($row) use ($oController) { |
|
| 239 | 239 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 240 | 240 | (empty($row["acl_id"]) ? |
| 241 | 241 | '<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 @@ discard block |
||
| 269 | 269 | public function rolesAction() |
| 270 | 270 | { |
| 271 | 271 | |
| 272 | - if ( $this->isXHR() ) { |
|
| 272 | + if ($this->isXHR()) { |
|
| 273 | 273 | $datatablesData = array('data' => $this->getAclroleTable()->fetchAll()->toArray()); |
| 274 | 274 | $oController = $this; |
| 275 | 275 | $datatablesData['data'] = array_map( |
| 276 | - function ($row) use ($oController) { |
|
| 276 | + function($row) use ($oController) { |
|
| 277 | 277 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 278 | 278 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 279 | 279 | 'admin/acledit', |
@@ -305,11 +305,11 @@ discard block |
||
| 305 | 305 | */ |
| 306 | 306 | public function resourcesAction() |
| 307 | 307 | { |
| 308 | - if ( $this->isXHR() ) { |
|
| 308 | + if ($this->isXHR()) { |
|
| 309 | 309 | $datatablesData = array('data' => $this->getAclresourceTable()->fetchAll()->toArray()); |
| 310 | 310 | $oController = $this; |
| 311 | 311 | $datatablesData['data'] = array_map( |
| 312 | - function ($row) use ($oController) { |
|
| 312 | + function($row) use ($oController) { |
|
| 313 | 313 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 314 | 314 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 315 | 315 | 'admin/acledit', |
@@ -387,7 +387,7 @@ discard block |
||
| 387 | 387 | |
| 388 | 388 | // Redirect to list of Acl |
| 389 | 389 | $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved")); |
| 390 | - if ( $this->isXHR() ) { |
|
| 390 | + if ($this->isXHR()) { |
|
| 391 | 391 | $tmplVars["showForm"] = false; |
| 392 | 392 | } else { |
| 393 | 393 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -466,7 +466,7 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | // Redirect to list of Acl |
| 468 | 468 | $this->flashMessenger()->addSuccessMessage($this->translate("permission has been saved")); |
| 469 | - if ( $this->isXHR() ) { |
|
| 469 | + if ($this->isXHR()) { |
|
| 470 | 470 | $tmplVars["showForm"] = false; |
| 471 | 471 | } else { |
| 472 | 472 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -521,7 +521,7 @@ discard block |
||
| 521 | 521 | } |
| 522 | 522 | |
| 523 | 523 | // Redirect to list of albums |
| 524 | - if ( $this->isXHR() ) { |
|
| 524 | + if ($this->isXHR()) { |
|
| 525 | 525 | $tmplVars["showForm"] = false; |
| 526 | 526 | } else { |
| 527 | 527 | return $this->redirect()->toRoute('admin/acledit', array()); |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | |
| 562 | 562 | // Redirect to list of Acl |
| 563 | 563 | $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved")); |
| 564 | - if ( $this->isXHR() ) { |
|
| 564 | + if ($this->isXHR()) { |
|
| 565 | 565 | $tmplVars["showForm"] = false; |
| 566 | 566 | } else { |
| 567 | 567 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -600,7 +600,7 @@ discard block |
||
| 600 | 600 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
| 601 | 601 | } |
| 602 | 602 | |
| 603 | - $form = new AclroleForm(); |
|
| 603 | + $form = new AclroleForm(); |
|
| 604 | 604 | $form->bind($Aclrole); |
| 605 | 605 | |
| 606 | 606 | $request = $this->getRequest(); |
@@ -615,7 +615,7 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | // Redirect to list of Acl |
| 617 | 617 | $this->flashMessenger()->addSuccessMessage($this->translate("role has been saved")); |
| 618 | - if ( $this->isXHR() ) { |
|
| 618 | + if ($this->isXHR()) { |
|
| 619 | 619 | $tmplVars["showForm"] = false; |
| 620 | 620 | } else { |
| 621 | 621 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -671,7 +671,7 @@ discard block |
||
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | // Redirect to list of albums |
| 674 | - if ( $this->isXHR() ) { |
|
| 674 | + if ($this->isXHR()) { |
|
| 675 | 675 | $tmplVars["showForm"] = false; |
| 676 | 676 | } else { |
| 677 | 677 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'roles')); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | // Redirect to list of Acl |
| 715 | 715 | $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved")); |
| 716 | - if ( $this->isXHR() ) { |
|
| 716 | + if ($this->isXHR()) { |
|
| 717 | 717 | $tmplVars["showForm"] = false; |
| 718 | 718 | } else { |
| 719 | 719 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
| 753 | 753 | } |
| 754 | 754 | |
| 755 | - $form = new AclresourceForm(); |
|
| 755 | + $form = new AclresourceForm(); |
|
| 756 | 756 | $form->bind($Aclresource); |
| 757 | 757 | |
| 758 | 758 | $request = $this->getRequest(); |
@@ -767,7 +767,7 @@ discard block |
||
| 767 | 767 | |
| 768 | 768 | // Redirect to list of Acl |
| 769 | 769 | $this->flashMessenger()->addSuccessMessage($this->translate("resource has been saved")); |
| 770 | - if ( $this->isXHR() ) { |
|
| 770 | + if ($this->isXHR()) { |
|
| 771 | 771 | $tmplVars["showForm"] = false; |
| 772 | 772 | } else { |
| 773 | 773 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -824,7 +824,7 @@ discard block |
||
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | // Redirect to list of albums |
| 827 | - if ( $this->isXHR() ) { |
|
| 827 | + if ($this->isXHR()) { |
|
| 828 | 828 | $tmplVars["showForm"] = false; |
| 829 | 829 | } else { |
| 830 | 830 | return $this->redirect()->toRoute('admin/acledit', array('action' => 'resources')); |
@@ -839,8 +839,8 @@ discard block |
||
| 839 | 839 | * re-initialize, respectively clear ACL cache entries |
| 840 | 840 | * @return self |
| 841 | 841 | */ |
| 842 | - private function reinitACLCache () { |
|
| 843 | - if ( \Application\Module::getService('CacheService') ) { |
|
| 842 | + private function reinitACLCache() { |
|
| 843 | + if (\Application\Module::getService('CacheService')) { |
|
| 844 | 844 | \Application\Module::getService('CacheService')->removeItem('ACL'); |
| 845 | 845 | \Admin\Module::initACL($this->getServiceLocator()); |
| 846 | 846 | } |
@@ -83,12 +83,12 @@ discard block |
||
| 83 | 83 | $dataObj = array(); |
| 84 | 84 | foreach ($aApplicationslist as $row) { |
| 85 | 85 | $data[] = $row; |
| 86 | - $dataObj[] = (object)$row; |
|
| 86 | + $dataObj[] = (object) $row; |
|
| 87 | 87 | } |
| 88 | - if ( $this->isXHR() ) { |
|
| 88 | + if ($this->isXHR()) { |
|
| 89 | 89 | $datatablesData = array('data' => $data); |
| 90 | 90 | $datatablesData['data'] = array_map( |
| 91 | - function ($row) use ($oController) { |
|
| 91 | + function($row) use ($oController) { |
|
| 92 | 92 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 93 | 93 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 94 | 94 | 'admin/applicationsedit', |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | $applications->exchangeArray($form->getData()); |
| 144 | 144 | $this->getApplicationsTable()->saveApplication($applications); |
| 145 | 145 | $this->flashMessenger()->addSuccessMessage($this->translate('application has been saved')); |
| 146 | - if ( $this->isXHR() ) { |
|
| 146 | + if ($this->isXHR()) { |
|
| 147 | 147 | $tmplVars["showForm"] = false; |
| 148 | 148 | } else { |
| 149 | 149 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | return $this->redirect()->toRoute('admin/applicationsedit'); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - $form = new ApplicationsForm(); |
|
| 186 | + $form = new ApplicationsForm(); |
|
| 187 | 187 | $form->bind($applications); |
| 188 | 188 | |
| 189 | 189 | $clients = $this->getClientsTable()->fetchAll()->toArray(); |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | if ($form->isValid()) { |
| 202 | 202 | $this->getApplicationsTable()->saveApplication($applications); |
| 203 | 203 | $this->flashMessenger()->addSuccessMessage($this->translate("application has been saved")); |
| 204 | - if ( $this->isXHR() ) { |
|
| 204 | + if ($this->isXHR()) { |
|
| 205 | 205 | $tmplVars["showForm"] = false; |
| 206 | 206 | } else { |
| 207 | 207 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $id = (int) $request->getPost('id'); |
| 250 | 250 | $this->getApplicationsTable()->deleteApplication($id); |
| 251 | 251 | $this->flashMessenger()->addSuccessMessage($this->translate("application has been deleted")); |
| 252 | - if ( $this->isXHR() ) { |
|
| 252 | + if ($this->isXHR()) { |
|
| 253 | 253 | $tmplVars["showForm"] = false; |
| 254 | 254 | } else { |
| 255 | 255 | return $this->redirect()->toRoute('admin/applicationsedit', array('action' => 'index')); |
@@ -377,8 +377,8 @@ discard block |
||
| 377 | 377 | $request = $this->getRequest(); |
| 378 | 378 | //$service = $this->getUserService(); |
| 379 | 379 | $service = \Application\Module::getService('zfcuser_user_service'); |
| 380 | - $form = new RequestPasswordResetForm(null, $options); |
|
| 381 | - $translator = $this->getTranslator(); |
|
| 380 | + $form = new RequestPasswordResetForm(null, $options); |
|
| 381 | + $translator = $this->getTranslator(); |
|
| 382 | 382 | |
| 383 | 383 | // if password reset is disabled |
| 384 | 384 | if (!$config['zfcuser']['enable_passwordreset']) { |
@@ -391,7 +391,7 @@ discard block |
||
| 391 | 391 | $redirect = false; |
| 392 | 392 | } |
| 393 | 393 | |
| 394 | - $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset') . ($redirect ? '?redirect=' . rawurlencode($redirect) : ''); |
|
| 394 | + $redirectUrl = $this->url()->fromRoute('userrequestpasswordreset').($redirect ? '?redirect='.rawurlencode($redirect) : ''); |
|
| 395 | 395 | |
| 396 | 396 | if (!$request->isPost()) { |
| 397 | 397 | return array( |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | sprintf($translator->translate("password reset email has been sent to user '%s'"), $identity) |
| 440 | 440 | ); |
| 441 | 441 | |
| 442 | - return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) . ($redirect ? '?redirect='. rawurlencode($redirect) : '')); |
|
| 442 | + return $this->redirect()->toUrl($this->url()->fromRoute($config["zfcuser_registration_redirect_route"]).($redirect ? '?redirect='.rawurlencode($redirect) : '')); |
|
| 443 | 443 | |
| 444 | 444 | } |
| 445 | 445 | |
@@ -465,8 +465,8 @@ discard block |
||
| 465 | 465 | $request = $this->getRequest(); |
| 466 | 466 | //$service = $this->getUserService(); |
| 467 | 467 | $service = \Application\Module::getService('zfcuser_user_service'); |
| 468 | - $form = new ResetPasswordForm(null, $options); |
|
| 469 | - $translator = $this->getTranslator(); |
|
| 468 | + $form = new ResetPasswordForm(null, $options); |
|
| 469 | + $translator = $this->getTranslator(); |
|
| 470 | 470 | |
| 471 | 471 | // if password reset is disabled |
| 472 | 472 | if (!$config['zfcuser']['enable_passwordreset']) { |
@@ -479,9 +479,9 @@ discard block |
||
| 479 | 479 | $redirect = false; |
| 480 | 480 | } |
| 481 | 481 | |
| 482 | - $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN) . ($redirect ? '?redirect=' . rawurlencode($redirect) : ''); |
|
| 482 | + $redirectUrl = $this->url()->fromRoute(static::ROUTE_LOGIN).($redirect ? '?redirect='.rawurlencode($redirect) : ''); |
|
| 483 | 483 | |
| 484 | - if (!$request->isPost() ) { |
|
| 484 | + if (!$request->isPost()) { |
|
| 485 | 485 | |
| 486 | 486 | $user = false; |
| 487 | 487 | $userId = (int) $this->params()->fromRoute('user_id'); |
@@ -490,14 +490,14 @@ discard block |
||
| 490 | 490 | $userTable = \Application\Module::getService('zfcuser_user_mapper'); |
| 491 | 491 | $user = $userTable->findById($userId); |
| 492 | 492 | |
| 493 | - if (!$user ) { |
|
| 493 | + if (!$user) { |
|
| 494 | 494 | $this->flashMessenger()->addWarningMessage( |
| 495 | 495 | sprintf($translator->translate("invalid request"), '') |
| 496 | 496 | ); |
| 497 | 497 | return $this->redirect()->toUrl($redirectUrl); |
| 498 | 498 | } |
| 499 | 499 | |
| 500 | - if (empty($resetToken) || ($resetToken != $user->getToken()) ) { |
|
| 500 | + if (empty($resetToken) || ($resetToken != $user->getToken())) { |
|
| 501 | 501 | $this->flashMessenger()->addWarningMessage( |
| 502 | 502 | sprintf($translator->translate("invalid request"), '') |
| 503 | 503 | ); |
@@ -526,23 +526,23 @@ discard block |
||
| 526 | 526 | $userTable = \Application\Module::getService('zfcuser_user_mapper'); |
| 527 | 527 | $user = $userTable->findByEmail($userId); |
| 528 | 528 | |
| 529 | - if (!$user ) { |
|
| 529 | + if (!$user) { |
|
| 530 | 530 | $this->flashMessenger()->addWarningMessage( |
| 531 | 531 | sprintf($translator->translate("invalid request"), $userId) |
| 532 | 532 | ); |
| 533 | 533 | return $this->redirect()->toUrl($redirectUrl); |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | - if (empty($resetToken) || ($resetToken != $user->getToken()) ) { |
|
| 536 | + if (empty($resetToken) || ($resetToken != $user->getToken())) { |
|
| 537 | 537 | $this->flashMessenger()->addWarningMessage( |
| 538 | 538 | sprintf($translator->translate("invalid request"), $resetToken) |
| 539 | 539 | ); |
| 540 | 540 | return $this->redirect()->toUrl($redirectUrl); |
| 541 | 541 | } |
| 542 | 542 | |
| 543 | - $form->setData((array)$this->params()->fromPost()); |
|
| 543 | + $form->setData((array) $this->params()->fromPost()); |
|
| 544 | 544 | |
| 545 | - if (!$form->isValid() ) { |
|
| 545 | + if (!$form->isValid()) { |
|
| 546 | 546 | |
| 547 | 547 | return array( |
| 548 | 548 | 'user' => $user, |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | ); |
| 569 | 569 | return $this->redirect()->toUrl( |
| 570 | 570 | $this->url()->fromRoute($config["zfcuser_registration_redirect_route"]) |
| 571 | - . ($redirect ? '?redirect='. rawurlencode($redirect) : '') |
|
| 571 | + . ($redirect ? '?redirect='.rawurlencode($redirect) : '') |
|
| 572 | 572 | ); |
| 573 | 573 | |
| 574 | 574 | } |
@@ -603,11 +603,11 @@ discard block |
||
| 603 | 603 | return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute()); |
| 604 | 604 | } |
| 605 | 605 | |
| 606 | - $form = new UserDataForm(); |
|
| 607 | - $translator = $this->getTranslator(); |
|
| 606 | + $form = new UserDataForm(); |
|
| 607 | + $translator = $this->getTranslator(); |
|
| 608 | 608 | |
| 609 | 609 | /** @var \Admin\Entity\User $oIdentity */ |
| 610 | - $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
| 610 | + $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
| 611 | 611 | /** @var \Admin\Model\UserData $oUser */ |
| 612 | 612 | $oUser = new \Admin\Model\UserData(); |
| 613 | 613 | |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | |
| 617 | 617 | $form->bind($oUser); |
| 618 | 618 | |
| 619 | - if (!$this->getRequest()->isPost() ) { |
|
| 619 | + if (!$this->getRequest()->isPost()) { |
|
| 620 | 620 | |
| 621 | 621 | return new ViewModel( |
| 622 | 622 | array( |
@@ -629,10 +629,10 @@ discard block |
||
| 629 | 629 | |
| 630 | 630 | } |
| 631 | 631 | |
| 632 | - $data = (array)$this->params()->fromPost(); |
|
| 632 | + $data = (array) $this->params()->fromPost(); |
|
| 633 | 633 | $form->setData($data); |
| 634 | 634 | |
| 635 | - if (!$form->isValid() ) { |
|
| 635 | + if (!$form->isValid()) { |
|
| 636 | 636 | |
| 637 | 637 | $this->flashMessenger()->addWarningMessage( |
| 638 | 638 | $translator->translate("user data could not be changed") |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | $translator->translate("user data has been changed") |
| 659 | 659 | ); |
| 660 | 660 | |
| 661 | - if ($this->getRequest()->isXmlHttpRequest() ) { |
|
| 661 | + if ($this->getRequest()->isXmlHttpRequest()) { |
|
| 662 | 662 | return new ViewModel( |
| 663 | 663 | array( |
| 664 | 664 | 'showForm' => false, |
@@ -688,19 +688,19 @@ discard block |
||
| 688 | 688 | return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute()); |
| 689 | 689 | } |
| 690 | 690 | |
| 691 | - $form = new UserProfileForm(); |
|
| 692 | - $translator = $this->getTranslator(); |
|
| 691 | + $form = new UserProfileForm(); |
|
| 692 | + $translator = $this->getTranslator(); |
|
| 693 | 693 | /** |
| 694 | 694 | * @var \Zend\Http\PhpEnvironment\Request|\Zend\Http\Request $request |
| 695 | 695 | */ |
| 696 | 696 | $request = $this->getRequest(); |
| 697 | - $user = $this->zfcUserAuthentication()->getIdentity(); |
|
| 698 | - $userId = (int) $user->getId(); |
|
| 697 | + $user = $this->zfcUserAuthentication()->getIdentity(); |
|
| 698 | + $userId = (int) $user->getId(); |
|
| 699 | 699 | $profile = new UserProfile; |
| 700 | 700 | $profile->load($userId); |
| 701 | 701 | $form->bind($profile); |
| 702 | 702 | |
| 703 | - if (!$this->getRequest()->isPost() ) { |
|
| 703 | + if (!$this->getRequest()->isPost()) { |
|
| 704 | 704 | |
| 705 | 705 | return array( |
| 706 | 706 | 'showForm' => true, |
@@ -711,10 +711,10 @@ discard block |
||
| 711 | 711 | |
| 712 | 712 | } |
| 713 | 713 | |
| 714 | - $data = (array)$this->params()->fromPost(); |
|
| 714 | + $data = (array) $this->params()->fromPost(); |
|
| 715 | 715 | $form->setData($data); |
| 716 | 716 | |
| 717 | - if (!$form->isValid() ) { |
|
| 717 | + if (!$form->isValid()) { |
|
| 718 | 718 | |
| 719 | 719 | $this->flashMessenger()->addWarningMessage( |
| 720 | 720 | $translator->translate("user profile data could not be changed") |
@@ -735,7 +735,7 @@ discard block |
||
| 735 | 735 | $translator->translate("user profile data has been changed") |
| 736 | 736 | ); |
| 737 | 737 | |
| 738 | - if ($request->isXmlHttpRequest() ) { |
|
| 738 | + if ($request->isXmlHttpRequest()) { |
|
| 739 | 739 | $response = array( |
| 740 | 740 | 'showForm' => false, |
| 741 | 741 | 'user' => $user, |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $tmplVars = $this->getTemplateVars(); |
| 71 | 71 | $aClientslist = $this->getClientsTable()->fetchAll(); |
| 72 | - if ( $this->isXHR() ) { |
|
| 72 | + if ($this->isXHR()) { |
|
| 73 | 73 | $datatablesData = array('data' => $aClientslist->toArray()); |
| 74 | 74 | $oController = $this; |
| 75 | 75 | $datatablesData['data'] = array_map( |
| 76 | - function ($row) use ($oController) { |
|
| 76 | + function($row) use ($oController) { |
|
| 77 | 77 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 78 | 78 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 79 | 79 | 'admin/clientsedit', |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $clients->exchangeArray($form->getData()); |
| 122 | 122 | $this->getClientsTable()->saveClients($clients); |
| 123 | 123 | $this->flashMessenger()->addSuccessMessage($this->translate('client has been saved')); |
| 124 | - if ( $this->isXHR() ) { |
|
| 124 | + if ($this->isXHR()) { |
|
| 125 | 125 | $tmplVars["showForm"] = false; |
| 126 | 126 | } else { |
| 127 | 127 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | return $this->redirect()->toRoute('admin/clientsedit'); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $form = new ClientsForm(); |
|
| 164 | + $form = new ClientsForm(); |
|
| 165 | 165 | $form->bind($clients); |
| 166 | 166 | |
| 167 | 167 | $request = $this->getRequest(); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($form->isValid()) { |
| 173 | 173 | $this->getClientsTable()->saveClients($clients); |
| 174 | 174 | $this->flashMessenger()->addSuccessMessage($this->translate("client has been saved")); |
| 175 | - if ( $this->isXHR() ) { |
|
| 175 | + if ($this->isXHR()) { |
|
| 176 | 176 | $tmplVars["showForm"] = false; |
| 177 | 177 | } else { |
| 178 | 178 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $id = (int) $request->getPost('id'); |
| 222 | 222 | $this->getClientsTable()->deleteClients($id); |
| 223 | 223 | $this->flashMessenger()->addSuccessMessage($this->translate("client has been deleted")); |
| 224 | - if ( $this->isXHR() ) { |
|
| 224 | + if ($this->isXHR()) { |
|
| 225 | 225 | $tmplVars["showForm"] = false; |
| 226 | 226 | } else { |
| 227 | 227 | return $this->redirect()->toRoute('admin/clientsedit', array('action' => 'index')); |
@@ -69,11 +69,11 @@ discard block |
||
| 69 | 69 | { |
| 70 | 70 | $tmplVars = $this->getTemplateVars(); |
| 71 | 71 | $aSettingslist = $this->getSettingsTable()->fetchAll(); |
| 72 | - if ( $this->isXHR() ) { |
|
| 72 | + if ($this->isXHR()) { |
|
| 73 | 73 | $datatablesData = array('data' => $aSettingslist->toArray()); |
| 74 | 74 | $oController = $this; |
| 75 | 75 | $datatablesData['data'] = array_map( |
| 76 | - function ($row) use ($oController) { |
|
| 76 | + function($row) use ($oController) { |
|
| 77 | 77 | $actions = '<div class="button-group tiny btn-group btn-group-xs">'. |
| 78 | 78 | '<a class="button btn btn-default tiny btn-xs btn-clean btn-cta-xhr cta-xhr-modal" href="'.$oController->url()->fromRoute( |
| 79 | 79 | 'admin/settingsedit', |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $settings->exchangeArray($form->getData()); |
| 122 | 122 | $this->getSettingsTable()->saveSettings($settings); |
| 123 | 123 | $this->flashMessenger()->addSuccessMessage($this->translate('setting has been saved')); |
| 124 | - if ( $this->isXHR() ) { |
|
| 124 | + if ($this->isXHR()) { |
|
| 125 | 125 | $tmplVars["showForm"] = false; |
| 126 | 126 | } else { |
| 127 | 127 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | return $this->redirect()->toRoute('admin/settingsedit'); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - $form = new SettingsForm(); |
|
| 164 | + $form = new SettingsForm(); |
|
| 165 | 165 | $form->bind($settings); |
| 166 | 166 | |
| 167 | 167 | $request = $this->getRequest(); |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | if ($form->isValid()) { |
| 173 | 173 | $this->getSettingsTable()->saveSettings($settings); |
| 174 | 174 | $this->flashMessenger()->addSuccessMessage($this->translate("setting has been saved")); |
| 175 | - if ( $this->isXHR() ) { |
|
| 175 | + if ($this->isXHR()) { |
|
| 176 | 176 | $tmplVars["showForm"] = false; |
| 177 | 177 | } else { |
| 178 | 178 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $id = (int) $request->getPost('id'); |
| 222 | 222 | $this->getSettingsTable()->deleteSettings($id); |
| 223 | 223 | $this->flashMessenger()->addSuccessMessage($this->translate("setting has been deleted")); |
| 224 | - if ( $this->isXHR() ) { |
|
| 224 | + if ($this->isXHR()) { |
|
| 225 | 225 | $tmplVars["showForm"] = false; |
| 226 | 226 | } else { |
| 227 | 227 | return $this->redirect()->toRoute('admin/settingsedit', array('action' => 'index')); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | array( |
| 30 | 30 | 'name' => 'aclroles_id', |
| 31 | 31 | 'attributes' => array( |
| 32 | - 'type' => 'hidden' , |
|
| 32 | + 'type' => 'hidden', |
|
| 33 | 33 | ), |
| 34 | 34 | ) |
| 35 | 35 | ); |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | $label = $emailElement->getLabel('label'); |
| 43 | 43 | // @TODO: make translation-friendly |
| 44 | 44 | foreach ($this->getAuthenticationOptions()->getAuthIdentityFields() as $mode) { |
| 45 | - $label = (!empty($label) ? $label . ' or ' : '') . ucfirst($mode); |
|
| 45 | + $label = (!empty($label) ? $label.' or ' : '').ucfirst($mode); |
|
| 46 | 46 | } |
| 47 | 47 | $emailElement->setLabel($label); |
| 48 | 48 | |
@@ -39,11 +39,11 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
| 41 | 41 | { |
| 42 | - $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
| 43 | - $resultSetPrototype = new ResultSet(); |
|
| 42 | + $dbAdapter = $serviceLocator->get('Zend\Db\Adapter\Adapter'); |
|
| 43 | + $resultSetPrototype = new ResultSet(); |
|
| 44 | 44 | $resultSetPrototype->setArrayObjectPrototype(new User()); |
| 45 | - $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype); |
|
| 46 | - $table = new UserTable($tableGateway); |
|
| 45 | + $tableGateway = new TableGateway('user', $dbAdapter, null, $resultSetPrototype); |
|
| 46 | + $table = new UserTable($tableGateway); |
|
| 47 | 47 | return $table; |
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | \ No newline at end of file |