nilsteampassnet / TeamPass

sources/identify.php

Spacing +72 added lines, -72 removed lines

@@ -43,12 +43,12 @@ 
 }
 
 // Load AntiXSS
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
 $antiXss = new voku\helper\AntiXSS();
 
-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';
+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';
 
 // init
 $ldap_suffix = '';
@@ -57,12 +57,12 @@ 
 
 // 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');
     $fp = fopen(DEBUGLDAPFILE, 'w');
     fclose($fp);
 }
 if (DEBUGDUO === true) {
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
     $fp = fopen(DEBUGDUOFILE, 'w');
     fclose($fp);
 }
@@ -79,7 +79,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));
 }
@@ -99,7 +99,7 @@ 
     // Get DUO keys
     $duoData = DB::query(
         'SELECT intitule, valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s',
         'duoSecurity'
     );
@@ -108,7 +108,7 @@ 
     }
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $sig_request = Duo::signRequest(
         $_GLOBALS['IKEY'],
         $_GLOBALS['SKEY'],
@@ -120,17 +120,17 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig request : ' . $post_login . "\n" .
-                'resp : ' . $sig_request . "\n"
+            "\n\n-----\n\n".
+                'sig request : '.$post_login."\n".
+                'resp : '.$sig_request."\n"
         );
     }
 
     // load csrfprotector
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
 
     // return result
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
     // ---
     // ---
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -140,7 +140,7 @@ 
     //--------
 
     // load library
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
     $authenticated_username = Duo::verifyResponse(
         $SETTINGS['duo_ikey'],
         $SETTINGS['duo_skey'],
@@ -152,9 +152,9 @@ 
         debugIdentify(
             DEBUGDUO,
             DEBUGDUOFILE,
-            "\n\n-----\n\n" .
-                'sig response : ' . $post_sig_response . "\n" .
-                'resp : ' . $authenticated_username . "\n"
+            "\n\n-----\n\n".
+                'sig response : '.$post_sig_response."\n".
+                'resp : '.$authenticated_username."\n"
         );
     }
 
@@ -165,7 +165,7 @@ 
             // is user in Teampass?
             $userInfo = DB::queryfirstrow(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -176,9 +176,9 @@ 
             }
         }
 
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     } else {
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
     }
     // ---
     // ---
@@ -189,7 +189,7 @@ 
 
 
     // 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
@@ -282,19 +282,19 @@ 
     } else {
         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'].'/includes/config/settings.php';
 
     header('Content-type: text/html; charset=utf-8');
     error_reporting(E_ERROR);
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // 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
@@ -308,11 +308,11 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "Content of data sent '" . filter_var($sentData, FILTER_SANITIZE_STRING) . "'\n"
+        "Content of data sent '".filter_var($sentData, FILTER_SANITIZE_STRING)."'\n"
     );
 
     // 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';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -324,7 +324,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
     //echo $dataReceived." -->".empty($sessionKey)."<-- ".$sessionKey." ** " ;
     // decrypt and retreive data in JSON format
     if (empty($sessionKey) === true) {
@@ -404,14 +404,14 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "Starting authentication of '" . $username . "'\n" .
-            'LDAP status: ' . $SETTINGS['ldap_mode'] . "\n"
+        "Starting authentication of '".$username."'\n".
+            'LDAP status: '.$SETTINGS['ldap_mode']."\n"
     );
 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE login=%s',
         $username
     );
@@ -437,7 +437,7 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        'USer exists: ' . $counter . "\n"
+        'USer exists: '.$counter."\n"
     );
 
     
@@ -565,7 +565,7 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        'Proceed with Ident: ' . $proceedIdentification . "\n"
+        'Proceed with Ident: '.$proceedIdentification."\n"
     );
 
     // If admin user then check if folder install exists
@@ -606,7 +606,7 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "User's password verified: " . /** @scrutinizer ignore-type */ $userPasswordVerified . "\n"
+        "User's password verified: "./** @scrutinizer ignore-type */ $userPasswordVerified."\n"
     );
 
     // Can connect if
@@ -640,7 +640,7 @@ 
         //$arrAttempts = array();
         $rows = DB::query(
             'SELECT date
-            FROM ' . prefixTable('log_system') . "
+            FROM ' . prefixTable('log_system')."
             WHERE field_1 = %s
             AND type = 'failed_auth'
             AND label = 'user_password_not_correct'
@@ -656,7 +656,7 @@ 
             foreach ($rows as $record) {
                 array_push(
                     $arrAttempts,
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date'])
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date'])
                 );
             }
         }
@@ -796,7 +796,7 @@ 
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
             $resRoles = DB::queryFirstRow(
                 'SELECT title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id=%i',
                 $role
             );
@@ -817,7 +817,7 @@ 
 
         // build complete array of roles
         $superGlobal->put('arr_roles_full', array(), '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'],
@@ -911,7 +911,7 @@ 
             if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -920,7 +920,7 @@ 
                     array(
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&amp;group=' . $dataLastItems['id_tree'] . '&amp;id=' . $item,
+                        'url' => 'index.php?page=items&amp;group='.$dataLastItems['id_tree'].'&amp;id='.$item,
                     ),
                     'SESSION',
                     'latest_items_tab'
@@ -937,12 +937,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
@@ -958,7 +958,7 @@ 
                             '#tp_time#',
                         ),
                         array(
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], $superGlobal->get('last_connection', 'SESSION')),
                             date($SETTINGS['time_format'], $superGlobal->get('last_connection', 'SESSION')),
                         ),
@@ -1107,8 +1107,8 @@ 
     debugIdentify(
         DEBUGDUO,
         DEBUGDUOFILE,
-        "\n\n----\n" .
-            'Identified : ' . filter_var($return, FILTER_SANITIZE_STRING) . "\n\n"
+        "\n\n----\n".
+            'Identified : '.filter_var($return, FILTER_SANITIZE_STRING)."\n\n"
     );
 
     echo prepareExchangedData(
@@ -1174,18 +1174,18 @@ 
     ];
     
     // Load expected libraries
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/illuminate/Contracts/Auth/Authenticatable.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/LdapRecord/DetectsErrors.php';
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.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/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/LdapRecord/DetectsErrors.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
 
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
     $ad->register();
@@ -1200,7 +1200,7 @@ 
 
         return array(
             'error' => true,
-            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage()." ".$config['username'],
+            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage()." ".$config['username'],
              
         );
     }
@@ -1230,7 +1230,7 @@ 
         // Get immediate groups the user is apart of:
         $arrayTmp = array();
         foreach ($entry['memberof'] as $group) {
-            $group = substr($group, strpos($group, '=')+1, (strpos($group,',') - strpos($group, '=') - 1));
+            $group = substr($group, strpos($group, '=') + 1, (strpos($group, ',') - strpos($group, '=') - 1));
             if (empty($group) === false) {
                 array_push($arrayTmp, $group);
             }
@@ -1245,7 +1245,7 @@ 
     }
 
     // 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);
@@ -1298,7 +1298,7 @@ 
 function yubicoMFACheck($dataReceived, $userInfo, $SETTINGS)
 {
     // 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');
@@ -1341,7 +1341,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
 
@@ -1396,7 +1396,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' => time(),
@@ -1422,7 +1422,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();
@@ -1453,7 +1453,7 @@ 
         && 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');
@@ -1463,7 +1463,7 @@ 
         $proceedIdentification = false;
         
         // 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']);
@@ -1489,7 +1489,7 @@ 
 
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
 
@@ -1504,7 +1504,7 @@ 
             );
 
             $firstTime = array(
-                '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,
@@ -1557,8 +1557,8 @@ 
     $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();