@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | $identity = $this->getIdentity(); |
118 | - $applicationId = '@' . $this->getApplicationIdentifier(); |
|
118 | + $applicationId = '@'.$this->getApplicationIdentifier(); |
|
119 | 119 | $applicationIdIndex = strrpos($identity, $applicationId); |
120 | 120 | //$login = (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex)?substr($identity, 0, $applicationIdIndex):$identity; |
121 | 121 | $login = $identity; |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | $loginSuccess = false; |
129 | 129 | $loginResult = array(); |
130 | 130 | |
131 | - if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
132 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with correct suffix: '); |
|
131 | + if (0 < $applicationIdIndex && strlen($identity) - strlen($applicationId) == $applicationIdIndex) { |
|
132 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with correct suffix: '); |
|
133 | 133 | // the login ends with the applicationID, therefore use the secret key |
134 | 134 | // the external login must be the form 'xxxxx@yyyy' where yyyy is the matching suffix to the external application key |
135 | 135 | if (isset($user)) { |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | $loginSuccess = true; |
138 | 138 | } else { |
139 | 139 | $loginSuccess = false; |
140 | - $this->serviceManager->get('Core/Log')->info('User ' . $login . ', secret: ' . $user->getSecret() . ' != loginPassword: ' . $filter->filter($credential) . ' (' . $credential . ')'); |
|
140 | + $this->serviceManager->get('Core/Log')->info('User '.$login.', secret: '.$user->getSecret().' != loginPassword: '.$filter->filter($credential).' ('.$credential.')'); |
|
141 | 141 | } |
142 | 142 | } else { |
143 | 143 | $user = $users->create( |
@@ -153,17 +153,17 @@ discard block |
||
153 | 153 | $loginResult = array('firstLogin' => true); |
154 | 154 | } |
155 | 155 | } elseif (isset($user)) { |
156 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', login with incorrect suffix: '); |
|
156 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', login with incorrect suffix: '); |
|
157 | 157 | if ($user->getCredential() == $filter->filter($credential)) { |
158 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are equal'); |
|
158 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are equal'); |
|
159 | 159 | $loginSuccess = true; |
160 | 160 | } elseif (!empty($applicationId)) { |
161 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials are not equal'); |
|
161 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials are not equal'); |
|
162 | 162 | // TODO: remove this code as soon as the secret key has been fully established |
163 | 163 | // basically this does allow an external login with an applicationIndex match against the User-Password |
164 | 164 | // the way it had been used in the start |
165 | 165 | if ($user->getCredential() == $filter->filter($credential)) { |
166 | - $this->serviceManager->get('Core/Log')->debug('User ' . $login . ', credentials2 test'); |
|
166 | + $this->serviceManager->get('Core/Log')->debug('User '.$login.', credentials2 test'); |
|
167 | 167 | $loginSuccess = true; |
168 | 168 | } |
169 | 169 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | 'translation_file_patterns' => [ |
38 | 38 | [ |
39 | 39 | 'type' => 'gettext', |
40 | - 'base_dir' => __DIR__ . '/../language', |
|
40 | + 'base_dir' => __DIR__.'/../language', |
|
41 | 41 | 'pattern' => '%s.mo', |
42 | 42 | ], |
43 | 43 | ], |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | // Configuration of the controller service manager (Which loads controllers) |
88 | 88 | 'controllers' => [ |
89 | 89 | 'factories' => [ |
90 | - 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
90 | + 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class, 'factory'] |
|
91 | 91 | ], |
92 | 92 | ], |
93 | 93 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | // Where to look for view templates not mapped above |
101 | 101 | 'template_path_stack' => [ |
102 | - __DIR__ . '/../view', |
|
102 | + __DIR__.'/../view', |
|
103 | 103 | ], |
104 | 104 | ], |
105 | 105 | |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | 'factories' => [ |
116 | 116 | 'Settings' => '\Settings\Settings\SettingsFactory', |
117 | 117 | 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
118 | - 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
118 | + 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class, 'factory'], |
|
119 | 119 | ], |
120 | 120 | 'initializers' => [], |
121 | 121 | 'shared' => [], |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | |
129 | 129 | 'form_elements' => [ |
130 | 130 | 'factories' => [ |
131 | - 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
132 | - 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
131 | + 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class, 'factory'], |
|
132 | + 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class, 'factory'], |
|
133 | 133 | 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
134 | 134 | ], |
135 | 135 | 'aliases' => [ |
@@ -3,12 +3,12 @@ |
||
3 | 3 | return array( |
4 | 4 | 'service_manager' => array( |
5 | 5 | 'factories' => array( |
6 | - 'Html2PdfConverter' => [Pdf\Module::class,'factory'], //'Pdf\Module::factory', |
|
6 | + 'Html2PdfConverter' => [Pdf\Module::class, 'factory'], //'Pdf\Module::factory', |
|
7 | 7 | ) |
8 | 8 | ), |
9 | 9 | 'view_manager' => array( |
10 | 10 | 'template_map' => array( |
11 | - 'pdf/application/details/button' => __DIR__ . '/../view/applicationDetailsButton.phtml', |
|
11 | + 'pdf/application/details/button' => __DIR__.'/../view/applicationDetailsButton.phtml', |
|
12 | 12 | ) |
13 | 13 | ), |
14 | 14 | ); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * for multiple paths. |
42 | 42 | * example https://github.com/doctrine/DoctrineORMModule |
43 | 43 | */ |
44 | - 'paths' => [ __DIR__ . '/../src/Auth/Entity'], |
|
44 | + 'paths' => [__DIR__.'/../src/Auth/Entity'], |
|
45 | 45 | ], |
46 | 46 | ], |
47 | 47 | ], |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | 'Auth/SocialProfiles' => 'Auth\Controller\SocialProfilesController', |
92 | 92 | ], |
93 | 93 | 'factories' => [ |
94 | - 'Auth\Controller\Manage' => [ManageController::class,'factory'], |
|
95 | - 'Auth/ManageGroups' => [ManageGroupsController::class,'factory'], |
|
94 | + 'Auth\Controller\Manage' => [ManageController::class, 'factory'], |
|
95 | + 'Auth/ManageGroups' => [ManageGroupsController::class, 'factory'], |
|
96 | 96 | 'Auth\Controller\ForgotPassword' => 'Auth\Factory\Controller\ForgotPasswordControllerFactory', |
97 | 97 | 'Auth\Controller\GotoResetPassword' => 'Auth\Factory\Controller\GotoResetPasswordControllerFactory', |
98 | 98 | 'Auth\Controller\Register' => 'Auth\Factory\Controller\RegisterControllerFactory', |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | 'Auth/SocialProfiles' => 'Auth\Controller\Plugin\Service\SocialProfilesFactory', |
110 | 110 | 'Acl' => '\Acl\Controller\Plugin\AclFactory', |
111 | 111 | 'Auth/LoginFilter' => 'Auth\Controller\Plugin\LoginFilter::factory', |
112 | - 'OAuth' => [\Auth\Controller\Plugin\OAuth::class,'factory'], |
|
113 | - 'Auth' => [Auth::class,'factory'], |
|
112 | + 'OAuth' => [\Auth\Controller\Plugin\OAuth::class, 'factory'], |
|
113 | + 'Auth' => [Auth::class, 'factory'], |
|
114 | 114 | 'Auth/User/Switcher' => 'Auth\Factory\Controller\Plugin\UserSwitcherFactory', |
115 | 115 | ], |
116 | 116 | 'shared' => [ |
@@ -124,13 +124,13 @@ discard block |
||
124 | 124 | 'hybridauth' => [ |
125 | 125 | "Facebook" => [ |
126 | 126 | "enabled" => true, |
127 | - "keys" => [ "id" => "", "secret" => "" ], |
|
127 | + "keys" => ["id" => "", "secret" => ""], |
|
128 | 128 | "scope" => 'email, user_about_me, user_birthday, user_hometown, user_website', |
129 | 129 | "display" => 'popup', |
130 | 130 | ], |
131 | 131 | "LinkedIn" => [ |
132 | 132 | "enabled" => true, |
133 | - "keys" => [ "key" => "", "secret" => "" ], |
|
133 | + "keys" => ["key" => "", "secret" => ""], |
|
134 | 134 | ], |
135 | 135 | "XING" => [ |
136 | 136 | "enabled" => true, |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | 'class' => 'Hybrid_Providers_XING', |
141 | 141 | 'path' => __FILE__, |
142 | 142 | ], |
143 | - "keys" => [ "key" => "", "secret" => "" ], |
|
143 | + "keys" => ["key" => "", "secret" => ""], |
|
144 | 144 | ], |
145 | 145 | "Github" => [ |
146 | 146 | "enabled" => true, |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | 'class' => 'Hybrid_Providers_Github', |
151 | 151 | 'path' => __FILE__, |
152 | 152 | ], |
153 | - "keys" => [ "key" => "", "secret" => "" ], |
|
153 | + "keys" => ["key" => "", "secret" => ""], |
|
154 | 154 | ], |
155 | 155 | |
156 | 156 | ], |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | 'translation_file_patterns' => [ |
254 | 254 | [ |
255 | 255 | 'type' => 'gettext', |
256 | - 'base_dir' => __DIR__ . '/../language', |
|
256 | + 'base_dir' => __DIR__.'/../language', |
|
257 | 257 | 'pattern' => '%s.mo', |
258 | 258 | ], |
259 | 259 | ], |
@@ -262,30 +262,30 @@ discard block |
||
262 | 262 | // Configure the view service manager |
263 | 263 | 'view_manager' => [ |
264 | 264 | 'template_map' => [ |
265 | - 'form/auth/contact.form' => __DIR__ . '/../view/form/contact.form.phtml', |
|
266 | - 'form/auth/contact.view' => __DIR__ . '/../view/form/contact.view.phtml', |
|
267 | - 'form/auth/status.form' => __DIR__ . '/../view/form/status.form.phtml', |
|
268 | - 'form/auth/status.view' => __DIR__ . '/../view/form/status.view.phtml', |
|
269 | - 'auth/error/social-profiles-unconfigured' => __DIR__ . '/../view/error/social-profiles-unconfigured.phtml', |
|
270 | - 'auth/form/user-info-container' => __DIR__ . '/../view/form/user-info-container.phtml', |
|
271 | - 'auth/form/user-status-container' => __DIR__ . '/../view/form/user-status-container.phtml', |
|
272 | - 'auth/form/userselect' => __DIR__ . '/../view/form/userselect.phtml', |
|
273 | - 'auth/form/social-profiles-fieldset' => __DIR__ . '/../view/form/social-profiles-fieldset.phtml', |
|
274 | - 'auth/form/social-profiles-button' => __DIR__ . '/../view/form/social-profiles-button.phtml', |
|
275 | - 'auth/sidebar/groups-menu' => __DIR__ . '/../view/sidebar/groups-menu.phtml', |
|
276 | - 'mail/first-external-login' => __DIR__ . '/../view/mail/first-external-login.phtml', |
|
277 | - 'mail/first-socialmedia-login' => __DIR__ . '/../view/mail/first-socialmedia-login.phtml', |
|
278 | - 'mail/forgotPassword' => __DIR__ . '/../view/mail/forgot-password.phtml', |
|
279 | - 'mail/forgotPassword.en' => __DIR__ . '/../view/mail/forgot-password.en.phtml', |
|
280 | - 'mail/register' => __DIR__ . '/../view/mail/register.phtml', |
|
281 | - 'auth/mail/new-registration' => __DIR__ . '/../view/mail/new-registration.phtml', |
|
282 | - 'auth/mail/new-registration.de' => __DIR__ . '/../view/mail/new-registration.de.phtml', |
|
283 | - 'auth/mail/user-confirmed' => __DIR__ . '/../view/mail/user-confirmed.phtml', |
|
284 | - 'auth/mail/user-confirmed.de' => __DIR__ . '/../view/mail/user-confirmed.de.phtml', |
|
265 | + 'form/auth/contact.form' => __DIR__.'/../view/form/contact.form.phtml', |
|
266 | + 'form/auth/contact.view' => __DIR__.'/../view/form/contact.view.phtml', |
|
267 | + 'form/auth/status.form' => __DIR__.'/../view/form/status.form.phtml', |
|
268 | + 'form/auth/status.view' => __DIR__.'/../view/form/status.view.phtml', |
|
269 | + 'auth/error/social-profiles-unconfigured' => __DIR__.'/../view/error/social-profiles-unconfigured.phtml', |
|
270 | + 'auth/form/user-info-container' => __DIR__.'/../view/form/user-info-container.phtml', |
|
271 | + 'auth/form/user-status-container' => __DIR__.'/../view/form/user-status-container.phtml', |
|
272 | + 'auth/form/userselect' => __DIR__.'/../view/form/userselect.phtml', |
|
273 | + 'auth/form/social-profiles-fieldset' => __DIR__.'/../view/form/social-profiles-fieldset.phtml', |
|
274 | + 'auth/form/social-profiles-button' => __DIR__.'/../view/form/social-profiles-button.phtml', |
|
275 | + 'auth/sidebar/groups-menu' => __DIR__.'/../view/sidebar/groups-menu.phtml', |
|
276 | + 'mail/first-external-login' => __DIR__.'/../view/mail/first-external-login.phtml', |
|
277 | + 'mail/first-socialmedia-login' => __DIR__.'/../view/mail/first-socialmedia-login.phtml', |
|
278 | + 'mail/forgotPassword' => __DIR__.'/../view/mail/forgot-password.phtml', |
|
279 | + 'mail/forgotPassword.en' => __DIR__.'/../view/mail/forgot-password.en.phtml', |
|
280 | + 'mail/register' => __DIR__.'/../view/mail/register.phtml', |
|
281 | + 'auth/mail/new-registration' => __DIR__.'/../view/mail/new-registration.phtml', |
|
282 | + 'auth/mail/new-registration.de' => __DIR__.'/../view/mail/new-registration.de.phtml', |
|
283 | + 'auth/mail/user-confirmed' => __DIR__.'/../view/mail/user-confirmed.phtml', |
|
284 | + 'auth/mail/user-confirmed.de' => __DIR__.'/../view/mail/user-confirmed.de.phtml', |
|
285 | 285 | ], |
286 | 286 | |
287 | 287 | 'template_path_stack' => [ |
288 | - 'Auth' => __DIR__ . '/../view', |
|
288 | + 'Auth' => __DIR__.'/../view', |
|
289 | 289 | ], |
290 | 290 | ], |
291 | 291 | |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | 'Auth/UserImage' => 'Auth\Form\UserImageFactory', |
342 | 342 | 'Auth\Form\Login' => 'Auth\Factory\Form\LoginFactory', |
343 | 343 | 'Auth\Form\Register' => 'Auth\Factory\Form\RegisterFactory', |
344 | - 'user-password' => [\Auth\Form\UserPassword::class,'factory'], |
|
344 | + 'user-password' => [\Auth\Form\UserPassword::class, 'factory'], |
|
345 | 345 | ] |
346 | 346 | ], |
347 | 347 | |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | 'service' => 'Core/EventManager', |
351 | 351 | 'event' => AuthEvent::class, |
352 | 352 | 'listeners' => [ |
353 | - Listener\MailForgotPassword::class => [ AuthEvent::EVENT_AUTH_NEWPASSWORD, 10, true ], |
|
353 | + Listener\MailForgotPassword::class => [AuthEvent::EVENT_AUTH_NEWPASSWORD, 10, true], |
|
354 | 354 | Listener\SendRegistrationNotifications::class => [ |
355 | - [ AuthEvent::EVENT_USER_REGISTERED, AuthEvent::EVENT_USER_CONFIRMED ], |
|
355 | + [AuthEvent::EVENT_USER_REGISTERED, AuthEvent::EVENT_USER_CONFIRMED], |
|
356 | 356 | true |
357 | 357 | ], |
358 | 358 | ], |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | * @param EventManagerInterface $events |
60 | 60 | * @param integer $priority |
61 | 61 | */ |
62 | - public function attach(EventManagerInterface $events, $priority=1) |
|
62 | + public function attach(EventManagerInterface $events, $priority = 1) |
|
63 | 63 | { |
64 | 64 | $this->listeners[] = $events->attach(MvcEvent::EVENT_ROUTE, array($this, 'onRoute'), -10); |
65 | 65 | $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH, array($this, 'onDispatch'), 10); |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $eventManager->setEventPrototype($event); |
128 | 128 | $results = $eventManager->trigger(MvcEvent::EVENT_DISPATCH_ERROR); |
129 | 129 | if (count($results)) { |
130 | - $return = $results->last(); |
|
130 | + $return = $results->last(); |
|
131 | 131 | } else { |
132 | 132 | $return = $event->getParams(); |
133 | 133 | } |
@@ -102,7 +102,7 @@ |
||
102 | 102 | |
103 | 103 | $events = $this->getEventManager(); |
104 | 104 | |
105 | - $callback = function ($r) { |
|
105 | + $callback = function($r) { |
|
106 | 106 | return false === $r; |
107 | 107 | }; |
108 | 108 |
@@ -20,13 +20,13 @@ |
||
20 | 20 | */ |
21 | 21 | class AssertionManagerFactory implements FactoryInterface |
22 | 22 | { |
23 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) { |
|
23 | + public function __invoke(ContainerInterface $container, $requestedName, array $options = null) { |
|
24 | 24 | $configContainer = $container->get('Config'); |
25 | 25 | $configArray = isset($configContainer['acl']['assertions']) |
26 | 26 | ? $configContainer['acl']['assertions'] |
27 | 27 | : array(); |
28 | 28 | |
29 | - $manager = new AssertionManager($container, $configArray); |
|
29 | + $manager = new AssertionManager($container, $configArray); |
|
30 | 30 | |
31 | 31 | $manager->configure(['shared_by_default'=>false]); |
32 | 32 | return $manager; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | { |
43 | 43 | /* @var $events \Zend\EventManager\SharedEventManager */ |
44 | 44 | $events->attach('Zend\Mvc\Application', MvcEvent::EVENT_BOOTSTRAP, array($this, 'onBootstrap'), $priority); |
45 | - $this->listener = [$this,'onBootstrap']; |
|
45 | + $this->listener = [$this, 'onBootstrap']; |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | */ |
54 | 54 | public function detachShared(SharedEventManagerInterface $events) |
55 | 55 | { |
56 | - if ($events->detach($this->listener,'Zend\Mvc\Application')) { |
|
56 | + if ($events->detach($this->listener, 'Zend\Mvc\Application')) { |
|
57 | 57 | $this->listener = null; |
58 | 58 | } |
59 | 59 | return $this; |
@@ -25,9 +25,9 @@ |
||
25 | 25 | */ |
26 | 26 | class SocialProfilesUnconfiguredErrorListener extends AbstractListenerAggregate |
27 | 27 | { |
28 | - public function attach(EventManagerInterface $events, $priority=1) |
|
28 | + public function attach(EventManagerInterface $events, $priority = 1) |
|
29 | 29 | { |
30 | - $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [ $this, 'onDispatchError']); |
|
30 | + $this->listeners[] = $events->attach(MvcEvent::EVENT_DISPATCH_ERROR, [$this, 'onDispatchError']); |
|
31 | 31 | |
32 | 32 | return $this; |
33 | 33 | } |