nilsteampassnet / TeamPass

sources/ldap.activedirectory.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         $groupsArr = [];
         
         // get id attribute
-        if (isset($SETTINGS['ldap_guid_attibute']) ===true && empty($SETTINGS['ldap_guid_attibute']) === false) {
+        if (isset($SETTINGS['ldap_guid_attibute']) === true && empty($SETTINGS['ldap_guid_attibute']) === false) {
             $idAttribute = $SETTINGS['ldap_guid_attibute'];
         } else {
             $idAttribute = 'objectguid';
@@ -74,7 +74,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(),
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(),
 
         ];
     }

sources/core.php

Spacing +24 added lines, -24 removed lines

@@ -50,21 +50,21 @@ 
     // Load AntiXSS
     include_once '../includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
-        header('Location: ' . $antiXss->xss_clean($url));
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
+        header('Location: '.$antiXss->xss_clean($url));
     }
 
     //If headers are sent... do java redirect... if java disabled, do html redirect.
     echo '<script type="text/javascript">';
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
     echo '</script>';
     echo '<noscript>';
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
     echo '</noscript>';
 }
 
 // Include files
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 // Prepare GET variables
 $server = [];
@@ -87,7 +87,7 @@ 
     && isset($SETTINGS['enable_sts']) === true
     && (int) $SETTINGS['enable_sts'] === 1
 ) {
-    redirect('https://' . $server['http_host'] . $server['request_uri']);
+    redirect('https://'.$server['http_host'].$server['request_uri']);
 }
 
 // Load pwComplexity
@@ -110,11 +110,11 @@ 
 // LOAD CPASSMAN SETTINGS
 if (
     isset($SETTINGS['cpassman_dir']) === true
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
 ) {
     // Should we delete folder INSTALL?
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s',
         'install',
         'clear_install_folder'
     );
