@@ -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 | } |
@@ -15,7 +15,6 @@ |
||
15 | 15 | |
16 | 16 | namespace Admin\Model; |
17 | 17 | |
18 | -use Zend\Crypt\Password\Bcrypt; |
|
19 | 18 | use Zend\InputFilter\InputFilter; |
20 | 19 | use Zend\InputFilter\Factory as InputFactory; |
21 | 20 | use Zend\InputFilter\InputFilterAwareInterface; |
@@ -20,8 +20,6 @@ |
||
20 | 20 | use Zend\InputFilter\Factory as InputFactory; |
21 | 21 | use Zend\InputFilter\InputFilterAwareInterface; |
22 | 22 | use Zend\InputFilter\InputFilterInterface; |
23 | -use Zend\ServiceManager\ServiceLocator; |
|
24 | -use Zend\ServiceManager\ServiceLocatorInterface; |
|
25 | 23 | use Zend\ServiceManager\ServiceManager; |
26 | 24 | use Zend\ServiceManager\ServiceManagerInterface; |
27 | 25 | use Zend\ServiceManager\ServiceLocatorAwareInterface; |
@@ -47,7 +47,7 @@ |
||
47 | 47 | |
48 | 48 | /** |
49 | 49 | * set user's object property data |
50 | - * |
|
50 | + * |
|
51 | 51 | * @param array $data |
52 | 52 | * @param boolean $forceEncryptPassword |
53 | 53 | * @return \Admin\Entity\User |
@@ -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; |
@@ -15,16 +15,10 @@ |
||
15 | 15 | |
16 | 16 | namespace UIComponents\View\Helper; |
17 | 17 | |
18 | -use RecursiveIteratorIterator; |
|
19 | -use Zend\EventManager\EventManager; |
|
20 | 18 | use Zend\EventManager\EventManagerAwareInterface; |
21 | -use Zend\EventManager\EventManagerInterface; |
|
22 | 19 | use Zend\I18n\Translator\TranslatorAwareInterface; |
23 | 20 | use Zend\Navigation\Page\AbstractPage; |
24 | -use Zend\Navigation\AbstractContainer; |
|
25 | -use Zend\Permissions\Acl; |
|
26 | 21 | use Zend\ServiceManager\ServiceLocatorAwareInterface; |
27 | -use Zend\ServiceManager\ServiceLocatorInterface; |
|
28 | 22 | use Zend\View; |
29 | 23 | use Zend\View\Exception; |
30 | 24 | use \UIComponents\Translator\TranslatorAwareInterfaceTrait; |
@@ -102,7 +102,7 @@ |
||
102 | 102 | |
103 | 103 | |
104 | 104 | |
105 | - /** |
|
105 | + /** |
|
106 | 106 | * Magic overload: Proxy calls to the navigation container |
107 | 107 | * |
108 | 108 | * @param string $method method name in container |
@@ -27,12 +27,12 @@ |
||
27 | 27 | * |
28 | 28 | * @param array $tags |
29 | 29 | * @param \Zend\I18n\Translator\TranslatorInterface $translator |
30 | - * @return \UIComponents\Template\TemplateAbstract |
|
30 | + * @return \UIComponents\Template\TemplateAbstract |
|
31 | 31 | */ |
32 | 32 | public function __construct ($tags = false, $translator = null) |
33 | - { |
|
34 | - return parent::__construct($tags, $translator); |
|
35 | - } |
|
33 | + { |
|
34 | + return parent::__construct($tags, $translator); |
|
35 | + } |
|
36 | 36 | |
37 | 37 | } |
38 | 38 | ?> |
39 | 39 | \ No newline at end of file |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | */ |
25 | 25 | abstract class TemplateAbstract implements TemplateInterface, TranslatorAwareInterface |
26 | 26 | { |
27 | - use TranslatorAwareInterfaceTrait; |
|
27 | + use TranslatorAwareInterfaceTrait; |
|
28 | 28 | |
29 | 29 | /** |
30 | 30 | * Needles (static) |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * |
78 | 78 | * @param array $tags |
79 | 79 | * @param \Zend\I18n\Translator\TranslatorInterface $translator |
80 | - * @return \UIComponents\Template\TemplateAbstract |
|
80 | + * @return \UIComponents\Template\TemplateAbstract |
|
81 | 81 | */ |
82 | 82 | public function __construct ($tags = false, $translator = null) |
83 | 83 | { |
@@ -22,44 +22,44 @@ |
||
22 | 22 | interface TemplateInterface |
23 | 23 | { |
24 | 24 | |
25 | - /** |
|
26 | - * Set Templates placeholders and values |
|
27 | - * |
|
28 | - * With this method you can replace the placeholders |
|
29 | - * in the static templates with dynamic data. |
|
30 | - * |
|
31 | - * @param $which String 's' for Static or else dynamic |
|
32 | - * @param $needle String Placeholder |
|
33 | - * @param $replacement String Replacement String |
|
34 | - * |
|
35 | - * @return void |
|
36 | - */ |
|
37 | - public function set($which = 's', $needle, $replacement); |
|
25 | + /** |
|
26 | + * Set Templates placeholders and values |
|
27 | + * |
|
28 | + * With this method you can replace the placeholders |
|
29 | + * in the static templates with dynamic data. |
|
30 | + * |
|
31 | + * @param $which String 's' for Static or else dynamic |
|
32 | + * @param $needle String Placeholder |
|
33 | + * @param $replacement String Replacement String |
|
34 | + * |
|
35 | + * @return void |
|
36 | + */ |
|
37 | + public function set($which = 's', $needle, $replacement); |
|
38 | 38 | |
39 | - /** |
|
40 | - * Iterate internal counter by one |
|
41 | - * |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - public function next(); |
|
39 | + /** |
|
40 | + * Iterate internal counter by one |
|
41 | + * |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public function next(); |
|
45 | 45 | |
46 | - /** |
|
47 | - * Reset template data |
|
48 | - * |
|
49 | - * @return void |
|
50 | - */ |
|
51 | - public function reset(); |
|
46 | + /** |
|
47 | + * Reset template data |
|
48 | + * |
|
49 | + * @return void |
|
50 | + */ |
|
51 | + public function reset(); |
|
52 | 52 | |
53 | - /** |
|
54 | - * Generate the template and |
|
55 | - * print/return it. (do translations sequentially to save memory!!!) |
|
56 | - * |
|
57 | - * @param $template string/file Template |
|
58 | - * @param $return bool Return or print template |
|
59 | - * |
|
60 | - * @return string complete Template string |
|
61 | - */ |
|
62 | - public function generate($template, $return = 0); |
|
53 | + /** |
|
54 | + * Generate the template and |
|
55 | + * print/return it. (do translations sequentially to save memory!!!) |
|
56 | + * |
|
57 | + * @param $template string/file Template |
|
58 | + * @param $return bool Return or print template |
|
59 | + * |
|
60 | + * @return string complete Template string |
|
61 | + */ |
|
62 | + public function generate($template, $return = 0); |
|
63 | 63 | |
64 | 64 | |
65 | 65 | } |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | */ |
28 | 28 | class Menu extends \Zend\View\Helper\Navigation\Menu |
29 | 29 | { |
30 | - use \UIComponents\View\Helper\Traits\ComponentClassnamesTrait; |
|
31 | - use \UIComponents\View\Helper\Traits\ComponentAttributesTrait; |
|
30 | + use \UIComponents\View\Helper\Traits\ComponentClassnamesTrait; |
|
31 | + use \UIComponents\View\Helper\Traits\ComponentAttributesTrait; |
|
32 | 32 | |
33 | 33 | /** |
34 | 34 | * default CSS class to use for li elements |
@@ -351,10 +351,10 @@ discard block |
||
351 | 351 | */ |
352 | 352 | public function findActive($container = null, $minDepth = null, $maxDepth = -1) |
353 | 353 | { |
354 | - if ( null == $container ) { |
|
355 | - $container = $this->getContainer(); |
|
356 | - } |
|
357 | - return parent::findActive($container, $minDepth, $maxDepth); |
|
354 | + if ( null == $container ) { |
|
355 | + $container = $this->getContainer(); |
|
356 | + } |
|
357 | + return parent::findActive($container, $minDepth, $maxDepth); |
|
358 | 358 | } |
359 | 359 | |
360 | 360 | /** |