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',

Spacing +14 added lines, -14 removed lines

@@ -52,9 +52,9 @@ 
      */
     public function __construct(AuthenticationService $auth, LoggerInterface $logger, $loginForm, $options)
     {
-        $this->auth=$auth;
-        $this->loginForm=$loginForm;
-        $this->logger=$logger;
+        $this->auth = $auth;
+        $this->loginForm = $loginForm;
+        $this->logger = $logger;
         $this->options = $options;
     }
 
@@ -103,7 +103,7 @@ 
                     $headers = $this->getRequest()->getHeaders();
                     if ($headers->has('Accept-Language')) {
                         $locales = $headers->get('Accept-Language')->getPrioritized();
-                        $language  = $locales[0]->type;
+                        $language = $locales[0]->type;
                     } else {
                         $language = 'en';
                     }
@@ -128,7 +128,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.');
             }
         }
@@ -169,7 +169,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);
@@ -182,10 +182,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();
 
@@ -221,7 +221,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);
     }
@@ -285,7 +285,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];
@@ -350,9 +350,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',
                 )
@@ -414,7 +414,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/config/module.config.php

Indentation +24 added lines, -24 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 /**
- * YAWIK
- * Configuration file of the Core module
- *
- * This file intents to provide the configuration for all other modules
- * as well (convention over configuration).
- * Having said that, you may always overwrite or extend the configuration
- * in your own modules configuration file(s) (or via the config autoloading).
- *
- * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
- * @license   MIT
- */
+     * YAWIK
+     * Configuration file of the Core module
+     *
+     * This file intents to provide the configuration for all other modules
+     * as well (convention over configuration).
+     * Having said that, you may always overwrite or extend the configuration
+     * in your own modules configuration file(s) (or via the config autoloading).
+     *
+     * @copyright (c) 2013-2015 Cross Solution (http://cross-solution.de)
+     * @license   MIT
+     */
 
 $doctrineConfig = include __DIR__ . '/doctrine.config.php';
 
@@ -32,24 +32,24 @@ 
     'log' => array(
         'Core/Log' => array(
             'writers' => array(
-                 array(
-                     'name' => 'stream',
+                    array(
+                        'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/yawik.log',
+                            'stream' => __DIR__ .'/../../../log/yawik.log',
+                    ),
                     ),
-                 ),
             ),
         ),
         'Log/Core/Mail' => array(
             'writers' => array(
-                 array(
-                     'name' => 'stream',
+                    array(
+                        'name' => 'stream',
                     'priority' => 1000,
                     'options' => array(
-                         'stream' => __DIR__ .'/../../../log/mails.log',
+                            'stream' => __DIR__ .'/../../../log/mails.log',
+                    ),
                     ),
-                 ),
             ),
         ),
         'ErrorLogger' => array(
@@ -197,11 +197,11 @@ 
     // Defines the Core/Navigation.
     'navigation' => array(
         'default' => array(
-             'home' => array(
-                 'label' => /*@translate*/ 'Home',
-                 'route' => 'lang',
-                 'visible' => false
-             ),
+                'home' => array(
+                    'label' => /*@translate*/ 'Home',
+                    'route' => 'lang',
+                    'visible' => false
+                ),
         ),
     ),
     // Configuration of the controller service manager (Which loads controllers)

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

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
     public function indexAction()
     {
-        if (!$this->options->getEnableRegistration()){
+        if (!$this->options->getEnableRegistration()) {
             $this->notification()->info( /*@translate*/ 'Registration is disabled');
             return $this->redirect()->toRoute('lang');
         }

module/Auth/src/Auth/Options/ModuleOptions.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
      *
      * @var array()
      */
-    protected $enableLogins = ['facebook','xing','linkedin','google','github'];
+    protected $enableLogins = ['facebook', 'xing', 'linkedin', 'google', 'github'];
 
     /**
      * Enable Registration

module/Core/src/Core/Factory/View/Helper/SocialButtonsFactory.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         /* @var $serviceLocator \Zend\View\HelperPluginManager */
         $options = $serviceLocator->getServiceLocator()->get('Auth/Options');
         $config = $serviceLocator->getServiceLocator()->get('Config');
-        $helper = new SocialButtons($options,$config);
+        $helper = new SocialButtons($options, $config);
         return $helper;
     }
 }

module/Core/src/Core/View/Helper/SocialButtons.php

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
      * @param $options ModuleOptions
      * @param $config array
      */
-    public function __construct($options,$config)
+    public function __construct($options, $config)
     {
         $this->options = $options;
         $this->config = $config;
@@ -42,9 +42,9 @@ 
      */
     public function __invoke()
     {
-        $SocialNetworksEnabled=[];
-        foreach($this->config['hybridauth'] as $key => $val) {
-            if ($val['enabled'] and in_array(strtolower($key), $this->options->getEnableLogins())){
+        $SocialNetworksEnabled = [];
+        foreach ($this->config['hybridauth'] as $key => $val) {
+            if ($val['enabled'] and in_array(strtolower($key), $this->options->getEnableLogins())) {
                 $SocialNetworksEnabled[strtolower($key)] = $key;
             }
         }