@@ -132,11 +132,11 @@ 
             if ($directories !== false) {
                 $files = array_diff($directories, ['.', '..']);
                 foreach ($files as $file) {
-                    if (is_dir($dir . '/' . $file)) {
-                        delTree($dir . '/' . $file);
+                    if (is_dir($dir.'/'.$file)) {
+                        delTree($dir.'/'.$file);
                     } else {
                         try {
-                            unlink($dir . '/' . $file);
+                            unlink($dir.'/'.$file);
                         } catch (Exception $e) {
                             // do nothing... php will ignore and continue
                         }
@@ -150,13 +150,13 @@ 
             return false;
         }
 
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
             // Set the permissions on the install directory and delete
             // is server Windows or Linux?
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
             }
-            delTree($SETTINGS['cpassman_dir'] . '/install');
+            delTree($SETTINGS['cpassman_dir'].'/install');
         }
 
         // Delete temporary install table
@@ -174,7 +174,7 @@ 
 // Load Languages stuff
 if (isset($languagesList) === false) {
     $languagesList = [];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
     foreach ($rows as $record) {
         array_push($languagesList, $record['name']);
         if (isset($_SESSION['user']['user_language']) && $record['name'] === $_SESSION['user']['user_language']) {
@@ -232,7 +232,7 @@ 
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
 if (empty($_SESSION['sessionDuration']) === false) {
     $dataSession = DB::queryFirstRow(
-        'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i',
         $_SESSION['user_id']
     );
 } else {
@@ -296,7 +296,7 @@ 
     && (isset($_SESSION['user_admin']) === true && $_SESSION['user_admin'] === 1)
 ) {
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
         [
             'type' => 'admin',
             'intitule' => 'cpassman_version',
@@ -356,7 +356,7 @@ 
 
         syslog(
             LOG_WARNING,
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
         );
         // erase session table
         $_SESSION = [];
@@ -407,7 +407,7 @@ 
 if (isset($_SESSION['user_id']) === true && empty($_SESSION['user_id']) === false) {
     // query on user
     $data = DB::queryfirstrow(
-        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM '.prefixTable('users').' WHERE id=%i',
         $_SESSION['user_id']
     );
     //Check if user has been deleted or unlogged
@@ -453,7 +453,7 @@ 
             $data['groupes_visibles'],
             $data['groupes_interdits'],
             $data['admin'],
-            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']),
+            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']),
             $SETTINGS
         );
         if (isset($_SESSION['can_create_root_folder']) === true && (int) $_SESSION['can_create_root_folder'] === 1) {
@@ -488,7 +488,7 @@ 
     $_SESSION['item_fields'] = [];
     $rows = DB::query(
         'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE level=%i',
         '0'
     );
@@ -497,7 +497,7 @@ 
         // get each field
         $rows2 = DB::query(
             'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE parent_id=%i
             ORDER BY `order` ASC',
             $record['id']
@@ -574,7 +574,7 @@ 
 if (
     isset($SETTINGS['roles_allowed_to_print']) === true
     && isset($_SESSION['user_roles']) === true
-    && (! isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
+    && (!isset($_SESSION['temporary']['user_can_printout']) || empty($_SESSION['temporary']['user_can_printout']))
 ) {
     foreach (explode(';', $SETTINGS['roles_allowed_to_print']) as $role) {
         if (in_array($role, $_SESSION['user_roles']) === true) {
@@ -584,5 +584,5 @@ 
 }
 
 /* CHECK NUMBER OF USER ONLINE */
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
 $_SESSION['nb_users_online'] = DB::count();

sources/ldap.openldap.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         $groupsArr = [];
         
         // get id attribute
-        if (isset($SETTINGS['ldap_guid_attibute']) ===true && empty($SETTINGS['ldap_guid_attibute']) === false) {
+        if (isset($SETTINGS['ldap_guid_attibute']) === true && empty($SETTINGS['ldap_guid_attibute']) === false) {
             $idAttribute = $SETTINGS['ldap_guid_attibute'];
         } else {
             $idAttribute = 'objectguid';
@@ -82,7 +82,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(),
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(),
 
         ];
     }

sources/roles.queries.php

Spacing +36 added lines, -36 removed lines

@@ -717,38 +717,38 @@ 
             }
 
             // Load expected libraries
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-            require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+            require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
             // Build ldap configuration array
             $config = [
@@ -788,7 +788,7 @@ 
                     $SETTINGS['cpassman_dir'],
                     array(
                         'error' => true,
-                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
+                        'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
                     ),
                     'encode'
                 );
@@ -812,7 +812,7 @@ 
 
             // check if synched with roles in Teampass
             $retAD = [];
-            foreach($retGroups as $key => $group) {
+            foreach ($retGroups as $key => $group) {
                 // exists in Teampass
                 $role_detail = DB::queryfirstrow(
                     'SELECT a.increment_id, a.role_id, r.title
@@ -834,7 +834,7 @@ 
                     [
                         'ad_group_id' => (int) $group['gidnumber'][0],
                         'ad_group_title' => $group['cn'][0],
-                        'role_id' => $counter> 0 ? (int) $role_detail['role_id'] : -1,
+                        'role_id' => $counter > 0 ? (int) $role_detail['role_id'] : -1,
                         'id' => $counter > 0 ? (int) $role_detail['increment_id'] : -1,
                         'role_title' => $counter > 0 ? $role_detail['title'] : '',
                     ]
@@ -844,7 +844,7 @@ 
             
             // Get all groups in Teampass
             $teampassRoles = array();
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,

sources/identify.php

Spacing +112 added lines, -112 removed lines

@@ -44,16 +44,16 @@ 
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
 }
 
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
     $SETTINGS = [];
     $SETTINGS['cpassman_dir'] = '..';
 }
 
 // Load libraries
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
 // Prepare POST variables
@@ -66,7 +66,7 @@ 
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -88,12 +88,12 @@ 
     defineComplexity();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // If Debug then clean the files
     if (DEBUGLDAP === true) {
-        define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
+        define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
         file_put_contents(DEBUGLDAPFILE, '');
     }
 
@@ -180,19 +180,19 @@ 
     if (findTpConfigFile() === false) {
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
     }
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
     
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
 
     // Load AntiXSS
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
     $antiXss = new voku\helper\AntiXSS();
 
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // Prepare GET variables
@@ -206,7 +206,7 @@ 
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
 
     // connect to the server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     DB::$host = DB_HOST;
     DB::$user = DB_USER;
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -216,7 +216,7 @@ 
     DB::$ssl = DB_SSL;
     DB::$connect_options = DB_CONNECT_OPTIONS;
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
@@ -232,18 +232,18 @@ 
     }
 
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
-    if(
+    if (
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
         && $dataReceived['user_2fa_selection'] === 'duo'
-        && $superGlobal->get('duo_status','SESSION') === 'IN_PROGRESS'
+        && $superGlobal->get('duo_status', 'SESSION') === 'IN_PROGRESS'
         && !empty($dataReceived['duo_state'])
-    ){
+    ) {
         $key = hash('sha256', $dataReceived['duo_state']);
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
-        $duo_data_dec = openssl_decrypt(base64_decode($superGlobal->get('duo_data','SESSION')), 'AES-256-CBC', $key, 0, $iv);
+        $duo_data_dec = openssl_decrypt(base64_decode($superGlobal->get('duo_data', 'SESSION')), 'AES-256-CBC', $key, 0, $iv);
         // Clear the data from the Duo process to continue clean with the standard login process
-        $superGlobal->forget('duo_data','SESSION');
-        if($duo_data_dec === false){
+        $superGlobal->forget('duo_data', 'SESSION');
+        if ($duo_data_dec === false) {
             echo prepareExchangedData(
                 $SETTINGS['cpassman_dir'],
                 [
@@ -259,7 +259,7 @@ 
         $dataReceived['login'] = $duo_data['duo_login'];
     }
 
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
         echo json_encode([
             'data' => prepareExchangedData(
                 $SETTINGS['cpassman_dir'],
@@ -539,7 +539,7 @@ 
         }
         // Append with roles from AD groups
         if (is_null($userInfo['roles_from_ad_groups']) === false) {
-            $userInfo['fonction_id'] = empty($userInfo['fonction_id'])  === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id']. ';' . $userInfo['roles_from_ad_groups'];
+            $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
         }
         // store
         $superGlobal->put('fonction_id', $userInfo['fonction_id'], 'SESSION');
@@ -550,7 +550,7 @@ 
         if (count($superGlobal->get('user_roles', 'SESSION')) > 0) {
             $rolesList = DB::query(
                 'SELECT id, title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id IN %li',
                 $superGlobal->get('user_roles', 'SESSION')
             );
@@ -573,7 +573,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', [], 'SESSION');
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
         foreach ($rows as $record) {
             $superGlobal->put(
                 $record['id'],
@@ -640,10 +640,10 @@ 
         $superGlobal->put('latest_items_tab', [], 'SESSION');
         $superGlobal->put('nb_roles', 0, 'SESSION');
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -652,7 +652,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'SESSION',
                     'latest_items_tab'
@@ -668,12 +668,12 @@ 
         ) {
             // get all Admin users
             $receivers = '';
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             foreach ($rows as $record) {
                 if (empty($receivers)) {
                     $receivers = $record['email'];
                 } else {
-                    $receivers = ',' . $record['email'];
+                    $receivers = ','.$record['email'];
                 }
             }
             // Add email to table
@@ -689,7 +689,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
                         ],
@@ -842,7 +842,7 @@ 
 {
     $rows = DB::query(
         'SELECT date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE field_1 = %s
         AND type = 'failed_auth'
         AND label = 'password_is_not_correct'
@@ -856,7 +856,7 @@ 
         foreach ($rows as $record) {
             array_push(
                 $arrAttempts,
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
             );
         }
     }
@@ -910,7 +910,7 @@ 
     $ldapConnection
 ) : bool
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
     if ((int) $userInfoDisabled === 1) {
         return false;
@@ -1102,45 +1102,45 @@ 
 function authenticateThroughAD(string $username, array $userInfo, string $passwordClear, array $SETTINGS): array
 {
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/HandlesConnection.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/HandlesConnection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
 
@@ -1177,7 +1177,7 @@ 
         // Get user info from AD
         // We want to isolate attribute ldap_user_attribute
         $userADInfos = $connection->query()
-            ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? strtolower($SETTINGS['ldap_user_attribute']) : 'distinguishedname', '=', $username)
+            ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? strtolower($SETTINGS['ldap_user_attribute']) : 'distinguishedname', '=', $username)
             ->firstOrFail();
 
         // Check shadowexpire attribute - if === 1 then user disabled
@@ -1211,7 +1211,7 @@ 
         $error = $e->getDetailedError();
         return [
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage(),
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage(),
 
         ];
     }
@@ -1272,12 +1272,12 @@ 
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
         // Get user groups from AD
         $user_ad_groups = [];
-        foreach($groups as $group) {
+        foreach ($groups as $group) {
             //print_r($group);
             // get relation role id for AD group
             $role = DB::queryFirstRow(
                 'SELECT lgr.role_id
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
                 WHERE lgr.ldap_group_id = %i',
                 $group
             );
@@ -1327,7 +1327,7 @@ 
 ): void
 {
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1379,7 +1379,7 @@ 
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1418,7 +1418,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1470,7 +1470,7 @@ 
             'gestionnaire' => '0',
             'can_manage_all_users' => '0',
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
             'groupes_interdits' => '',
             'groupes_visibles' => '',
             'last_pw_change' => (int) time(),
@@ -1496,7 +1496,7 @@ 
             ]
         );
         // Rebuild tree
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
         $tree->register();
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
         $tree->rebuild();
@@ -1527,13 +1527,13 @@ 
         && empty($dataReceived['GACode']) === false
     ) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
         // load library
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
         // create new instance
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
         // Init
@@ -1556,7 +1556,7 @@ 
             $mfaMessage = langHdl('ga_flash_qr_and_login');
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1569,7 +1569,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1624,12 +1624,12 @@ 
 ): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';            
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';            
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
-    $saved_state = null !== $superGlobal->get('duo_state','SESSION') ? $superGlobal->get('duo_state','SESSION') : '';
-    $duo_status = null !== $superGlobal->get('duo_status','SESSION') ? $superGlobal->get('duo_status','SESSION') : '';
+    $saved_state = null !== $superGlobal->get('duo_state', 'SESSION') ? $superGlobal->get('duo_state', 'SESSION') : '';
+    $duo_status = null !== $superGlobal->get('duo_status', 'SESSION') ? $superGlobal->get('duo_status', 'SESSION') : '';
 
     // Ensure state and login are set
     if (
@@ -1687,7 +1687,7 @@ 
 ): array
 {
     // Load superGlobals
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';            
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';            
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
     // load libraries
@@ -1733,7 +1733,7 @@ 
         }*/
         return [
             'error' => true,
-            'message' => $duo_error . langHdl('duo_error_check_config'),
+            'message' => $duo_error.langHdl('duo_error_check_config'),
             'pwd_attempts' => (int) $sessionPwdAttempts,
             'debug_message' => $e->getMessage(),
             'proceedIdentification' => false,
@@ -1749,7 +1749,7 @@ 
         } catch (Duo\DuoUniversal\DuoException $e) {
             return [
                 'error' => true,
-                'message' => $duo_error . langHdl('duo_error_url'),
+                'message' => $duo_error.langHdl('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'debug_message' => $e->getMessage(),
                 'proceedIdentification' => false,
@@ -1757,7 +1757,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
             $key = hash('sha256', $duo_state);
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -1783,7 +1783,7 @@ 
         } else {
             return [
                 'error' => true,
-                'message' => $duo_error . langHdl('duo_error_url'),
+                'message' => $duo_error.langHdl('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'proceedIdentification' => false,
             ];
@@ -1804,8 +1804,8 @@ 
         // return the response (which should be the user name)
         if ($decoded_token['preferred_username'] === $username) {
             $superGlobal->put('duo_status', 'COMPLET', 'SESSION');
-            $superGlobal->forget('duo_state','SESSION');
-            $superGlobal->forget('duo_data','SESSION');
+            $superGlobal->forget('duo_state', 'SESSION');
+            $superGlobal->forget('duo_data', 'SESSION');
             unset($superGlobal);
 
             return [
@@ -1816,9 +1816,9 @@ 
             ];
         } else {
             // Something wrong, username from the original Duo request is different than the one received now
-            $superGlobal->forget('duo_status','SESSION');
-            $superGlobal->forget('duo_state','SESSION');
-            $superGlobal->forget('duo_data','SESSION');
+            $superGlobal->forget('duo_status', 'SESSION');
+            $superGlobal->forget('duo_state', 'SESSION');
+            $superGlobal->forget('duo_data', 'SESSION');
             unset($superGlobal);
 
             return [
@@ -1830,9 +1830,9 @@ 
         }
     }
     // If we are here something wrong
-    $superGlobal->forget('duo_status','SESSION');
-    $superGlobal->forget('duo_state','SESSION');
-    $superGlobal->forget('duo_data','SESSION');
+    $superGlobal->forget('duo_status', 'SESSION');
+    $superGlobal->forget('duo_state', 'SESSION');
+    $superGlobal->forget('duo_data', 'SESSION');
     unset($superGlobal);
     return [
         'error' => true,
@@ -1858,8 +1858,8 @@ 
     // Set to false
     $userPasswordVerified = false;
     // load passwordLib library
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
     // Check if old encryption used
@@ -1992,8 +1992,8 @@ 
     public function get_user_info($login) {
         $data = DB::queryFirstRow(
             'SELECT u.*, a.value AS api_key
-            FROM ' . prefixTable('users') . ' AS u
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
+            FROM ' . prefixTable('users').' AS u
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
             WHERE login=%s',
             $login
         );
@@ -2086,7 +2086,7 @@ 
         $checks->get_is_too_much_attempts($sessionPwdAttempts);
     } catch (Exception $e) {
         // Load superGlobals
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -2348,19 +2348,19 @@ 
             if ($ret['error'] !== false) {
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
                 // Load superGlobals
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                 # Retrieve the previously stored state and username from the session
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
-                $superGlobal->forget('duo_state','SESSION');
-                $superGlobal->forget('duo_data','SESSION');
-                $superGlobal->forget('duo_status','SESSION');
+                $superGlobal->forget('duo_state', 'SESSION');
+                $superGlobal->forget('duo_data', 'SESSION');
+                $superGlobal->forget('duo_status', 'SESSION');
                 unset($superGlobal);
                 return [
                     'error' => true,
                     'mfaData' => $ret,
                     'mfaQRCodeInfos' => false,
                 ];
-            } else if ($ret['duo_url_ready'] === true){
+            } else if ($ret['duo_url_ready'] === true) {
                 return [
                     'error' => false,
                     'mfaData' => $ret,