cross-solution / YAWIK

module/Auth/src/Auth/Controller/IndexController.php

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * YAWIK
- *
- * @filesource
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
- * @license   MIT
- */
+     * YAWIK
+     *
+     * @filesource
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
+     * @license   MIT
+     */
 
 /** Auth controller */
 namespace Auth\Controller;
@@ -352,7 +352,7 @@ 
     {
         //$adapter = $this->getServiceLocator()->get('ExternalApplicationAdapter');
         if (false) {
-             $this->request->setMethod('get');
+                $this->request->setMethod('get');
             $params = new Parameters(
                 array(
                 'format' => 'json',

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
      * @param $auth  AuthenticationService
      * @param $logger LoggerInterface
      * @param $forms
-     * @param $options ModuleOptions
+     * @param ModuleOptions $options ModuleOptions
      */
     public function __construct(AuthenticationService $auth, LoggerInterface $logger,array $forms, $options)
     {

Spacing +15 added lines, -15 removed lines

@@ -27,8 +27,8 @@ 
 class IndexController extends AbstractActionController
 {
 
-    const LOGIN='login';
-    const REGISTER='register';
+    const LOGIN = 'login';
+    const REGISTER = 'register';
 
     /**
      * @var AuthenticationService
@@ -56,7 +56,7 @@ 
      * @param $forms
      * @param $options ModuleOptions
      */
-    public function __construct(AuthenticationService $auth, LoggerInterface $logger,array $forms, $options)
+    public function __construct(AuthenticationService $auth, LoggerInterface $logger, array $forms, $options)
     {
         $this->auth = $auth;
         $this->forms = $forms;
@@ -84,7 +84,7 @@ 
         $registerForm = $this->forms[self::REGISTER];
 
         /* @var $request \Zend\Http\Request */
-        $request   = $this->getRequest();
+        $request = $this->getRequest();
 
         if ($request->isPost()) {
             $data                          = $this->params()->fromPost();
@@ -118,7 +118,7 @@ 
                     $headers = $request->getHeaders();
                     if ($headers->has('Accept-Language')) {
                         $locales = $headers->get('Accept-Language')->getPrioritized();
-                        $language  = $locales[0]->type;
+                        $language = $locales[0]->type;
                     } else {
                         $language = 'en';
                     }
@@ -143,7 +143,7 @@ 
                 if (!empty($loginSuffix)) {
                     $loginName = $loginName . ' (' . $loginName . $loginSuffix . ')';
                 }
-                $this->logger->info('Failed to authenticate User ' . $loginName );
+                $this->logger->info('Failed to authenticate User ' . $loginName);
                 $this->notification()->danger(/*@translate*/ 'Authentication failed.');
             }
         }
@@ -190,7 +190,7 @@ 
      */
     public function loginAction()
     {
-        $ref = urldecode($this->getRequest()->getBasePath().$this->params()->fromQuery('ref'));
+        $ref = urldecode($this->getRequest()->getBasePath() . $this->params()->fromQuery('ref'));
         $provider = $this->params('provider', '--keiner--');
         $hauth = $this->getServiceLocator()->get('HybridAuthAdapter');
         $hauth->setProvider($provider);
@@ -203,10 +203,10 @@ 
                 $user          = $auth->getUser();
                 $password      = substr(md5(uniqid()), 0, 6);
                 $login         = uniqid() . ($this->options->auth_suffix != "" ? '@' . $this->options->auth_suffix : '');
-                $externalLogin = isset($user->login)?$user->login:'-- not communicated --';
+                $externalLogin = isset($user->login) ? $user->login : '-- not communicated --';
                 $this->logger->debug('first login via ' . $provider . ' as: ' . $externalLogin);
 
-                $user->login=$login;
+                $user->login = $login;
                 $user->setPassword($password);
                 $user->role = $this->options->getRole();
 
@@ -242,7 +242,7 @@ 
         $settings = $user->getSettings('Core');
         if (null !== $settings->localization->language) {
             $basePath = $this->getRequest()->getBasePath();
-            $ref = preg_replace('~^'.$basePath . '/[a-z]{2}(/)?~', $basePath . '/' . $settings->localization->language . '$1', $ref);
+            $ref = preg_replace('~^' . $basePath . '/[a-z]{2}(/)?~', $basePath . '/' . $settings->localization->language . '$1', $ref);
         }
         return $this->redirect()->toUrl($ref);
     }
@@ -306,7 +306,7 @@ 
             if (array_key_exists('firstLogin', $resultMessage) && $resultMessage['firstLogin'] === true) {
                 // first external Login
                 $userName = $this->params()->fromPost('user');
-                $this->logger->debug('first login for User: ' .  $userName);
+                $this->logger->debug('first login for User: ' . $userName);
                 //
                 if (preg_match("/^(.*)@\w+$/", $userName, $realUserName)) {
                     $userName = $realUserName[1];
@@ -371,9 +371,9 @@ 
             $params = new Parameters(
                 array(
                 'format' => 'json',
-                    'group' => array (
-                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3',  5 => 'flatscreen4',
-                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7',  9 => 'flatscreen8', 10 => 'flatscreen9'
+                    'group' => array(
+                        0 => 'testuser4711', 1 => 'flatscreen', 2 => 'flatscreen1', 3 => 'flatscreen2', 4 => 'flatscreen3', 5 => 'flatscreen4',
+                        6 => 'flatscreen5', 7 => 'flatscreen6', 8 => 'flatscreen7', 9 => 'flatscreen8', 10 => 'flatscreen9'
                     ),
                     'name' => '(die) Rauscher – Unternehmensberatung & Consulting',
                 )
@@ -435,7 +435,7 @@ 
     public function logoutAction()
     {
         $auth = $this->auth;
-        $this->logger->info('User ' . ($auth->getUser()->login==''?$auth->getUser()->info->displayName:$auth->getUser()->login) . ' logged out');
+        $this->logger->info('User ' . ($auth->getUser()->login == '' ? $auth->getUser()->info->displayName : $auth->getUser()->login) . ' logged out');
         $auth->clearIdentity();
         unset($_SESSION['HA::STORE']);
 

module/Core/Module.php

Indentation +8 added lines, -8 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * YAWIK
- * Core Module Bootstrap
- *
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
- * @license   MIT
- */
+         * YAWIK
+         * Core Module Bootstrap
+         *
+         * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
+         * @license   MIT
+         */
 
 /** Core */
 namespace Core;
@@ -72,8 +72,8 @@ 
         $eventManager        = $e->getApplication()->getEventManager();
         $sharedManager       = $eventManager->getSharedManager();
         
- #       $LogListener = new LogListener();
- #       $LogListener->attach($eventManager);
+    #       $LogListener = new LogListener();
+    #       $LogListener->attach($eventManager);
         
         if (!\Zend\Console\Console::isConsole()) {
             $redirectCallback = function () use ($e) {

module/Auth/src/Auth/Options/CaptchaOptions.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     }
 
     /**
-     * @return bool
+     * @return string
      */
     public function getMode()
     {

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@
      * @var array
      */
     protected $reCaptcha = [
-        'public_key' => 'Your Recapture Public Key',      // "site_key"
-        'private_key' => 'Your Recapture Private Key',    // "secret_key"
-        'ssl' => true,                                    // include google api via http(s)
+        'public_key' => 'Your Recapture Public Key', // "site_key"
+        'private_key' => 'Your Recapture Private Key', // "secret_key"
+        'ssl' => true, // include google api via http(s)
         ];
 
     /**

module/Auth/src/Auth/Controller/RegisterController.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
 
     public function indexAction()
     {
-        if (!$this->options->getEnableRegistration()){
+        if (!$this->options->getEnableRegistration()) {
             $this->notification()->info( /*@translate*/ 'Registration is disabled');
             return $this->redirect()->toRoute('lang');
         }
@@ -95,7 +95,7 @@ 
 
         $this->form->setAttribute('action', $this->url()->fromRoute('lang/register'));
 
-        $viewModel->setVariable('form' , $this->form );
+        $viewModel->setVariable('form', $this->form);
 
         return $viewModel;
     }

module/Auth/src/Auth/Form/Register.php

Spacing +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
 
         $this->add($fieldset);
 
-        $mode=$options->getMode();
-        if (in_array($mode, [CaptchaOptions::RE_CAPTCHA,CaptchaOptions::IMAGE])) {
+        $mode = $options->getMode();
+        if (in_array($mode, [CaptchaOptions::RE_CAPTCHA, CaptchaOptions::IMAGE])) {
             if ($mode == CaptchaOptions::IMAGE) {
                 $captcha = new Image($options->getImage());
             } elseif ($mode == CaptchaOptions::RE_CAPTCHA) {