@@ -142,7 +142,7 @@ |
||
142 | 142 | /** |
143 | 143 | * @return bool |
144 | 144 | */ |
145 | - public function getAutoConfirmMail(){ |
|
145 | + public function getAutoConfirmMail() { |
|
146 | 146 | return $this->autoConfirmMail; |
147 | 147 | } |
148 | 148 | } |
@@ -30,17 +30,17 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * Event is fired when a new application is saved. |
32 | 32 | */ |
33 | - const EVENT_APPLICATION_POST_CREATE = 'application.post.create'; |
|
33 | + const EVENT_APPLICATION_POST_CREATE = 'application.post.create'; |
|
34 | 34 | |
35 | 35 | /** |
36 | 36 | * Event is fired when a users deleted application |
37 | 37 | */ |
38 | - const EVENT_APPLICATION_PRE_DELETE = 'application.pre.delete'; |
|
38 | + const EVENT_APPLICATION_PRE_DELETE = 'application.pre.delete'; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * Event is fired when the status of an application is changed |
42 | 42 | */ |
43 | - const EVENT_APPLICATION_STATUS_CHANGE = 'application.status.change'; |
|
43 | + const EVENT_APPLICATION_STATUS_CHANGE = 'application.status.change'; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * @var Application $application |
@@ -233,12 +233,12 @@ discard block |
||
233 | 233 | $this->setApplicationEntity($params->application); |
234 | 234 | } |
235 | 235 | |
236 | - if(is_array($params) && isset($params['user'])) { |
|
236 | + if (is_array($params) && isset($params['user'])) { |
|
237 | 237 | $this->setUser($params['user']); |
238 | 238 | unset($params['user']); |
239 | 239 | } |
240 | 240 | |
241 | - if(is_array($params) && isset($params['status'])) { |
|
241 | + if (is_array($params) && isset($params['status'])) { |
|
242 | 242 | $this->setStatus($params['status']); |
243 | 243 | unset($params['status']); |
244 | 244 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
171 | - * @return mixed |
|
171 | + * @return string |
|
172 | 172 | */ |
173 | 173 | public function getStatus() |
174 | 174 | { |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | } |
177 | 177 | |
178 | 178 | /** |
179 | - * @return mixed |
|
179 | + * @return boolean |
|
180 | 180 | */ |
181 | 181 | public function isPostRequest() |
182 | 182 | { |
@@ -40,7 +40,7 @@ |
||
40 | 40 | $params->set('by', 'me'); |
41 | 41 | } |
42 | 42 | |
43 | - //default sorting |
|
43 | + //default sorting |
|
44 | 44 | if (!isset($params['sort'])) { |
45 | 45 | $params['sort']="-date"; |
46 | 46 | } |
@@ -42,10 +42,10 @@ |
||
42 | 42 | |
43 | 43 | //default sorting |
44 | 44 | if (!isset($params['sort'])) { |
45 | - $params['sort']="-date"; |
|
45 | + $params['sort'] = "-date"; |
|
46 | 46 | } |
47 | 47 | $params->count = 5; |
48 | - $params->pageRange=5; |
|
48 | + $params->pageRange = 5; |
|
49 | 49 | |
50 | 50 | $this->paginationParams()->setParams('Applications\Index', $params); |
51 | 51 |
@@ -46,7 +46,7 @@ |
||
46 | 46 | ) |
47 | 47 | ); |
48 | 48 | |
49 | - $timezones=array_merge( |
|
49 | + $timezones = array_merge( |
|
50 | 50 | \DateTimeZone::listIdentifiers(\DateTimeZone::AFRICA), |
51 | 51 | \DateTimeZone::listIdentifiers(\DateTimeZone::AMERICA), |
52 | 52 | \DateTimeZone::listIdentifiers(\DateTimeZone::ASIA), |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | 'sendImmediately' => false |
72 | 72 | ], $options); |
73 | 73 | $view = $this->view; |
74 | - $currentTemplate = $view->viewModel() |
|
74 | + $currentTemplate = $view->viewModel() |
|
75 | 75 | ->getCurrent() |
76 | 76 | ->getTemplate(); |
77 | 77 | $partial = dirname($currentTemplate) . '/' . $options['partial']; |
@@ -87,10 +87,10 @@ discard block |
||
87 | 87 | $label = $options['oneClickLabel'] ?: $view->translate('Apply with %s'); |
88 | 88 | |
89 | 89 | foreach ($data['oneClickProfiles'] as $network) { |
90 | - $variables['oneClick'][] = [ |
|
90 | + $variables['oneClick'][] = [ |
|
91 | 91 | 'label' => sprintf($label, $network), |
92 | 92 | 'url' => $view->url('lang/apply-one-click', ['applyId' => $data['applyId'], 'network' => $network, 'immediately' => $options['sendImmediately'] ?: null], ['force_canonical' => true]), |
93 | - 'network' => $network |
|
93 | + 'network' => $network |
|
94 | 94 | ]; |
95 | 95 | } |
96 | 96 | } |
@@ -98,22 +98,22 @@ discard block |
||
98 | 98 | return $view->partial($partial, $variables); |
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * @return string |
|
103 | - */ |
|
104 | - public function getPartial() |
|
105 | - { |
|
106 | - return $this->partial; |
|
107 | - } |
|
101 | + /** |
|
102 | + * @return string |
|
103 | + */ |
|
104 | + public function getPartial() |
|
105 | + { |
|
106 | + return $this->partial; |
|
107 | + } |
|
108 | 108 | |
109 | - /** |
|
110 | - * @param string $partial |
|
111 | - * @return ApplyButtons |
|
112 | - */ |
|
113 | - public function setPartial($partial) |
|
114 | - { |
|
115 | - $this->partial = $partial; |
|
109 | + /** |
|
110 | + * @param string $partial |
|
111 | + * @return ApplyButtons |
|
112 | + */ |
|
113 | + public function setPartial($partial) |
|
114 | + { |
|
115 | + $this->partial = $partial; |
|
116 | 116 | |
117 | - return $this; |
|
118 | - } |
|
117 | + return $this; |
|
118 | + } |
|
119 | 119 | } |
@@ -74,7 +74,7 @@ |
||
74 | 74 | $currentTemplate = $view->viewModel() |
75 | 75 | ->getCurrent() |
76 | 76 | ->getTemplate(); |
77 | - $partial = dirname($currentTemplate) . '/' . $options['partial']; |
|
77 | + $partial = dirname($currentTemplate).'/'.$options['partial']; |
|
78 | 78 | |
79 | 79 | if (!$options['oneClickOnly'] && $data['uri']) { |
80 | 80 | $variables['default'] = [ |
@@ -208,13 +208,13 @@ discard block |
||
208 | 208 | return $this->email; |
209 | 209 | } |
210 | 210 | |
211 | - /** |
|
212 | - * @return bool |
|
213 | - */ |
|
214 | - public function getOneClickApply() |
|
215 | - { |
|
216 | - return $this->oneClickApply; |
|
217 | - } |
|
211 | + /** |
|
212 | + * @return bool |
|
213 | + */ |
|
214 | + public function getOneClickApply() |
|
215 | + { |
|
216 | + return $this->oneClickApply; |
|
217 | + } |
|
218 | 218 | |
219 | 219 | |
220 | 220 | /** |
@@ -222,29 +222,29 @@ discard block |
||
222 | 222 | * |
223 | 223 | * @return $this |
224 | 224 | */ |
225 | - public function setOneClickApply($oneClickApply) |
|
226 | - { |
|
227 | - $this->oneClickApply = (bool)$oneClickApply; |
|
225 | + public function setOneClickApply($oneClickApply) |
|
226 | + { |
|
227 | + $this->oneClickApply = (bool)$oneClickApply; |
|
228 | 228 | |
229 | - return $this; |
|
230 | - } |
|
231 | - |
|
232 | - /** |
|
233 | - * @return array |
|
234 | - */ |
|
235 | - public function getOneClickApplyProfiles() |
|
236 | - { |
|
237 | - return $this->oneClickApplyProfiles; |
|
238 | - } |
|
239 | - |
|
240 | - /** |
|
241 | - * @param array $oneClickApplyProfiles |
|
242 | - * @return AtsMode |
|
243 | - */ |
|
244 | - public function setOneClickApplyProfiles(array $oneClickApplyProfiles) |
|
245 | - { |
|
246 | - $this->oneClickApplyProfiles = $oneClickApplyProfiles; |
|
229 | + return $this; |
|
230 | + } |
|
231 | + |
|
232 | + /** |
|
233 | + * @return array |
|
234 | + */ |
|
235 | + public function getOneClickApplyProfiles() |
|
236 | + { |
|
237 | + return $this->oneClickApplyProfiles; |
|
238 | + } |
|
239 | + |
|
240 | + /** |
|
241 | + * @param array $oneClickApplyProfiles |
|
242 | + * @return AtsMode |
|
243 | + */ |
|
244 | + public function setOneClickApplyProfiles(array $oneClickApplyProfiles) |
|
245 | + { |
|
246 | + $this->oneClickApplyProfiles = $oneClickApplyProfiles; |
|
247 | 247 | |
248 | - return $this; |
|
249 | - } |
|
248 | + return $this; |
|
249 | + } |
|
250 | 250 | } |
@@ -224,7 +224,7 @@ |
||
224 | 224 | */ |
225 | 225 | public function setOneClickApply($oneClickApply) |
226 | 226 | { |
227 | - $this->oneClickApply = (bool)$oneClickApply; |
|
227 | + $this->oneClickApply = (bool) $oneClickApply; |
|
228 | 228 | |
229 | 229 | return $this; |
230 | 230 | } |
@@ -411,8 +411,7 @@ |
||
411 | 411 | } else { |
412 | 412 | $notFoundUsers[] = $grp_member . $loginSuffix; |
413 | 413 | } |
414 | - } |
|
415 | - catch (\Auth\Exception\UserDeactivatedException $e) |
|
414 | + } catch (\Auth\Exception\UserDeactivatedException $e) |
|
416 | 415 | { |
417 | 416 | $notFoundUsers[] = $grp_member . $loginSuffix; |
418 | 417 | } |
@@ -79,7 +79,7 @@ |
||
79 | 79 | * @param $locale |
80 | 80 | * @param $urlHelper |
81 | 81 | * @param array $forms |
82 | - * @param $options |
|
82 | + * @param ModuleOptions $options |
|
83 | 83 | */ |
84 | 84 | public function __construct( |
85 | 85 | AuthenticationService $auth, |
@@ -70,28 +70,28 @@ |
||
70 | 70 | |
71 | 71 | protected $externalAdapter; |
72 | 72 | |
73 | - /** |
|
74 | - * IndexController constructor. |
|
75 | - * |
|
76 | - * @param AuthenticationService $auth |
|
77 | - * @param LoggerInterface $logger |
|
78 | - * @param $userLoginAdapter |
|
79 | - * @param $locale |
|
80 | - * @param $urlHelper |
|
81 | - * @param array $forms |
|
82 | - * @param $options |
|
83 | - */ |
|
73 | + /** |
|
74 | + * IndexController constructor. |
|
75 | + * |
|
76 | + * @param AuthenticationService $auth |
|
77 | + * @param LoggerInterface $logger |
|
78 | + * @param $userLoginAdapter |
|
79 | + * @param $locale |
|
80 | + * @param $urlHelper |
|
81 | + * @param array $forms |
|
82 | + * @param $options |
|
83 | + */ |
|
84 | 84 | public function __construct( |
85 | - AuthenticationService $auth, |
|
86 | - LoggerInterface $logger, |
|
87 | - $userLoginAdapter, |
|
88 | - $locale, |
|
89 | - $urlHelper, |
|
90 | - array $forms, |
|
91 | - $options, |
|
92 | - $hybridAuthAdapter, |
|
93 | - $externalAdapter, |
|
94 | - RepositoryService $repositories |
|
85 | + AuthenticationService $auth, |
|
86 | + LoggerInterface $logger, |
|
87 | + $userLoginAdapter, |
|
88 | + $locale, |
|
89 | + $urlHelper, |
|
90 | + array $forms, |
|
91 | + $options, |
|
92 | + $hybridAuthAdapter, |
|
93 | + $externalAdapter, |
|
94 | + RepositoryService $repositories |
|
95 | 95 | ) |
96 | 96 | { |
97 | 97 | $this->auth = $auth; |
@@ -35,8 +35,8 @@ discard block |
||
35 | 35 | class IndexController extends AbstractActionController |
36 | 36 | { |
37 | 37 | |
38 | - const LOGIN='login'; |
|
39 | - const REGISTER='register'; |
|
38 | + const LOGIN = 'login'; |
|
39 | + const REGISTER = 'register'; |
|
40 | 40 | |
41 | 41 | /** |
42 | 42 | * @var AuthenticationService |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $registerForm = $this->forms[self::REGISTER]; |
125 | 125 | |
126 | 126 | /* @var $request \Zend\Http\Request */ |
127 | - $request = $this->getRequest(); |
|
127 | + $request = $this->getRequest(); |
|
128 | 128 | |
129 | 129 | if ($request->isPost()) { |
130 | 130 | $data = $this->params()->fromPost(); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | if (array_key_exists('credentials', $data) && |
143 | 143 | array_key_exists('login', $data['credentials']) && |
144 | 144 | array_key_exists('credential', $data['credentials'])) { |
145 | - $adapter->setIdentity($data['credentials']['login'] . $loginSuffix) |
|
145 | + $adapter->setIdentity($data['credentials']['login'].$loginSuffix) |
|
146 | 146 | ->setCredential($data['credentials']['credential']); |
147 | 147 | } |
148 | 148 | |
@@ -153,14 +153,14 @@ discard block |
||
153 | 153 | if ($result->isValid()) { |
154 | 154 | $user = $auth->getUser(); |
155 | 155 | $language = $this->locale->detectLanguage($request, $user); |
156 | - $this->logger->info('User ' . $user->getLogin() . ' logged in'); |
|
156 | + $this->logger->info('User '.$user->getLogin().' logged in'); |
|
157 | 157 | |
158 | 158 | $ref = $this->params()->fromQuery('ref', false); |
159 | 159 | |
160 | 160 | if ($ref) { |
161 | 161 | $ref = urldecode($ref); |
162 | - $url = preg_replace('~/[a-z]{2}(/|$)~', '/' . $language . '$1', $ref); |
|
163 | - $url = $request->getBasePath() . $url; |
|
162 | + $url = preg_replace('~/[a-z]{2}(/|$)~', '/'.$language.'$1', $ref); |
|
163 | + $url = $request->getBasePath().$url; |
|
164 | 164 | } else { |
165 | 165 | $urlHelper = $this->viewHelperManager->get('url'); |
166 | 166 | $url = $urlHelper('lang', array('lang' => $language)); |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | } else { |
171 | 171 | $loginName = $data['credentials']['login']; |
172 | 172 | if (!empty($loginSuffix)) { |
173 | - $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')'; |
|
173 | + $loginName = $loginName.' ('.$loginName.$loginSuffix.')'; |
|
174 | 174 | } |
175 | - $this->logger->info('Failed to authenticate User ' . $loginName); |
|
175 | + $this->logger->info('Failed to authenticate User '.$loginName); |
|
176 | 176 | $this->notification()->danger(/*@translate*/ 'Authentication failed.'); |
177 | 177 | } |
178 | 178 | } |
@@ -232,9 +232,9 @@ discard block |
||
232 | 232 | try { |
233 | 233 | $user = $auth->getUser(); |
234 | 234 | $password = substr(md5(uniqid()), 0, 6); |
235 | - $login = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : ''); |
|
235 | + $login = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : ''); |
|
236 | 236 | $externalLogin = $user->getLogin() ?: '-- not communicated --'; |
237 | - $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin); |
|
237 | + $this->logger->debug('first login via '.$provider.' as: '.$externalLogin); |
|
238 | 238 | |
239 | 239 | $user->setLogin($login); |
240 | 240 | $user->setPassword($password); |
@@ -253,11 +253,11 @@ discard block |
||
253 | 253 | ); |
254 | 254 | $mail->addTo($user->getInfo()->getEmail()); |
255 | 255 | |
256 | - $loggerId = $login . ' (' . $provider . ': ' . $externalLogin . ')'; |
|
256 | + $loggerId = $login.' ('.$provider.': '.$externalLogin.')'; |
|
257 | 257 | if (isset($mail) && $this->mailer($mail)) { |
258 | - $this->logger->info('Mail first-login for ' . $loggerId . ' sent to ' . $user->getInfo()->getEmail()); |
|
258 | + $this->logger->info('Mail first-login for '.$loggerId.' sent to '.$user->getInfo()->getEmail()); |
|
259 | 259 | } else { |
260 | - $this->logger->warn('No Mail was sent for ' . $loggerId); |
|
260 | + $this->logger->warn('No Mail was sent for '.$loggerId); |
|
261 | 261 | } |
262 | 262 | } catch (\Exception $e) { |
263 | 263 | $this->logger->crit($e); |
@@ -268,11 +268,11 @@ discard block |
||
268 | 268 | } |
269 | 269 | |
270 | 270 | $user = $auth->getUser(); |
271 | - $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName() . ' logged in via ' . $provider); |
|
271 | + $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName().' logged in via '.$provider); |
|
272 | 272 | $settings = $user->getSettings('Core'); |
273 | 273 | if (null !== $settings->localization->language) { |
274 | 274 | $basePath = $this->getRequest()->getBasePath(); |
275 | - $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(?=/|$)~', $basePath . '/' . $settings->localization->language, $ref); |
|
275 | + $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(?=/|$)~', $basePath.'/'.$settings->localization->language, $ref); |
|
276 | 276 | } |
277 | 277 | return $this->redirect()->toUrl($ref); |
278 | 278 | } |
@@ -303,8 +303,8 @@ discard block |
||
303 | 303 | |
304 | 304 | if ($result->isValid()) { |
305 | 305 | $this->logger->info( |
306 | - 'User ' . $this->params()->fromPost('user') . |
|
307 | - ' logged via ' . $appKey |
|
306 | + 'User '.$this->params()->fromPost('user'). |
|
307 | + ' logged via '.$appKey |
|
308 | 308 | ); |
309 | 309 | |
310 | 310 | // the external login may include some parameters for an update |
@@ -335,7 +335,7 @@ discard block |
||
335 | 335 | if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) { |
336 | 336 | // first external Login |
337 | 337 | $userName = $this->params()->fromPost('user'); |
338 | - $this->logger->debug('first login for User: ' . $userName); |
|
338 | + $this->logger->debug('first login for User: '.$userName); |
|
339 | 339 | // |
340 | 340 | if (preg_match('/^(.*)@\w+$/', $userName, $realUserName)) { |
341 | 341 | $userName = $realUserName[1]; |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | |
360 | 360 | try { |
361 | 361 | $this->mailer($mail); |
362 | - $this->logger->info('Mail first-login sent to ' . $userName); |
|
362 | + $this->logger->info('Mail first-login sent to '.$userName); |
|
363 | 363 | } catch (\Zend\Mail\Transport\Exception\ExceptionInterface $e) { |
364 | 364 | $this->logger->warn('No Mail was sent'); |
365 | 365 | $this->logger->debug($e); |
@@ -374,8 +374,8 @@ discard block |
||
374 | 374 | ); |
375 | 375 | } else { |
376 | 376 | $this->logger->info( |
377 | - 'Failed to authenticate User ' . $this->params()->fromPost('user') . |
|
378 | - ' via ' . $this->params()->fromPost('appKey') |
|
377 | + 'Failed to authenticate User '.$this->params()->fromPost('user'). |
|
378 | + ' via '.$this->params()->fromPost('appKey') |
|
379 | 379 | ); |
380 | 380 | |
381 | 381 | $this->getResponse()->setStatusCode(Response::STATUS_CODE_401); |
@@ -400,8 +400,8 @@ discard block |
||
400 | 400 | array( |
401 | 401 | 'format' => 'json', |
402 | 402 | 'group' => array( |
403 | - 0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4', |
|
404 | - 6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9' |
|
403 | + 0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4', |
|
404 | + 6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9' |
|
405 | 405 | ), |
406 | 406 | 'name' => '(die) Rauscher – Unternehmensberatung & Consulting', |
407 | 407 | ) |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | } |
411 | 411 | $auth = $this->auth; |
412 | 412 | $userGrpAdmin = $auth->getUser(); |
413 | - $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName()); |
|
413 | + $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName()); |
|
414 | 414 | $grp = $this->params()->fromQuery('group'); |
415 | 415 | |
416 | 416 | // if the request is made by an external host, add his identification-key to the name |
@@ -431,16 +431,16 @@ discard block |
||
431 | 431 | foreach ($params->group as $grp_member) { |
432 | 432 | try |
433 | 433 | { |
434 | - $user = $users->findByLogin($grp_member . $loginSuffix); |
|
434 | + $user = $users->findByLogin($grp_member.$loginSuffix); |
|
435 | 435 | if (!empty($user)) { |
436 | 436 | $groupUserId[] = $user->id; |
437 | 437 | } else { |
438 | - $notFoundUsers[] = $grp_member . $loginSuffix; |
|
438 | + $notFoundUsers[] = $grp_member.$loginSuffix; |
|
439 | 439 | } |
440 | 440 | } |
441 | 441 | catch (\Auth\Exception\UserDeactivatedException $e) |
442 | 442 | { |
443 | - $notFoundUsers[] = $grp_member . $loginSuffix; |
|
443 | + $notFoundUsers[] = $grp_member.$loginSuffix; |
|
444 | 444 | } |
445 | 445 | } |
446 | 446 | } |
@@ -450,9 +450,9 @@ discard block |
||
450 | 450 | $group->setUsers($groupUserId); |
451 | 451 | } |
452 | 452 | $this->logger->info( |
453 | - 'Update Group Name: ' . $name . PHP_EOL . str_repeat(' ', 36) . 'Group Owner: ' . $userGrpAdmin->getLogin() . PHP_EOL . |
|
454 | - str_repeat(' ', 36) . 'Group Members Param: ' . implode(',', $params->group) . PHP_EOL . |
|
455 | - str_repeat(' ', 36) . 'Group Members: ' . count($groupUserId) . PHP_EOL . str_repeat(' ', 36) . 'Group Members not found: ' . implode(',', $notFoundUsers) |
|
453 | + 'Update Group Name: '.$name.PHP_EOL.str_repeat(' ', 36).'Group Owner: '.$userGrpAdmin->getLogin().PHP_EOL. |
|
454 | + str_repeat(' ', 36).'Group Members Param: '.implode(',', $params->group).PHP_EOL. |
|
455 | + str_repeat(' ', 36).'Group Members: '.count($groupUserId).PHP_EOL.str_repeat(' ', 36).'Group Members not found: '.implode(',', $notFoundUsers) |
|
456 | 456 | ); |
457 | 457 | |
458 | 458 | return new JsonModel( |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | public function logoutAction() |
470 | 470 | { |
471 | 471 | $auth = $this->auth; |
472 | - $this->logger->info('User ' . ($auth->getUser()->getLogin()==''?$auth->getUser()->getInfo()->getDisplayName():$auth->getUser()->getLogin()) . ' logged out'); |
|
472 | + $this->logger->info('User '.($auth->getUser()->getLogin() == '' ? $auth->getUser()->getInfo()->getDisplayName() : $auth->getUser()->getLogin()).' logged out'); |
|
473 | 473 | $auth->clearIdentity(); |
474 | 474 | unset($_SESSION['HA::STORE']); |
475 | 475 |
@@ -33,7 +33,7 @@ |
||
33 | 33 | ]; |
34 | 34 | |
35 | 35 | // do nothing for allowed routes |
36 | - if (in_array($routeName, $allowedRoutes)) |
|
36 | + if (in_array($routeName, $allowedRoutes)) |
|
37 | 37 | { |
38 | 38 | return; |
39 | 39 | } |
@@ -62,17 +62,17 @@ |
||
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
65 | - * @param array $statusOptions |
|
66 | - * @return UserStatusFieldset |
|
67 | - */ |
|
68 | - public function setStatusOptions(array $statusOptions) |
|
69 | - { |
|
70 | - $this->statusOptions = $statusOptions; |
|
65 | + * @param array $statusOptions |
|
66 | + * @return UserStatusFieldset |
|
67 | + */ |
|
68 | + public function setStatusOptions(array $statusOptions) |
|
69 | + { |
|
70 | + $this->statusOptions = $statusOptions; |
|
71 | 71 | |
72 | - return $this; |
|
73 | - } |
|
72 | + return $this; |
|
73 | + } |
|
74 | 74 | |
75 | - public function init() |
|
75 | + public function init() |
|
76 | 76 | { |
77 | 77 | $this->setName('status'); |
78 | 78 |
@@ -87,7 +87,7 @@ |
||
87 | 87 | 'attributes' => [ |
88 | 88 | 'data-placeholder' => /*@translate*/ 'please select', |
89 | 89 | 'data-allowclear' => 'false', |
90 | - 'data-searchbox' => -1, // hide the search box |
|
90 | + 'data-searchbox' => -1, // hide the search box |
|
91 | 91 | 'required' => true, // mark label as required |
92 | 92 | ], |
93 | 93 | ] |