@@ -22,7 +22,7 @@ |
||
22 | 22 | { |
23 | 23 | /** |
24 | 24 | * redirect to acl section |
25 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
25 | + * @return \Zend\Http\Response |
|
26 | 26 | */ |
27 | 27 | public function indexAction() |
28 | 28 | { |
@@ -24,7 +24,7 @@ |
||
24 | 24 | * redirect to acl section |
25 | 25 | * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
26 | 26 | */ |
27 | - public function indexAction() |
|
27 | + public function indexAction() |
|
28 | 28 | { |
29 | 29 | return $this->redirect()->toRoute('admin/acledit', array()); |
30 | 30 | } |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | |
254 | 254 | /** |
255 | 255 | * confirm user registration |
256 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
256 | + * @return \Zend\Http\Response |
|
257 | 257 | */ |
258 | 258 | public function confirmAction() |
259 | 259 | { |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | |
313 | 313 | /** |
314 | 314 | * active user registration |
315 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
315 | + * @return \Zend\Http\Response |
|
316 | 316 | */ |
317 | 317 | public function activateAction() |
318 | 318 | { |
@@ -26,15 +26,15 @@ |
||
26 | 26 | class UsersController extends BaseActionController |
27 | 27 | { |
28 | 28 | |
29 | - /** |
|
30 | - * @var array|\Admin\Model\UserTable |
|
31 | - */ |
|
32 | - protected $userTable; |
|
29 | + /** |
|
30 | + * @var array|\Admin\Model\UserTable |
|
31 | + */ |
|
32 | + protected $userTable; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @var array|\Admin\Model\AclroleTable |
|
36 | - */ |
|
37 | - protected $AclroleTable; |
|
34 | + /** |
|
35 | + * @var array|\Admin\Model\AclroleTable |
|
36 | + */ |
|
37 | + protected $AclroleTable; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * initialize titles and toolbar items |
@@ -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 | } |
@@ -63,29 +63,6 @@ discard block |
||
63 | 63 | protected $userTable; |
64 | 64 | |
65 | 65 | /** |
66 | - * @param callable $redirectCallback |
|
67 | - * @param callable $redirectCallback |
|
68 | - * / |
|
69 | - //public function __construct(ServiceLocatorInterface $serviceLocator, $redirectCallback) |
|
70 | - public function __construct($userService, $options, $registerForm, $loginForm) |
|
71 | - { |
|
72 | - $this->userService = $userService; |
|
73 | - $this->options = $options; |
|
74 | - $this->registerForm = $registerForm; |
|
75 | - $this->loginForm = $loginForm; |
|
76 | - |
|
77 | - /*if ( $serviceLocator ) { |
|
78 | - $this->setServiceLocator($serviceLocator); |
|
79 | - } |
|
80 | - if (!is_callable($redirectCallback)) { |
|
81 | - throw new \InvalidArgumentException('You must supply a callable redirectCallback'); |
|
82 | - } |
|
83 | - $this->redirectCallback = $redirectCallback; * / |
|
84 | - |
|
85 | - } |
|
86 | - |
|
87 | - /** |
|
88 | - * set current action titles |
|
89 | 66 | * @return self |
90 | 67 | */ |
91 | 68 | public function defineActionTitles() |
@@ -577,7 +554,7 @@ discard block |
||
577 | 554 | |
578 | 555 | /** |
579 | 556 | * view user's basic data |
580 | - * @return mixed|\Zend\Http\Response|\Zend\View\Model\ViewModel |
|
557 | + * @return \Zend\Http\Response |
|
581 | 558 | */ |
582 | 559 | public function userdataAction() |
583 | 560 | { |
@@ -19,7 +19,6 @@ discard block |
||
19 | 19 | use Application\Controller\Traits\ControllerTranslatorTrait; |
20 | 20 | use Application\Controller\Traits\ControllerActiontitlesTrait; |
21 | 21 | use Application\Controller\Traits\ControllerToolbarTrait; |
22 | - |
|
23 | 22 | use Admin\Module as AdminModule; |
24 | 23 | use Admin\Form\RequestPasswordResetForm; |
25 | 24 | use Admin\Form\ResetPasswordForm; |
@@ -28,14 +27,11 @@ discard block |
||
28 | 27 | use Admin\Form\UserDataForm; |
29 | 28 | use Admin\Form\UserProfileForm; |
30 | 29 | use Admin\Model\UserProfile; |
31 | - |
|
32 | 30 | use Zend\Crypt\Password\Bcrypt; |
33 | 31 | use Zend\Stdlib\ResponseInterface as Response; |
34 | - |
|
35 | 32 | use Zend\View\Model\ViewModel; |
36 | 33 | use Zend\Mvc\MvcEvent; |
37 | 34 | use Zend\ServiceManager\ServiceLocatorInterface; |
38 | - |
|
39 | 35 | use ZfcUser\Controller\UserController; |
40 | 36 | use ZfcUser\Controller\Plugin\ZfcUserAuthentication; |
41 | 37 |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | class ZfcuserController extends UserController |
48 | 48 | { |
49 | - use ControllerTranslatorTrait; |
|
50 | - use ControllerActiontitlesTrait; |
|
51 | - use ControllerToolbarTrait; |
|
49 | + use ControllerTranslatorTrait; |
|
50 | + use ControllerActiontitlesTrait; |
|
51 | + use ControllerToolbarTrait; |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | // ...redirect to the login redirect route |
211 | 211 | return $this->redirect()->toRoute('zfcuser/login'); //$this->getOptions()->getLoginRedirectRoute()); |
212 | 212 | } |
213 | - $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
213 | + $oIdentity = $this->zfcUserAuthentication()->getIdentity(); |
|
214 | 214 | $oProfile = new \Admin\Model\UserProfile(); |
215 | 215 | $oProfile->load($oIdentity->getId()); |
216 | 216 | |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | $sm = $this->getServiceLocator(); |
767 | 767 | $this->userTable = $sm->get('Admin\Model\UserTable'); |
768 | 768 | if (!$this->userTable instanceof \Admin\Model\UserTable) { |
769 | - throw new \Exception("invalid user table object: ".gettype($this->userTable)); |
|
769 | + throw new \Exception("invalid user table object: ".gettype($this->userTable)); |
|
770 | 770 | } |
771 | 771 | } |
772 | 772 | return $this->userTable; |
@@ -784,7 +784,7 @@ discard block |
||
784 | 784 | $sm = $this->getServiceLocator(); |
785 | 785 | $this->aclroleTable = $sm->get('Admin\Model\AclroleTable'); |
786 | 786 | if (!$this->aclroleTable instanceof \Admin\Model\AclroleTable) { |
787 | - throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable)); |
|
787 | + throw new \Exception("invalid ACL role table object: ".gettype($this->aclroleTable)); |
|
788 | 788 | } |
789 | 789 | } |
790 | 790 | return $this->aclroleTable; |
@@ -798,7 +798,7 @@ discard block |
||
798 | 798 | */ |
799 | 799 | public function getOptions() |
800 | 800 | { |
801 | - return \Application\Module::getService('zfcuser_module_options'); |
|
801 | + return \Application\Module::getService('zfcuser_module_options'); |
|
802 | 802 | } |
803 | 803 | |
804 | 804 | } |
@@ -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, |
@@ -80,7 +80,6 @@ discard block |
||
80 | 80 | /** |
81 | 81 | * Set token string. |
82 | 82 | * |
83 | - * @param STRING $aclrole |
|
84 | 83 | * @return \Admin\Entity\User |
85 | 84 | */ |
86 | 85 | public function setToken($token) |
@@ -92,7 +91,7 @@ discard block |
||
92 | 91 | /** |
93 | 92 | * Get user-id string. |
94 | 93 | * |
95 | - * @return STRING |
|
94 | + * @return integer |
|
96 | 95 | */ |
97 | 96 | public function getUserId() |
98 | 97 | { |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | /** |
106 | 105 | * Set user-id string. |
107 | 106 | * |
108 | - * @param STRING $aclrole |
|
107 | + * @param integer $user_id |
|
109 | 108 | * @return \Admin\Entity\User |
110 | 109 | */ |
111 | 110 | public function setUserId($user_id) |
@@ -23,21 +23,21 @@ discard block |
||
23 | 23 | |
24 | 24 | /** |
25 | 25 | * user's confirmation/activation token |
26 | - * |
|
26 | + * |
|
27 | 27 | * @var string |
28 | 28 | */ |
29 | 29 | protected $token; |
30 | 30 | |
31 | 31 | /** |
32 | 32 | * user's ACL role |
33 | - * |
|
33 | + * |
|
34 | 34 | * @var string |
35 | 35 | */ |
36 | 36 | protected $aclrole; |
37 | 37 | |
38 | 38 | /** |
39 | 39 | * user's ID |
40 | - * |
|
40 | + * |
|
41 | 41 | * @var int |
42 | 42 | */ |
43 | 43 | protected $user_id; |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | |
119 | 119 | /** |
120 | 120 | * set user's object property data |
121 | - * |
|
121 | + * |
|
122 | 122 | * @param array $data |
123 | 123 | * @param boolean $forceEncryptPassword |
124 | 124 | * @return \Admin\Entity\User |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | /** |
158 | 158 | * get copy of user's object properties in an assosiative array |
159 | - * |
|
159 | + * |
|
160 | 160 | * @return array |
161 | 161 | */ |
162 | 162 | public function __getArrayCopy() |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | /** |
179 | 179 | * get copy of user's object properties in an assosiative array |
180 | - * |
|
180 | + * |
|
181 | 181 | * @return array |
182 | 182 | * / |
183 | 183 | public function getArrayCopy() |
@@ -54,30 +54,30 @@ |
||
54 | 54 | */ |
55 | 55 | public function exchangeArray($data = array(), $forceEncryptPassword = false) |
56 | 56 | { |
57 | - if (isset($data['id']) && !empty($data["id"]) ) { |
|
57 | + if (isset($data['id']) && !empty($data["id"])) { |
|
58 | 58 | $this->id = ($data['id']); |
59 | 59 | $this->user_id = ($data['id']); |
60 | - } elseif (isset($data['user_id']) && !empty($data["user_id"]) ) { |
|
60 | + } elseif (isset($data['user_id']) && !empty($data["user_id"])) { |
|
61 | 61 | $this->id = ($data['user_id']); |
62 | 62 | $this->user_id = ($data['user_id']); |
63 | 63 | } |
64 | - $this->username = (isset($data['username'])) ? $data['username'] : $this->username; |
|
65 | - $this->email = (isset($data['email'])) ? $data['email'] : $this->email; |
|
66 | - if (isset($data['displayName']) ) { |
|
64 | + $this->username = (isset($data['username'])) ? $data['username'] : $this->username; |
|
65 | + $this->email = (isset($data['email'])) ? $data['email'] : $this->email; |
|
66 | + if (isset($data['displayName'])) { |
|
67 | 67 | $this->display_name = $data['displayName']; |
68 | 68 | $this->displayName = $data['displayName']; |
69 | - } elseif (isset($data['display_name']) ) { |
|
69 | + } elseif (isset($data['display_name'])) { |
|
70 | 70 | $this->display_name = $data['display_name']; |
71 | 71 | $this->displayName = $data['display_name']; |
72 | 72 | } |
73 | - if (isset($data["password"]) && $forceEncryptPassword ) { |
|
73 | + if (isset($data["password"]) && $forceEncryptPassword) { |
|
74 | 74 | $bcrypt = new Bcrypt; |
75 | 75 | $bcrypt->setCost(null); // @TODO $this->getUserService()->getOptions()->getPasswordCost()); |
76 | 76 | $data["password"] = $bcrypt->create($data['password']); |
77 | 77 | } |
78 | - $this->password = (isset($data['password'])) ? $data['password'] : $this->password; |
|
78 | + $this->password = (isset($data['password'])) ? $data['password'] : $this->password; |
|
79 | 79 | $this->state = (isset($data['state'])) ? $data['state'] : $this->state; |
80 | - $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole; |
|
80 | + $this->aclrole = (isset($data['aclrole'])) ? $data['aclrole'] : $this->aclrole; |
|
81 | 81 | $this->token = (isset($data['token'])) ? $data['token'] : $this->token; |
82 | 82 | |
83 | 83 | return $this; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return AclController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclresourceTable |
|
38 | + * @return AclresourceTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -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 Aclresource()); |
45 | - $tableGateway = new TableGateway('aclresource', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new AclresourceTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('aclresource', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new AclresourceTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclroleTable |
|
38 | + * @return AclroleTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -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 Aclrole()); |
45 | - $tableGateway = new TableGateway('aclrole', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new AclroleTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('aclrole', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new AclroleTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @param ServiceLocatorInterface $serviceLocator |
37 | 37 | * |
38 | - * @return Admin\Model\AclTable |
|
38 | + * @return AclTable |
|
39 | 39 | */ |
40 | 40 | public function createService(ServiceLocatorInterface $serviceLocator) |
41 | 41 | { |
@@ -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 Acl()); |
45 | - $tableGateway = new TableGateway('acl', $dbAdapter, null, $resultSetPrototype); |
|
46 | - $table = new AclTable($tableGateway); |
|
45 | + $tableGateway = new TableGateway('acl', $dbAdapter, null, $resultSetPrototype); |
|
46 | + $table = new AclTable($tableGateway); |
|
47 | 47 | return $table; |
48 | 48 | } |
49 | 49 | } |
50 | 50 | \ No newline at end of file |
@@ -16,7 +16,6 @@ |
||
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | 18 | use Admin\Module as AdminModule; |
19 | - |
|
20 | 19 | use Zend\InputFilter\InputFilter; |
21 | 20 | use Zend\InputFilter\Factory as InputFactory; |
22 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -26,7 +26,7 @@ |
||
26 | 26 | * |
27 | 27 | * @param ServiceLocatorInterface $serviceLocator |
28 | 28 | * |
29 | - * @return mixed |
|
29 | + * @return ApplicationsController |
|
30 | 30 | */ |
31 | 31 | public function createService(ServiceLocatorInterface $serviceLocator) |
32 | 32 | { |