@@ -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 | } |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Aclresource; |
24 | 23 | use Admin\Model\AclresourceTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Aclrole; |
24 | 23 | use Admin\Model\AclroleTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Acl; |
24 | 23 | use Admin\Model\AclTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Applications; |
24 | 23 | use Admin\Model\ApplicationsTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Clients; |
24 | 23 | use Admin\Model\ClientsTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\Settings; |
24 | 23 | use Admin\Model\SettingsTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\UserProfile; |
24 | 23 | use Admin\Model\UserProfileTable; |
25 | 24 |
@@ -19,7 +19,6 @@ |
||
19 | 19 | use Zend\Db\TableGateway\TableGateway; |
20 | 20 | use Zend\ServiceManager\FactoryInterface; |
21 | 21 | use Zend\ServiceManager\ServiceLocatorInterface; |
22 | - |
|
23 | 22 | use Admin\Model\User; |
24 | 23 | use Admin\Model\UserTable; |
25 | 24 |