@@ -290,7 +290,7 @@ |
||
290 | 290 | * Set service manager instance |
291 | 291 | * |
292 | 292 | * @param ServiceManager $serviceManager |
293 | - * @return User |
|
293 | + * @return Clients |
|
294 | 294 | */ |
295 | 295 | public function setServiceManager(ServiceManager $serviceManager) |
296 | 296 | { |
@@ -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; |
@@ -39,14 +39,14 @@ |
||
39 | 39 | |
40 | 40 | public function exchangeArray($data) |
41 | 41 | { |
42 | - $this->clients_id = (isset($data['clients_id'])) ? $data['clients_id'] : null; |
|
42 | + $this->clients_id = (isset($data['clients_id'])) ? $data['clients_id'] : null; |
|
43 | 43 | $this->name = (isset($data['name'])) ? $data['name'] : null; |
44 | 44 | $this->extraname = (isset($data['extraname'])) ? $data['extraname'] : null; |
45 | 45 | $this->homepage = (isset($data['homepage'])) ? $data['homepage'] : null; |
46 | 46 | $this->email = (isset($data['email'])) ? $data['email'] : null; |
47 | - $this->contact = (isset($data['contact'])) ? $data['contact'] : null; |
|
47 | + $this->contact = (isset($data['contact'])) ? $data['contact'] : null; |
|
48 | 48 | $this->phone = (isset($data['phone'])) ? $data['phone'] : null; |
49 | - $this->statistics = (isset($data['statistics'])) ? $data['statistics'] : null; |
|
49 | + $this->statistics = (isset($data['statistics'])) ? $data['statistics'] : null; |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | public function getArrayCopy() |
@@ -50,7 +50,7 @@ |
||
50 | 50 | * |
51 | 51 | * @param array $data |
52 | 52 | * @param boolean $forceEncryptPassword |
53 | - * @return \Admin\Entity\User |
|
53 | + * @return User |
|
54 | 54 | */ |
55 | 55 | public function exchangeArray($data = array(), $forceEncryptPassword = false) |
56 | 56 | { |
@@ -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 |
@@ -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; |
@@ -373,7 +373,7 @@ |
||
373 | 373 | * Set service manager instance |
374 | 374 | * |
375 | 375 | * @param ServiceManager $serviceManager |
376 | - * @return User |
|
376 | + * @return UserProfile |
|
377 | 377 | */ |
378 | 378 | public function setServiceManager(ServiceManager $serviceManager) |
379 | 379 | { |
@@ -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; |
@@ -41,9 +41,9 @@ discard block |
||
41 | 41 | protected $serviceManager; |
42 | 42 | protected $serviceLocator; |
43 | 43 | |
44 | - public function load( $id ) |
|
44 | + public function load($id) |
|
45 | 45 | { |
46 | - if (!$id ) { |
|
46 | + if (!$id) { |
|
47 | 47 | return $this; |
48 | 48 | } |
49 | 49 | $this->user_id = $id; |
@@ -79,17 +79,17 @@ discard block |
||
79 | 79 | |
80 | 80 | public function exchangeArray($data) |
81 | 81 | { |
82 | - $this->user_id = (isset($data['user_id'])) ? $data['user_id'] : null; |
|
82 | + $this->user_id = (isset($data['user_id'])) ? $data['user_id'] : null; |
|
83 | 83 | |
84 | - $this->street = (isset($data['street'])) ? $data['street'] : ''; |
|
84 | + $this->street = (isset($data['street'])) ? $data['street'] : ''; |
|
85 | 85 | $this->city = (isset($data['city'])) ? $data['city'] : ''; |
86 | - $this->country = (isset($data['country'])) ? $data['country'] : ''; |
|
87 | - $this->phone = (isset($data['phone'])) ? $data['phone'] : ''; |
|
86 | + $this->country = (isset($data['country'])) ? $data['country'] : ''; |
|
87 | + $this->phone = (isset($data['phone'])) ? $data['phone'] : ''; |
|
88 | 88 | $this->cell = (isset($data['cell'])) ? $data['cell'] : ''; |
89 | 89 | |
90 | 90 | $this->twitter = (isset($data['twitter'])) ? $data['twitter'] : ''; |
91 | 91 | $this->facebook = (isset($data['facebook'])) ? $data['facebook'] : ''; |
92 | - $this->skype = (isset($data['skype'])) ? $data['skype'] : ''; |
|
92 | + $this->skype = (isset($data['skype'])) ? $data['skype'] : ''; |
|
93 | 93 | $this->icq = (isset($data['icq'])) ? $data['icq'] : ''; |
94 | 94 | |
95 | 95 | } |
@@ -66,7 +66,7 @@ |
||
66 | 66 | * Set authService. |
67 | 67 | * |
68 | 68 | * @param AuthenticationService $authService |
69 | - * @return \ZfcUser\View\Helper\ZfcUserIdentity |
|
69 | + * @return Isallowed |
|
70 | 70 | */ |
71 | 71 | public function setAuthService(AuthenticationService $authService) |
72 | 72 | { |
@@ -33,14 +33,14 @@ |
||
33 | 33 | public function __invoke( $resource ) |
34 | 34 | { |
35 | 35 | /** |
36 | - * @var Zend\Permissions\Acl\Acl $acl |
|
36 | + * @var Zend\Permissions\Acl\Acl $acl |
|
37 | 37 | **/ |
38 | 38 | $acl = $this->view->navigation()->getAcl(); |
39 | 39 | if (empty($resource) || !$acl->hasResource($resource) ) { |
40 | 40 | return true; |
41 | 41 | } |
42 | 42 | /** |
43 | - * @var \Admin\Entity\User $user |
|
43 | + * @var \Admin\Entity\User $user |
|
44 | 44 | **/ |
45 | 45 | $user = $this->view->zfcUserIdentity(); // ->getIdentity(); |
46 | 46 | if ($user) { // ($this->getAuthService()->hasIdentity()) { |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | * @access public |
31 | 31 | * @return \ZfcUser\Entity\UserInterface |
32 | 32 | */ |
33 | - public function __invoke( $resource ) |
|
33 | + public function __invoke($resource) |
|
34 | 34 | { |
35 | 35 | /** |
36 | 36 | * @var Zend\Permissions\Acl\Acl $acl |
37 | 37 | **/ |
38 | 38 | $acl = $this->view->navigation()->getAcl(); |
39 | - if (empty($resource) || !$acl->hasResource($resource) ) { |
|
39 | + if (empty($resource) || !$acl->hasResource($resource)) { |
|
40 | 40 | return true; |
41 | 41 | } |
42 | 42 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } else { |
50 | 50 | $role = 'public'; |
51 | 51 | } |
52 | - return ( $acl->isAllowed($role, $resource) ); |
|
52 | + return ($acl->isAllowed($role, $resource)); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * __invoke |
29 | 29 | * |
30 | 30 | * @access public |
31 | - * @return \ZfcUser\Entity\UserInterface |
|
31 | + * @return boolean |
|
32 | 32 | */ |
33 | 33 | public function __invoke( $resource ) |
34 | 34 | { |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * Set authService. |
67 | 67 | * |
68 | 68 | * @param AuthenticationService $authService |
69 | - * @return \ZfcUser\View\Helper\ZfcUserIdentity |
|
69 | + * @return Isdenied |
|
70 | 70 | */ |
71 | 71 | public function setAuthService(AuthenticationService $authService) |
72 | 72 | { |
@@ -33,14 +33,14 @@ |
||
33 | 33 | public function __invoke( $resource ) |
34 | 34 | { |
35 | 35 | /** |
36 | - * @var \Zend\Permissions\Acl\Acl $acl |
|
36 | + * @var \Zend\Permissions\Acl\Acl $acl |
|
37 | 37 | **/ |
38 | 38 | $acl = $this->view->navigation()->getAcl(); |
39 | 39 | if (empty($resource) || !$acl->hasResource($resource) ) { |
40 | 40 | return true; |
41 | 41 | } |
42 | 42 | /** |
43 | - * @var \Admin\Entity\User $user |
|
43 | + * @var \Admin\Entity\User $user |
|
44 | 44 | **/ |
45 | 45 | $user = $this->view->zfcUserIdentity(); // ->getIdentity(); |
46 | 46 | if ($user) { // ($this->getAuthService()->hasIdentity()) { |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | * @access public |
31 | 31 | * @return \ZfcUser\Entity\UserInterface |
32 | 32 | */ |
33 | - public function __invoke( $resource ) |
|
33 | + public function __invoke($resource) |
|
34 | 34 | { |
35 | 35 | /** |
36 | 36 | * @var \Zend\Permissions\Acl\Acl $acl |
37 | 37 | **/ |
38 | 38 | $acl = $this->view->navigation()->getAcl(); |
39 | - if (empty($resource) || !$acl->hasResource($resource) ) { |
|
39 | + if (empty($resource) || !$acl->hasResource($resource)) { |
|
40 | 40 | return true; |
41 | 41 | } |
42 | 42 | /** |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } else { |
50 | 50 | $role = 'public'; |
51 | 51 | } |
52 | - return ( !$acl->isAllowed($role, $resource) ); |
|
52 | + return (!$acl->isAllowed($role, $resource)); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -51,7 +51,6 @@ |
||
51 | 51 | * set a single toolbar items for a specific action |
52 | 52 | * |
53 | 53 | * @param array|\Zend\Mvc\AbstractPage $action |
54 | - * @param string $title |
|
55 | 54 | * @return self |
56 | 55 | */ |
57 | 56 | public function setToolbarItem($action, $item) |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | public function getToolbarItems() |
24 | 24 | { |
25 | - return $this->toolbarItems ; |
|
25 | + return $this->toolbarItems; |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -57,9 +57,9 @@ |
||
57 | 57 | /** |
58 | 58 | * return translated content |
59 | 59 | * |
60 | - * @param string $translator |
|
61 | 60 | * @param string $textdomain |
62 | 61 | * @param string $locale |
62 | + * @param string $message |
|
63 | 63 | * @return string |
64 | 64 | */ |
65 | 65 | public function translate($message, $textdomain = 'default', $locale = null) |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | trait ControllerTranslatorTrait { |
24 | 24 | |
25 | - /** |
|
25 | + /** |
|
26 | 26 | * |
27 | 27 | * @var \Zend\I18n\Translator\Translator |
28 | 28 | */ |
@@ -64,7 +64,7 @@ |
||
64 | 64 | */ |
65 | 65 | public function translate($message, $textdomain = 'default', $locale = null) |
66 | 66 | { |
67 | - return ( $this->getTranslator()->translate($message, $textdomain, $locale) ); |
|
67 | + return ($this->getTranslator()->translate($message, $textdomain, $locale)); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | * |
13 | 13 | * @param ServiceLocatorInterface $serviceLocator |
14 | 14 | * |
15 | - * @return mixed |
|
15 | + * @return IndexController |
|
16 | 16 | */ |
17 | 17 | public function createService(ServiceLocatorInterface $serviceLocator) |
18 | 18 | { |
@@ -12,7 +12,7 @@ |
||
12 | 12 | * |
13 | 13 | * @param ServiceLocatorInterface $serviceLocator |
14 | 14 | * |
15 | - * @return mixed |
|
15 | + * @return SetupController |
|
16 | 16 | */ |
17 | 17 | public function createService(ServiceLocatorInterface $serviceLocator) |
18 | 18 | { |