| @@ -105,7 +105,7 @@ | ||
| 105 | 105 | 'link' => $this->router->assemble( | 
| 106 | 106 | ['id' => $this->application->getId()], | 
| 107 | 107 | ['name'=>'lang/applications/detail', 'force_canonical'=>true] | 
| 108 | - ) . '?login=' . $this->user->getLogin(), | |
| 108 | + ) . '?login=' . $this->user->getLogin(), | |
| 109 | 109 | ]; | 
| 110 | 110 | |
| 111 | 111 | $this->setTo($this->user->getInfo()->getEmail(), $this->user->getInfo()->getDisplayName(false)); | 
| @@ -105,7 +105,7 @@ discard block | ||
| 105 | 105 | 'link' => $this->router->assemble( | 
| 106 | 106 | ['id' => $this->application->getId()], | 
| 107 | 107 | ['name'=>'lang/applications/detail', 'force_canonical'=>true] | 
| 108 | - ) . '?login=' . $this->user->getLogin(), | |
| 108 | + ).'?login='.$this->user->getLogin(), | |
| 109 | 109 | ]; | 
| 110 | 110 | |
| 111 | 111 | $this->setTo($this->user->getInfo()->getEmail(), $this->user->getInfo()->getDisplayName(false)); | 
| @@ -155,7 +155,7 @@ discard block | ||
| 155 | 155 | */ | 
| 156 | 156 | public function setUser($user) | 
| 157 | 157 |      { | 
| 158 | - $this->user=$user; | |
| 158 | + $this->user = $user; | |
| 159 | 159 | return $this; | 
| 160 | 160 | } | 
| 161 | 161 | } | 
| @@ -45,7 +45,7 @@ discard block | ||
| 45 | 45 | */ | 
| 46 | 46 | public function getConfig() | 
| 47 | 47 |      { | 
| 48 | - return ModuleConfigLoader::load(__DIR__ . '/../../config'); | |
| 48 | + return ModuleConfigLoader::load(__DIR__.'/../../config'); | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | /** | 
| @@ -77,10 +77,10 @@ discard block | ||
| 77 | 77 | // This is an hack due to bad design of Hybridauth | 
| 78 | 78 | // This ensures the class from "addtional-providers" is loaded. | 
| 79 | 79 | array( | 
| 80 | - 'Hybrid_Providers_XING' => $addProvidersDir . '/hybridauth-xing/Providers/XING.php', | |
| 80 | + 'Hybrid_Providers_XING' => $addProvidersDir.'/hybridauth-xing/Providers/XING.php', | |
| 81 | 81 | ), | 
| 82 | 82 | array( | 
| 83 | - 'Hybrid_Providers_Github' => $addProvidersDir. '/hybridauth-github/Providers/GitHub.php', | |
| 83 | + 'Hybrid_Providers_Github' => $addProvidersDir.'/hybridauth-github/Providers/GitHub.php', | |
| 84 | 84 | ), | 
| 85 | 85 | ), | 
| 86 | 86 | ); | 
| @@ -96,7 +96,7 @@ discard block | ||
| 96 | 96 | |
| 97 | 97 | $eventManager->attach( | 
| 98 | 98 | MvcEvent::EVENT_ROUTE, | 
| 99 | -            function (MvcEvent $e) use ($services) { | |
| 99 | +            function(MvcEvent $e) use ($services) { | |
| 100 | 100 | /* @var $checkPermissionsListener \Acl\Listener\CheckPermissionsListener */ | 
| 101 | 101 |                  $checkPermissionsListener = $services->get('Auth/CheckPermissionsListener'); | 
| 102 | 102 | $checkPermissionsListener->onRoute($e); | 
| @@ -106,7 +106,7 @@ discard block | ||
| 106 | 106 | |
| 107 | 107 | $eventManager->attach( | 
| 108 | 108 | MvcEvent::EVENT_DISPATCH, | 
| 109 | -            function ($e) use ($services) { | |
| 109 | +            function($e) use ($services) { | |
| 110 | 110 | /** @var CheckPermissionsListener $checkPermissionsListener */ | 
| 111 | 111 |                  if (!$e instanceof MvcEvent) { | 
| 112 | 112 | return; | 
| @@ -57,9 +57,9 @@ discard block | ||
| 57 | 57 |          if ($exception instanceof UnauthorizedImageAccessException) { | 
| 58 | 58 | $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png'; | 
| 59 | 59 | $response->setStatusCode(Response::STATUS_CODE_403) | 
| 60 | - ->setContent(file_get_contents($image)) | |
| 61 | - ->getHeaders() | |
| 62 | -                     ->addHeaderLine('Content-Type', 'image/png'); | |
| 60 | + ->setContent(file_get_contents($image)) | |
| 61 | + ->getHeaders() | |
| 62 | +                        ->addHeaderLine('Content-Type', 'image/png'); | |
| 63 | 63 | $e->stopPropagation(); | 
| 64 | 64 | $response->sendHeaders(); | 
| 65 | 65 | //echo file_get_contents($image); | 
| @@ -70,7 +70,7 @@ discard block | ||
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | 72 | $application = $e->getApplication(); | 
| 73 | -		$auth = $application->getServiceManager()->get('AuthenticationService'); | |
| 73 | +        $auth = $application->getServiceManager()->get('AuthenticationService'); | |
| 74 | 74 | |
| 75 | 75 |          if (!$auth->hasIdentity()) { | 
| 76 | 76 | $request = $e->getRequest(); | 
| @@ -112,9 +112,9 @@ discard block | ||
| 112 | 112 | $model->setTemplate($this->getExceptionTemplate()); | 
| 113 | 113 | $e->setResult($model); | 
| 114 | 114 | |
| 115 | - // $statusCode = $response->getStatusCode(); | |
| 116 | -       // if ($statusCode === 200) { | |
| 115 | + // $statusCode = $response->getStatusCode(); | |
| 116 | +        // if ($statusCode === 200) { | |
| 117 | 117 | $response->setStatusCode(Response::STATUS_CODE_403); | 
| 118 | - // } | |
| 118 | + // } | |
| 119 | 119 | } | 
| 120 | 120 | } | 
| @@ -55,7 +55,7 @@ discard block | ||
| 55 | 55 | * Return an image, if an image was requested. | 
| 56 | 56 | */ | 
| 57 | 57 |          if ($exception instanceof UnauthorizedImageAccessException) { | 
| 58 | - $image = __DIR__ . '/../../../../../public/images/unauthorized-access.png'; | |
| 58 | + $image = __DIR__.'/../../../../../public/images/unauthorized-access.png'; | |
| 59 | 59 | $response->setStatusCode(Response::STATUS_CODE_403) | 
| 60 | 60 | ->setContent(file_get_contents($image)) | 
| 61 | 61 | ->getHeaders() | 
| @@ -78,10 +78,10 @@ discard block | ||
| 78 | 78 | $ref = $request->getRequestUri(); | 
| 79 | 79 | $query = []; | 
| 80 | 80 |              if ($loginPrefill) { | 
| 81 | -                $ref = preg_replace('~(?:\?|&)login=' . $loginPrefill . '~', '', $ref); | |
| 81 | +                $ref = preg_replace('~(?:\?|&)login='.$loginPrefill.'~', '', $ref); | |
| 82 | 82 | $query['login'] = $loginPrefill; | 
| 83 | 83 | } | 
| 84 | -            $ref = preg_replace('~^' . preg_quote($e->getRouter()->getBaseUrl()) . '~', '', $ref); | |
| 84 | +            $ref = preg_replace('~^'.preg_quote($e->getRouter()->getBaseUrl()).'~', '', $ref); | |
| 85 | 85 | $ref = urlencode($ref); | 
| 86 | 86 | $query['ref'] = $ref; | 
| 87 | 87 | $url = $e->getRouter()->assemble([], ['name' => 'lang/auth', 'query' => $query]); | 
| @@ -124,7 +124,7 @@ discard block | ||
| 124 | 124 | $registerForm = $this->forms[self::REGISTER]; | 
| 125 | 125 | |
| 126 | 126 | /* @var $request \Laminas\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 | } | 
| @@ -229,7 +229,7 @@ discard block | ||
| 229 | 229 | */ | 
| 230 | 230 | public function loginAction() | 
| 231 | 231 |      { | 
| 232 | -        $ref = urldecode($this->getRequest()->getBasePath() . $this->params()->fromQuery('ref')); | |
| 232 | +        $ref = urldecode($this->getRequest()->getBasePath().$this->params()->fromQuery('ref')); | |
| 233 | 233 |          $provider = $this->params('provider', '--keiner--'); | 
| 234 | 234 | $hauth = $this->hybridAuthAdapter; | 
| 235 | 235 | $hauth->setProvider($provider); | 
| @@ -242,9 +242,9 @@ discard block | ||
| 242 | 242 |              try { | 
| 243 | 243 | $user = $auth->getUser(); | 
| 244 | 244 | $password = substr(md5(uniqid()), 0, 6); | 
| 245 | - $login = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : ''); | |
| 245 | + $login = uniqid().($this->options->auth_suffix != "" ? '@'.$this->options->auth_suffix : ''); | |
| 246 | 246 | $externalLogin = $user->getLogin() ?: '-- not communicated --'; | 
| 247 | -                $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin); | |
| 247 | +                $this->logger->debug('first login via '.$provider.' as: '.$externalLogin); | |
| 248 | 248 | |
| 249 | 249 | $user->setLogin($login); | 
| 250 | 250 | $user->setPassword($password); | 
| @@ -263,11 +263,11 @@ discard block | ||
| 263 | 263 | ); | 
| 264 | 264 | $mail->addTo($user->getInfo()->getEmail()); | 
| 265 | 265 | |
| 266 | -                $loggerId = $login . ' (' . $provider . ': ' . $externalLogin . ')'; | |
| 266 | +                $loggerId = $login.' ('.$provider.': '.$externalLogin.')'; | |
| 267 | 267 |                  if (isset($mail) && $this->mailer($mail)) { | 
| 268 | -                    $this->logger->info('Mail first-login for ' . $loggerId . ' sent to ' . $user->getInfo()->getEmail()); | |
| 268 | +                    $this->logger->info('Mail first-login for '.$loggerId.' sent to '.$user->getInfo()->getEmail()); | |
| 269 | 269 |                  } else { | 
| 270 | -                    $this->logger->warn('No Mail was sent for ' . $loggerId); | |
| 270 | +                    $this->logger->warn('No Mail was sent for '.$loggerId); | |
| 271 | 271 | } | 
| 272 | 272 |              } catch (\Exception $e) { | 
| 273 | 273 | $this->logger->crit($e); | 
| @@ -278,11 +278,11 @@ discard block | ||
| 278 | 278 | } | 
| 279 | 279 | |
| 280 | 280 | $user = $auth->getUser(); | 
| 281 | -        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName() . ' logged in via ' . $provider); | |
| 281 | +        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName().' logged in via '.$provider); | |
| 282 | 282 |          $settings = $user->getSettings('Core'); | 
| 283 | 283 |          if ($settings->localization->language !== null) { | 
| 284 | 284 | $basePath = $this->getRequest()->getBasePath(); | 
| 285 | -            $ref = preg_replace('~^' . $basePath . '/[a-z]{2}(?=/|$)~', $basePath . '/' . $settings->localization->language, $ref); | |
| 285 | +            $ref = preg_replace('~^'.$basePath.'/[a-z]{2}(?=/|$)~', $basePath.'/'.$settings->localization->language, $ref); | |
| 286 | 286 | } | 
| 287 | 287 | return $this->redirect()->toUrl($ref); | 
| 288 | 288 | } | 
| @@ -313,8 +313,8 @@ discard block | ||
| 313 | 313 | |
| 314 | 314 |          if ($result->isValid()) { | 
| 315 | 315 | $this->logger->info( | 
| 316 | -                'User ' . $this->params()->fromPost('user') . | |
| 317 | - ' logged via ' . $appKey | |
| 316 | +                'User '.$this->params()->fromPost('user'). | |
| 317 | + ' logged via '.$appKey | |
| 318 | 318 | ); | 
| 319 | 319 | |
| 320 | 320 | // the external login may include some parameters for an update | 
| @@ -345,7 +345,7 @@ discard block | ||
| 345 | 345 |              if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) { | 
| 346 | 346 | // first external Login | 
| 347 | 347 |                  $userName = $this->params()->fromPost('user'); | 
| 348 | -                $this->logger->debug('first login for User: ' .  $userName); | |
| 348 | +                $this->logger->debug('first login for User: '.$userName); | |
| 349 | 349 | // | 
| 350 | 350 |                  if (preg_match('/^(.*)@\w+$/', $userName, $realUserName)) { | 
| 351 | 351 | $userName = $realUserName[1]; | 
| @@ -369,7 +369,7 @@ discard block | ||
| 369 | 369 | |
| 370 | 370 |                  try { | 
| 371 | 371 | $this->mailer($mail); | 
| 372 | -                    $this->logger->info('Mail first-login sent to ' . $userName); | |
| 372 | +                    $this->logger->info('Mail first-login sent to '.$userName); | |
| 373 | 373 |                  } catch (\Laminas\Mail\Transport\Exception\ExceptionInterface $e) { | 
| 374 | 374 |                      $this->logger->warn('No Mail was sent'); | 
| 375 | 375 | $this->logger->debug($e); | 
| @@ -384,8 +384,8 @@ discard block | ||
| 384 | 384 | ); | 
| 385 | 385 |          } else { | 
| 386 | 386 | $this->logger->info( | 
| 387 | -                'Failed to authenticate User ' . $this->params()->fromPost('user') . | |
| 388 | -                ' via ' . $this->params()->fromPost('appKey') | |
| 387 | +                'Failed to authenticate User '.$this->params()->fromPost('user'). | |
| 388 | +                ' via '.$this->params()->fromPost('appKey') | |
| 389 | 389 | ); | 
| 390 | 390 | |
| 391 | 391 | $this->getResponse()->setStatusCode(Response::STATUS_CODE_401); | 
| @@ -410,8 +410,8 @@ discard block | ||
| 410 | 410 | array( | 
| 411 | 411 | 'format' => 'json', | 
| 412 | 412 | 'group' => array( | 
| 413 | - 0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4', | |
| 414 | - 6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9' | |
| 413 | + 0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4', | |
| 414 | + 6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9' | |
| 415 | 415 | ), | 
| 416 | 416 | 'name' => '(die) Rauscher – Unternehmensberatung & Consulting', | 
| 417 | 417 | ) | 
| @@ -420,7 +420,7 @@ discard block | ||
| 420 | 420 | } | 
| 421 | 421 | $auth = $this->auth; | 
| 422 | 422 | $userGrpAdmin = $auth->getUser(); | 
| 423 | -        $this->logger->info('User ' . $auth->getUser()->getInfo()->getDisplayName()); | |
| 423 | +        $this->logger->info('User '.$auth->getUser()->getInfo()->getDisplayName()); | |
| 424 | 424 |          $grp = $this->params()->fromQuery('group'); | 
| 425 | 425 | |
| 426 | 426 | // if the request is made by an external host, add his identification-key to the name | 
| @@ -440,14 +440,14 @@ discard block | ||
| 440 | 440 |          if (!empty($params->group)) { | 
| 441 | 441 |              foreach ($params->group as $grp_member) { | 
| 442 | 442 |                  try { | 
| 443 | - $user = $users->findByLogin($grp_member . $loginSuffix); | |
| 443 | + $user = $users->findByLogin($grp_member.$loginSuffix); | |
| 444 | 444 |                      if (!empty($user)) { | 
| 445 | 445 | $groupUserId[] = $user->id; | 
| 446 | 446 |                      } else { | 
| 447 | - $notFoundUsers[] = $grp_member . $loginSuffix; | |
| 447 | + $notFoundUsers[] = $grp_member.$loginSuffix; | |
| 448 | 448 | } | 
| 449 | 449 |                  } catch (\Auth\Exception\UserDeactivatedException $e) { | 
| 450 | - $notFoundUsers[] = $grp_member . $loginSuffix; | |
| 450 | + $notFoundUsers[] = $grp_member.$loginSuffix; | |
| 451 | 451 | } | 
| 452 | 452 | } | 
| 453 | 453 | } | 
| @@ -457,9 +457,9 @@ discard block | ||
| 457 | 457 | $group->setUsers($groupUserId); | 
| 458 | 458 | } | 
| 459 | 459 | $this->logger->info( | 
| 460 | -            'Update Group Name: ' . $name . PHP_EOL . str_repeat(' ', 36) . 'Group Owner: ' . $userGrpAdmin->getLogin() . PHP_EOL . | |
| 461 | -            str_repeat(' ', 36) . 'Group Members Param: ' . implode(',', $params->group) . PHP_EOL . | |
| 462 | -            str_repeat(' ', 36) . 'Group Members: ' . count($groupUserId) . PHP_EOL . str_repeat(' ', 36) . 'Group Members not found: ' . implode(',', $notFoundUsers) | |
| 460 | +            'Update Group Name: '.$name.PHP_EOL.str_repeat(' ', 36).'Group Owner: '.$userGrpAdmin->getLogin().PHP_EOL. | |
| 461 | +            str_repeat(' ', 36).'Group Members Param: '.implode(',', $params->group).PHP_EOL. | |
| 462 | +            str_repeat(' ', 36).'Group Members: '.count($groupUserId).PHP_EOL.str_repeat(' ', 36).'Group Members not found: '.implode(',', $notFoundUsers) | |
| 463 | 463 | ); | 
| 464 | 464 | |
| 465 | 465 | return new JsonModel( | 
| @@ -476,7 +476,7 @@ discard block | ||
| 476 | 476 | public function logoutAction() | 
| 477 | 477 |      { | 
| 478 | 478 | $auth = $this->auth; | 
| 479 | -        $this->logger->info('User ' . ($auth->getUser()->getLogin() == '' ? $auth->getUser()->getInfo()->getDisplayName() : $auth->getUser()->getLogin()) . ' logged out'); | |
| 479 | +        $this->logger->info('User '.($auth->getUser()->getLogin() == '' ? $auth->getUser()->getInfo()->getDisplayName() : $auth->getUser()->getLogin()).' logged out'); | |
| 480 | 480 | $auth->clearIdentity(); | 
| 481 | 481 | unset($_SESSION['HA::STORE']); | 
| 482 | 482 | |