nilsteampassnet / TeamPass

self-unlock.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 // Load functions
-require_once __DIR__. '/includes/config/include.php';
+require_once __DIR__.'/includes/config/include.php';
 require_once __DIR__.'/sources/main.functions.php';
 
 // init
@@ -53,10 +53,10 @@ 
 // Check for existing lock
 $result = DB::queryFirstField(
     'SELECT 1
-     FROM ' . prefixTable('auth_failures') . '
+     FROM ' . prefixTable('auth_failures').'
      WHERE unlock_at = (
         SELECT MAX(unlock_at)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE unlock_at > %s
         AND source = %s AND value = %s)
      AND unlock_code = %s',

sources/identify.php

Indentation +1 added lines, -1 removed lines

@@ -2663,7 +2663,7 @@
             'SELECT email, name
              FROM '.prefixTable('users').'
              WHERE login = %s',
-             $value
+                $value
         );
 
         // No valid email address for user

Braces +9 added lines, -4 removed lines

@@ -2401,7 +2401,9 @@ 
         // Complete $userInfo
         $userInfo['has_been_created'] = 1;
 
-        if (WIP === true) error_log("--- USER CREATED ---");
+        if (WIP === true) {
+            error_log("--- USER CREATED ---");
+        }
 
         return [
             'error' => false,
@@ -2437,7 +2439,9 @@ 
         }
 
         // Oauth2 user already exists and authenticated
-        if (WIP === true) error_log("--- USER AUTHENTICATED ---");
+        if (WIP === true) {
+            error_log("--- USER AUTHENTICATED ---");
+        }
         $userInfo['has_been_created'] = 0;
 
         $passwordManager = new PasswordManager();
@@ -2667,8 +2671,9 @@ 
         );
 
         // No valid email address for user
-        if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL))
-            return;
+        if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) {
+                    return;
+        }
 
         $unlock_url = $SETTINGS['cpassman_url'].'/self-unlock.php?login='.$value.'&otp='.$unlock_code;
 

sources/users.datatable.php

Spacing +15 added lines, -17 removed lines

@@ -77,7 +77,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -128,7 +128,7 @@ 
     if (isset($order['column']) && preg_match('#^(asc|desc)$#i', $order['dir'])) {
         $columnIndex = filter_var($order['column'], FILTER_SANITIZE_NUMBER_INT);
         $dir = filter_var($order['dir'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $sOrder .= $aColumns[$columnIndex] . ' ' . $dir . ', ';
+        $sOrder .= $aColumns[$columnIndex].' '.$dir.', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);
@@ -152,15 +152,15 @@ 
 
 if ($letter !== '' && $letter !== 'None') {
     $sWhere .= ' AND (';
-    $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
     $sWhere .= ')';
 } elseif ($searchValue !== '') {
     $sWhere .= ' AND (';
-    $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
-    $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
-    $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
+    $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
+    $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
+    $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
     $sWhere .= ')';
 }
 
@@ -247,7 +247,7 @@ 
         // Check for existing lock
         $unlock_at = DB::queryFirstField(
             'SELECT MAX(unlock_at)
-             FROM ' . prefixTable('auth_failures') . '
+             FROM ' . prefixTable('auth_failures').'
              WHERE unlock_at > %s AND source = %s AND value = %s',
             date('Y-m-d H:i:s', time()),
             'login',
@@ -256,33 +256,31 @@ 
 
         // Get some infos about user
         $userDisplayInfos = 
-            (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '')
+            (isset($userDate['date']) ? '<i class=\"fas fa-calendar-day infotip text-info ml-2\" title=\"'.$lang->get('creation_date').': '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $userDate['date']).'\"></i>' : '')
             .
             ((int) $record['last_connexion'] > 0 ? '<i class=\"far fa-clock infotip text-info ml-2\" title=\"'.$lang->get('index_last_seen').": ".
-            date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
+            date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['last_connexion']).'\"></i>' : '')
             .
             ((int) $record['user_ip'] > 0 ? '<i class=\"fas fa-street-view infotip text-info ml-1\" title=\"'.$lang->get('ip').": ".($record['user_ip']).'\"></i>' : '')
             .
             ($record['auth_type'] === 'ldap' ? '<i class=\"far fa-address-book infotip text-warning ml-1\" title=\"'.$lang->get('managed_through_ad').'\"></i>' : '')
             .
             ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && ((int) $SETTINGS['duo'] === 1 || (int) $SETTINGS['google_authentication'] === 1)) ?
-                ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') :
-                ''
+                ((int) $record['mfa_enabled'] === 1 ? '' : '<i class=\"fa-solid fa-fingerprint infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('mfa_disabled_for_user').'\"></i>') : ''
                 )
             .
             (($unlock_at) ? '<i class=\"fas fa-solid text-red fa-lock infotip text-info ml-1\" title=\"'.$lang->get('bruteforce_unlock_at').$unlock_at.'\"></i>' : '');
         if ($request->query->filter('display_warnings', '', FILTER_VALIDATE_BOOLEAN) === true) {
             $userDisplayInfos .= '<br>'.
                 ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['admin'] !== 1 && is_null($record['keys_recovery_time']) === true) ? 
-                    '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' :
-                    ''
+                    '<i class=\"fa-solid fa-download infotip ml-1\" style=\"color:Tomato\" title=\"'.$lang->get('recovery_keys_not_downloaded').'\"></i>' : ''
                 ).
                 ((in_array($record['id'], [OTV_USER_ID, TP_USER_ID, SSH_USER_ID, API_USER_ID]) === false && (int) $record['pw_passwordlib'] === 1) ? '<i class=\"fa-solid fa-person-walking-luggage infotip ml-1\" style=\"color:Tomato\" title=\"Old password encryption. Shall login to initialize.\"></i>' : '');
         }
 
         $sOutput .= '["<span data-id=\"'.$record['id'].'\" data-fullname=\"'.
-            (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : '').' '.
-            (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES|ENT_SUBSTITUTE|ENT_DISALLOWED) : '').
+            (empty($record['name']) === false ? htmlentities($record['name'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : '').' '.
+            (empty($record['lastname']) === false ? htmlentities($record['lastname'], ENT_QUOTES | ENT_SUBSTITUTE | ENT_DISALLOWED) : '').
             '\" data-auth-type=\"'.$record['auth_type'].'\" data-special=\"'.$record['special'].'\" data-mfa-enabled=\"'.$record['mfa_enabled'].'\" data-otp-provided=\"'.(isset($record['otp_provided']) === true ? $record['otp_provided'] : '').'\"></span>", ';
         //col2
         $sOutput .= '"'.