@@ -28,66 +28,66 @@ discard block |
||
28 | 28 | */ |
29 | 29 | class ManageController extends AbstractActionController |
30 | 30 | { |
31 | - private $userProfileContainer; |
|
31 | + private $userProfileContainer; |
|
32 | 32 | |
33 | - private $authService; |
|
33 | + private $authService; |
|
34 | 34 | |
35 | - private $socialProfileForm; |
|
35 | + private $socialProfileForm; |
|
36 | 36 | |
37 | - private $translator; |
|
37 | + private $translator; |
|
38 | 38 | |
39 | - private $repositories; |
|
39 | + private $repositories; |
|
40 | 40 | |
41 | - private $viewHelper; |
|
41 | + private $viewHelper; |
|
42 | 42 | |
43 | - private $hybridAuthAdapter; |
|
43 | + private $hybridAuthAdapter; |
|
44 | 44 | |
45 | - /** |
|
46 | - * @param ContainerInterface $container |
|
47 | - * @return ManageController |
|
48 | - */ |
|
49 | - static public function factory(ContainerInterface $container) |
|
50 | - { |
|
51 | - $forms = $container->get('forms'); |
|
52 | - $userProfileContainer = $forms->get('Auth/UserProfileContainer'); |
|
53 | - $socialProfileForm = $forms->get('Auth/SocialProfiles'); |
|
54 | - $authService = $container->get('AuthenticationService'); |
|
55 | - $translator = $container->get('translator'); |
|
56 | - $repositories = $container->get('repositories'); |
|
57 | - $viewHelper = $container->get('ViewHelperManager'); |
|
58 | - $hybridAuthAdapter = $container->get('HybridAuthAdapter'); |
|
59 | - $controller = new ManageController( |
|
60 | - $userProfileContainer, |
|
61 | - $authService, |
|
62 | - $repositories, |
|
63 | - $socialProfileForm, |
|
64 | - $translator, |
|
65 | - $viewHelper, |
|
66 | - $hybridAuthAdapter |
|
67 | - ); |
|
68 | - return $controller; |
|
69 | - } |
|
45 | + /** |
|
46 | + * @param ContainerInterface $container |
|
47 | + * @return ManageController |
|
48 | + */ |
|
49 | + static public function factory(ContainerInterface $container) |
|
50 | + { |
|
51 | + $forms = $container->get('forms'); |
|
52 | + $userProfileContainer = $forms->get('Auth/UserProfileContainer'); |
|
53 | + $socialProfileForm = $forms->get('Auth/SocialProfiles'); |
|
54 | + $authService = $container->get('AuthenticationService'); |
|
55 | + $translator = $container->get('translator'); |
|
56 | + $repositories = $container->get('repositories'); |
|
57 | + $viewHelper = $container->get('ViewHelperManager'); |
|
58 | + $hybridAuthAdapter = $container->get('HybridAuthAdapter'); |
|
59 | + $controller = new ManageController( |
|
60 | + $userProfileContainer, |
|
61 | + $authService, |
|
62 | + $repositories, |
|
63 | + $socialProfileForm, |
|
64 | + $translator, |
|
65 | + $viewHelper, |
|
66 | + $hybridAuthAdapter |
|
67 | + ); |
|
68 | + return $controller; |
|
69 | + } |
|
70 | 70 | |
71 | - public function __construct( |
|
72 | - UserProfileContainer $userProfileContainer, |
|
73 | - AuthenticationService $authService, |
|
74 | - RepositoryService $repositories, |
|
75 | - SocialProfiles $socialProfileForm, |
|
76 | - Translator $translator, |
|
77 | - HelperPluginManager $viewHelper, |
|
78 | - HybridAuth $hybridAuthAdapter |
|
79 | - ) |
|
80 | - { |
|
81 | - $this->userProfileContainer = $userProfileContainer; |
|
82 | - $this->authService = $authService; |
|
83 | - $this->socialProfileForm = $socialProfileForm; |
|
84 | - $this->repositories = $repositories; |
|
85 | - $this->translator = $translator; |
|
86 | - $this->viewHelper = $viewHelper; |
|
87 | - $this->hybridAuthAdapter = $hybridAuthAdapter; |
|
88 | - } |
|
71 | + public function __construct( |
|
72 | + UserProfileContainer $userProfileContainer, |
|
73 | + AuthenticationService $authService, |
|
74 | + RepositoryService $repositories, |
|
75 | + SocialProfiles $socialProfileForm, |
|
76 | + Translator $translator, |
|
77 | + HelperPluginManager $viewHelper, |
|
78 | + HybridAuth $hybridAuthAdapter |
|
79 | + ) |
|
80 | + { |
|
81 | + $this->userProfileContainer = $userProfileContainer; |
|
82 | + $this->authService = $authService; |
|
83 | + $this->socialProfileForm = $socialProfileForm; |
|
84 | + $this->repositories = $repositories; |
|
85 | + $this->translator = $translator; |
|
86 | + $this->viewHelper = $viewHelper; |
|
87 | + $this->hybridAuthAdapter = $hybridAuthAdapter; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
90 | + /** |
|
91 | 91 | * @return array|JsonModel |
92 | 92 | */ |
93 | 93 | public function profileAction() |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $postData = $form->getOption('use_post_array') ? $_POST : array(); |
122 | 122 | //@TODO: [ZF3] option use_files_array is false by default |
123 | 123 | //$filesData = $form->getOption('use_files_array') ? $_FILES : array(); |
124 | - $filesData = $_FILES; |
|
124 | + $filesData = $_FILES; |
|
125 | 125 | $data = array_merge($postData, $filesData); |
126 | 126 | $form->setData($data); |
127 | 127 |
@@ -37,14 +37,14 @@ |
||
37 | 37 | $this->options['allowName'] = isset($options['allowName']) ? $options['allowName'] : null; |
38 | 38 | } |
39 | 39 | |
40 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
41 | - { |
|
42 | - $auth = $container->get('AuthenticationService'); |
|
43 | - $user = $auth->getUser(); |
|
44 | - $options = $this->options; |
|
45 | - $options['user'] = $user; |
|
46 | - $validator = new UniqueGroupName($options); |
|
40 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
41 | + { |
|
42 | + $auth = $container->get('AuthenticationService'); |
|
43 | + $user = $auth->getUser(); |
|
44 | + $options = $this->options; |
|
45 | + $options['user'] = $user; |
|
46 | + $validator = new UniqueGroupName($options); |
|
47 | 47 | |
48 | - return $validator; |
|
49 | - } |
|
48 | + return $validator; |
|
49 | + } |
|
50 | 50 | } |
@@ -55,8 +55,8 @@ |
||
55 | 55 | { |
56 | 56 | /* @var $options \Applications\Options\ModuleOptions */ |
57 | 57 | $form->get($this->fileName)->setViewHelper('formImageUpload') |
58 | - ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | - ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | - ->setForm($form); |
|
58 | + ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | + ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | + ->setForm($form); |
|
61 | 61 | } |
62 | 62 | } |
@@ -62,7 +62,7 @@ |
||
62 | 62 | 'info' => array( |
63 | 63 | 'type' => 'Auth/UserInfo', |
64 | 64 | 'property' => true, |
65 | - 'use_post_array' => true |
|
65 | + 'use_post_array' => true |
|
66 | 66 | ), |
67 | 67 | 'image' => array( |
68 | 68 | 'type' => 'Auth/UserImage', |
@@ -56,6 +56,6 @@ |
||
56 | 56 | $form = new static(); |
57 | 57 | $form->forms = $forms->get('FormElementManager'); |
58 | 58 | |
59 | - return $form; |
|
59 | + return $form; |
|
60 | 60 | } |
61 | 61 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | 'controllers' => [ |
51 | 51 | 'factories' => [ |
52 | - 'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'], |
|
52 | + 'Organizations/InviteEmployee' => [\Organizations\Controller\InviteEmployeeController::class,'factory'], |
|
53 | 53 | 'Organizations/Index' => 'Organizations\Factory\Controller\IndexControllerFactory', |
54 | 54 | ] |
55 | 55 | ], |
@@ -65,14 +65,14 @@ discard block |
||
65 | 65 | 'view_manager' => [ |
66 | 66 | // Map template to files. Speeds up the lookup through the template stack. |
67 | 67 | 'template_map' => [ |
68 | - 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
69 | - 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
70 | - 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
71 | - 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
72 | - 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
73 | - 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
74 | - 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
75 | - 'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml', |
|
68 | + 'organizations/index/edit' => __DIR__ . '/../view/organizations/index/form.phtml', |
|
69 | + 'organizations/form/employees-fieldset' => __DIR__ . '/../view/form/employees-fieldset.phtml', |
|
70 | + 'organizations/form/employee-fieldset' => __DIR__ .'/../view/form/employee-fieldset.phtml', |
|
71 | + 'organizations/form/invite-employee-bar' => __DIR__ . '/../view/form/invite-employee-bar.phtml', |
|
72 | + 'organizations/error/no-parent' => __DIR__ . '/../view/error/no-parent.phtml', |
|
73 | + 'organizations/error/invite' => __DIR__ . '/../view/error/invite.phtml', |
|
74 | + 'organizations/mail/invite-employee' => __DIR__ . '/../view/mail/invite-employee.phtml', |
|
75 | + 'organizations/form/workflow-fieldset' => __DIR__ . '/../view/form/workflow-fieldset.phtml', |
|
76 | 76 | ], |
77 | 77 | // Where to look for view templates not mapped above |
78 | 78 | 'template_path_stack' => [ |
@@ -81,23 +81,23 @@ discard block |
||
81 | 81 | ], |
82 | 82 | 'form_elements' => [ |
83 | 83 | 'invokables' => [ |
84 | - 'Organizations/Form' => 'Organizations\Form\Organizations', |
|
85 | - 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
86 | - 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
87 | - 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
88 | - 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
89 | - 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
90 | - //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
91 | - 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
92 | - 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
93 | - 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
94 | - 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
95 | - 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
96 | - 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
84 | + 'Organizations/Form' => 'Organizations\Form\Organizations', |
|
85 | + 'Organizations/OrganizationsContactForm' => 'Organizations\Form\OrganizationsContactForm', |
|
86 | + 'Organizations/OrganizationsNameForm' => 'Organizations\Form\OrganizationsNameForm', |
|
87 | + 'Organizations/OrganizationsDescriptionForm' => 'Organizations\Form\OrganizationsDescriptionForm', |
|
88 | + 'Organizations/OrganizationsContactFieldset' => 'Organizations\Form\OrganizationsContactFieldset', |
|
89 | + 'Organizations/OrganizationsDescriptionFieldset' => 'Organizations\Form\OrganizationsDescriptionFieldset', |
|
90 | + //'Organizations/OrganizationFieldset' => 'Organizations\Form\OrganizationFieldset', |
|
91 | + 'Organizations/EmployeesContainer' => 'Organizations\Form\EmployeesContainer', |
|
92 | + 'Organizations/Employees' => 'Organizations\Form\Employees', |
|
93 | + 'Organizations/InviteEmployeeBar' => 'Organizations\Form\Element\InviteEmployeeBar', |
|
94 | + 'Organizations/Employee' => 'Organizations\Form\Element\Employee', |
|
95 | + 'Organizations/WorkflowSettings' => 'Organizations\Form\WorkflowSettings', |
|
96 | + 'Organizations/WorkflowSettingsFieldset' => 'Organizations\Form\WorkflowSettingsFieldset', |
|
97 | 97 | |
98 | 98 | ], |
99 | 99 | 'factories' => [ |
100 | - 'Organizations/OrganizationsNameFieldset' => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class, |
|
100 | + 'Organizations/OrganizationsNameFieldset' => \Organizations\Factory\Form\OrganizationsNameFieldsetFactory::class, |
|
101 | 101 | 'Organizations/Image' => \Organizations\Form\LogoImageFactory::class, |
102 | 102 | 'Organizations/EmployeesFieldset' => 'Organizations\Factory\Form\EmployeesFieldsetFactory', |
103 | 103 | 'Organizations/EmployeeFieldset' => 'Organizations\Factory\Form\EmployeeFieldsetFactory', |
@@ -194,13 +194,13 @@ discard block |
||
194 | 194 | |
195 | 195 | 'service_manager' => [ |
196 | 196 | 'invokables' => [ |
197 | - 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
197 | + 'Organizations\Auth\Dependency\EmployeeListListener' => 'Organizations\Auth\Dependency\EmployeeListListener' |
|
198 | 198 | ], |
199 | 199 | 'factories' => [ |
200 | - 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
201 | - 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
202 | - 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
203 | - 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory', |
|
200 | + 'Organizations\Auth\Dependency\ListListener' => 'Organizations\Factory\Auth\Dependency\ListListenerFactory', |
|
201 | + 'Organizations\ImageFileCache\Manager' => 'Organizations\Factory\ImageFileCache\ManagerFactory', |
|
202 | + 'Organizations\ImageFileCache\ODMListener' => 'Organizations\Factory\ImageFileCache\ODMListenerFactory', |
|
203 | + 'Organizations\ImageFileCache\ApplicationListener' => 'Organizations\Factory\ImageFileCache\ApplicationListenerFactory', |
|
204 | 204 | ], |
205 | 205 | ], |
206 | 206 |
@@ -129,10 +129,10 @@ discard block |
||
129 | 129 | // ) |
130 | 130 | // ); |
131 | 131 | $qb->addAnd($qb->expr()->field('user')->equals($userId)) |
132 | - ->addAnd( |
|
133 | - $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
134 | - ->addOr($qb->expr()->field('parent')->equals(null)) |
|
135 | - ); |
|
132 | + ->addAnd( |
|
133 | + $qb->expr()->addOr($qb->expr()->field('parent')->exists(false)) |
|
134 | + ->addOr($qb->expr()->field('parent')->equals(null)) |
|
135 | + ); |
|
136 | 136 | |
137 | 137 | $q = $qb->getQuery(); |
138 | 138 | $entity = $q->getSingleResult(); |
@@ -192,11 +192,11 @@ discard block |
||
192 | 192 | return $c; |
193 | 193 | } |
194 | 194 | |
195 | - /** |
|
196 | - * @param array|null $data |
|
197 | - * |
|
198 | - * @return \Organizations\Entity\Organization |
|
199 | - */ |
|
195 | + /** |
|
196 | + * @param array|null $data |
|
197 | + * |
|
198 | + * @return \Organizations\Entity\Organization |
|
199 | + */ |
|
200 | 200 | public function create(array $data = null) |
201 | 201 | { |
202 | 202 | $entity = parent::create($data); |
@@ -17,18 +17,18 @@ |
||
17 | 17 | |
18 | 18 | class OrganizationHydratorFactory implements FactoryInterface |
19 | 19 | { |
20 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
21 | - $repositoryManager = $container->get('repositories'); |
|
22 | - $repOrganization = $repositoryManager->get('Organizations/Organization'); |
|
23 | - $repOrganizationName = $repositoryManager->get('Organizations/OrganizationName'); |
|
24 | - $repOrganizationImage = $repositoryManager->get('Organizations/OrganizationImage'); |
|
25 | - $object = new OrganizationHydrator($repOrganization, $repOrganizationName, $repOrganizationImage); |
|
20 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
21 | + $repositoryManager = $container->get('repositories'); |
|
22 | + $repOrganization = $repositoryManager->get('Organizations/Organization'); |
|
23 | + $repOrganizationName = $repositoryManager->get('Organizations/OrganizationName'); |
|
24 | + $repOrganizationImage = $repositoryManager->get('Organizations/OrganizationImage'); |
|
25 | + $object = new OrganizationHydrator($repOrganization, $repOrganizationName, $repOrganizationImage); |
|
26 | 26 | |
27 | - // injecting the strategies |
|
28 | - $httpload = new HttploadStrategy($repOrganizationImage); |
|
29 | - $organizationName = new OrganizationNameStrategy($repOrganizationName); |
|
30 | - $object->addStrategy('image', $httpload); |
|
31 | - $object->addStrategy('organizationName', $organizationName); |
|
32 | - return $object; |
|
33 | - } |
|
27 | + // injecting the strategies |
|
28 | + $httpload = new HttploadStrategy($repOrganizationImage); |
|
29 | + $organizationName = new OrganizationNameStrategy($repOrganizationName); |
|
30 | + $object->addStrategy('image', $httpload); |
|
31 | + $object->addStrategy('organizationName', $organizationName); |
|
32 | + return $object; |
|
33 | + } |
|
34 | 34 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | { |
27 | 27 | public function __invoke(ContainerInterface $container, $requestedName, array $options = null) |
28 | 28 | { |
29 | - // @TODO: [ZF3] Check if InvitationHandlerFactory still working properly |
|
29 | + // @TODO: [ZF3] Check if InvitationHandlerFactory still working properly |
|
30 | 30 | |
31 | 31 | /* @var $container \Zend\Mvc\Controller\PluginManager */ |
32 | 32 | $validator = $container->get('ValidatorManager')->get('EmailAddress'); |