nilsteampassnet / TeamPass

sources/backups.queries.php

Braces +3 added lines, -1 removed lines

@@ -301,7 +301,9 @@
                 break;
             }
             
-            if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
+            if (WIP === true) {
+                error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
+            }
 
             include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
 

Spacing +25 added lines, -25 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;
 }
 
@@ -138,21 +138,21 @@ 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             $return = '';
 
             //Get all tables
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::query('SELECT * FROM ' . $table);
+                    $result = DB::query('SELECT * FROM '.$table);
                     DB::query(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -164,17 +164,17 @@ 
                     $numFields = DB::count();
 
                     // prepare a drop table
-                    $return .= 'DROP TABLE ' . $table . ';';
-                    $row2 = DB::queryFirstRow('SHOW CREATE TABLE ' . $table);
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                    $return .= 'DROP TABLE '.$table.';';
+                    $row2 = DB::queryFirstRow('SHOW CREATE TABLE '.$table);
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                     //prepare all fields and datas
                     for ($i = 0; $i < $numFields; ++$i) {
                         while ($row = $result->fetch_row()) {
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
                             for ($j = 0; $j < $numFields; ++$j) {
                                 // Manage NULL values
-                                $value = $row[$j] === null ? 'NULL' : '"' . addslashes(preg_replace("/\n/", '\\n', $row[$j])) . '"';                    
+                                $value = $row[$j] === null ? 'NULL' : '"'.addslashes(preg_replace("/\n/", '\\n', $row[$j])).'"';                    
                                 $return .= $value;
                                 if ($j < ($numFields - 1)) {
                                     $return .= ',';
@@ -192,8 +192,8 @@ 
                 $token = GenerateCryptKey(20, false, true, true, false, true);
 
                 //save file
-                $filename = time() . '-' . $token . '.sql';
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+                $filename = time().'-'.$token.'.sql';
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
                 if ($handle !== false) {
                     //write file
                     fwrite($handle, $return);
@@ -205,16 +205,16 @@ 
                     // Encrypt the file
                     prepareFileWithDefuse(
                         'encrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                         $post_key
                     );
 
                     // Do clean
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                     rename(
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
                     );
                 }
 
@@ -234,9 +234,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                            $session->get('user-key_tmp') . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                            $session->get('user-key_tmp').'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -303,13 +303,13 @@ 
             
             if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.'/'.$post_totalSize.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             if (empty($post_clearFilename) === true) {
                 // Get filename from database
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE increment_id = %i',
                     $post_backupFile
                 );
@@ -329,8 +329,8 @@ 
                     
                     $ret = prepareFileWithDefuse(
                         'decrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                         $post_key
                     );
                     
@@ -346,8 +346,8 @@ 
                     }
 
                     // Do clean
-                    fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                    fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
                 } else {
                     echo prepareExchangedData(
                         array(

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;
 

Spacing +47 added lines, -47 removed lines

@@ -147,7 +147,7 @@ 
     $sessionPwdAttempts = $session->get('pwd_attempts');
     $sessionUrl = $session->get('user-initial_url');
     $server = [];
-    $server['PHP_AUTH_USER'] =  $request->getUser();
+    $server['PHP_AUTH_USER'] = $request->getUser();
     $server['PHP_AUTH_PW'] = $request->getPassword();
     
     // decrypt and retreive data in JSON format
@@ -162,18 +162,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'
         && $session->get('user-duo_status') === '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($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
         // Clear the data from the Duo process to continue clean with the standard login process
-        $session->set('user-duo_data','');
-        if($duo_data_dec === false) {
+        $session->set('user-duo_data', '');
+        if ($duo_data_dec === false) {
             // Add failed authentication log
             addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer());
 
@@ -191,7 +191,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(
                 [
@@ -536,7 +536,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
         $session->set('user-roles', $userInfo['fonction_id']);
@@ -548,7 +548,7 @@ 
         if (count($session->get('user-roles_array')) > 0) {
             $rolesList = DB::query(
                 'SELECT id, title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id IN %li',
                 $session->get('user-roles_array')
             );
@@ -594,7 +594,7 @@ 
             if ($adjustPermissions) {
                 $session->set('user-admin', (int) $userInfo['admin']);
                 $session->set('user-manager', (int) $userInfo['gestionnaire']);
-                $session->set('user-can_manage_all_users',(int)  $userInfo['can_manage_all_users']);
+                $session->set('user-can_manage_all_users', (int) $userInfo['can_manage_all_users']);
                 $session->set('user-read_only', (int) $userInfo['read_only']);
                 DB::update(
                     prefixTable('users'),
@@ -665,10 +665,10 @@ 
         $session->set('user-latest_items_tab', []);
         $session->set('user-nb_roles', 0);
         foreach ($session->get('user-latest_items') 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
                 );
@@ -677,7 +677,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,
                     ],
                     'add'
                 );
@@ -687,7 +687,7 @@ 
         // Get cahce tree info
         $cacheTreeData = DB::queryFirstRow(
             'SELECT visible_folders
-            FROM ' . prefixTable('cache_tree') . '
+            FROM ' . prefixTable('cache_tree').'
             WHERE user_id=%i',
             (int) $session->get('user-id')
         );
@@ -719,7 +719,7 @@ 
             && (int) $sessionAdmin !== 1
         ) {
             // get all Admin users
-            $val = DB::queryFirstRow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $val = DB::queryFirstRow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             if (DB::count() > 0) {
                 // Add email to table
                 prepareSendingEmail(
@@ -731,7 +731,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $session->get('user-last_connection')),
                             date($SETTINGS['time_format'], (int) $session->get('user-last_connection')),
                         ],
@@ -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'])
             );
         }
     }
@@ -891,7 +891,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;
@@ -1086,7 +1086,7 @@ 
     } catch (Exception $e) {
         return [
             'error' => true,
-            'message' => "Error: " . $e->getMessage(),
+            'message' => "Error: ".$e->getMessage(),
         ];
     }
 }
@@ -1117,7 +1117,7 @@ 
                 'type' => 'OpenLDAP'
             ];
         default:
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
     }
 }
 
@@ -1254,7 +1254,7 @@ 
         );
     }
     
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
 }
 
 /**
@@ -1271,12 +1271,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 = %s',
                 $group
             );
@@ -1407,7 +1407,7 @@ 
             // Check if exists in DB
             $groupData = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE title = %s',
                 $group["displayName"]
             );
@@ -1537,7 +1537,7 @@ 
             
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1550,7 +1550,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,
@@ -1706,7 +1706,7 @@ 
         }*/
         return [
             'error' => true,
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
             'pwd_attempts' => (int) $sessionPwdAttempts,
             'debug_message' => $e->getMessage(),
             'proceedIdentification' => false,
@@ -1722,7 +1722,7 @@ 
         } catch (DuoException $e) {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'debug_message' => $e->getMessage(),
                 'proceedIdentification' => false,
@@ -1730,7 +1730,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($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);
@@ -1758,7 +1758,7 @@ 
         } else {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'proceedIdentification' => false,
             ];
@@ -1779,8 +1779,8 @@ 
         // return the response (which should be the user name)
         if ($decoded_token['preferred_username'] === $username) {
             $session->set('user-duo_status', 'COMPLET');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
             $session->set('user-login', $username);
 
             return [
@@ -1791,9 +1791,9 @@ 
             ];
         } else {
             // Something wrong, username from the original Duo request is different than the one received now
-            $session->set('user-duo_status','');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_status', '');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
 
             return [
                 'error' => true,
@@ -1804,9 +1804,9 @@ 
         }
     }
     // If we are here something wrong
-    $session->set('user-duo_status','');
-    $session->set('user-duo_state','');
-    $session->set('user-duo_data','');
+    $session->set('user-duo_status', '');
+    $session->set('user-duo_state', '');
+    $session->set('user-duo_data', '');
     return [
         'error' => true,
         'message' => $lang->get('duo_login_mismatch'),
@@ -1918,7 +1918,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) OR (source = %s AND value = %s))',
             date('Y-m-d H:i:s', time()),
@@ -1940,8 +1940,8 @@ 
         // Get user info from DB
         $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 AND deleted_at IS NULL',
             $login
         );
@@ -2061,7 +2061,7 @@ 
             'array' => [
                 'value' => 'bruteforce_wait',
                 'error' => true,
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
             ]
         ];
     }
@@ -2478,15 +2478,15 @@ 
 
             if ($ret['error'] !== false) {
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
-                $session->set('user-duo_status','');
-                $session->set('user-duo_state','');
-                $session->set('user-duo_data','');
+                $session->set('user-duo_status', '');
+                $session->set('user-duo_state', '');
+                $session->set('user-duo_data', '');
                 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,
@@ -2550,7 +2550,7 @@ 
     // Count failed attempts from this source
     $count = DB::queryFirstField(
         'SELECT COUNT(*)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE source = %s AND value = %s',
         $source,
         $value

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 .= '"'.

scripts/background_tasks___items_handler.php

Braces +15 added lines, -6 removed lines

@@ -83,7 +83,9 @@ 
 
 if (DB::count() > 0) {
     // handle tasks inside this process
-    if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']);
+    if (WIP === true) {
+        error_log("Process in progress: ".$process_to_perform['increment_id']);
+    }
     handleTask(
         $process_to_perform['increment_id'],
         json_decode($process_to_perform['arguments'], true),
@@ -100,7 +102,9 @@ 
     );
     
     if (DB::count() > 0) {
-        if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']);
+        if (WIP === true) {
+            error_log("New process ta start: ".$process_to_perform['increment_id']);
+        }
         // update DB - started_at
         DB::update(
             prefixTable('background_tasks'),
@@ -153,8 +157,9 @@ 
         );
 
         // No more tasks, exit
-        if ($process_to_perform !== 1)
-            break;
+        if ($process_to_perform !== 1) {
+                    break;
+        }
 
         // Run next task
         $process = new Symfony\Component\Process\Process([
@@ -331,7 +336,9 @@ 
     if ($args['step'] === 'create_users_files_key') {
         // Loop on all files for this item
         // and encrypt them for each user
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+        if (WIP === true) {
+            provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+        }
         foreach($args['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_items'),
@@ -347,7 +354,9 @@ 
     } elseif ($args['step'] === 'create_users_fields_key') {
         // Loop on all encrypted fields for this item
         // and encrypt them for each user
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+        if (WIP === true) {
+            provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+        }
         foreach($args['fields_keys'] as $field) {
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),

Spacing +13 added lines, -13 removed lines

@@ -75,7 +75,7 @@ 
 DB::debugmode(false);
 $process_to_perform = DB::queryFirstRow(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys")
     ORDER BY increment_id ASC',
     1
@@ -93,7 +93,7 @@ 
     // search for next process to handle
     $process_to_perform = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('background_tasks') . '
+        FROM ' . prefixTable('background_tasks').'
         WHERE is_in_progress = %i AND (finished_at = "" OR finished_at IS NULL) AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys")
         ORDER BY increment_id ASC',
         0
@@ -111,7 +111,7 @@ 
             $process_to_perform['increment_id']
         );
 
-        provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS);
+        provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS);
         handleTask(
             $process_to_perform['increment_id'],
             json_decode($process_to_perform['arguments'], true),
@@ -146,7 +146,7 @@ 
         // Search if there are remaining tasks
         $process_to_perform = DB::queryFirstField(
             'SELECT 1
-            FROM ' . prefixTable('background_tasks') . '
+            FROM ' . prefixTable('background_tasks').'
             WHERE is_in_progress = %i AND process_type IN (
                 "item_copy",
                 "new_item",
@@ -185,10 +185,10 @@ 
  */
 function handleTask(int $processId, array $ProcessArguments, array $SETTINGS, int $itemId = null): bool
 {
-    provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS);
+    provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS);
     $task_to_perform = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i AND finished_at IS NULL
         ORDER BY increment_id ASC',
         $processId
@@ -202,13 +202,13 @@ 
         // if sub_task_in_progress === 1 then exit
         if ((int) $task_to_perform['sub_task_in_progress'] !== 0) {
             // Task is currently being in progress by another server process
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
             return false;
         }
 
         // handle next task
         $args = json_decode($task_to_perform['task'], true);
-        provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS);
+        provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS);
 
         // flag as in progress
         DB::update(
@@ -250,7 +250,7 @@ 
         DB::update(
             prefixTable('background_subtasks'),
             array(
-                'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+                'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
                 'task' => json_encode(["status" => "Done"]),
                 'is_in_progress' => -1,
                 'finished_at' => time(),
@@ -265,7 +265,7 @@ 
         // are all tasks done?
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('background_subtasks') . '
+            FROM ' . prefixTable('background_subtasks').'
             WHERE task_id = %i AND finished_at IS NULL',
             $processId
         );
@@ -337,7 +337,7 @@ 
         // Loop on all files for this item
         // and encrypt them for each user
         if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
-        foreach($args['files_keys'] as $file) {
+        foreach ($args['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_items'),
                 0,
@@ -353,7 +353,7 @@ 
         // Loop on all encrypted fields for this item
         // and encrypt them for each user
         if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
-        foreach($args['fields_keys'] as $field) {
+        foreach ($args['fields_keys'] as $field) {
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),
                 0,
@@ -405,6 +405,6 @@ 
     DB::query(
         'DELETE FROM '.prefixTable('items_edition').'
         WHERE timestamp < %i',
-        ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition']*60) : time() - EDITION_LOCK_PERIOD
+        ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition'] * 60) : time() - EDITION_LOCK_PERIOD
     );
 }

sources/upload.files.php

Spacing +33 added lines, -33 removed lines

@@ -76,7 +76,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;
 }
 
@@ -130,7 +130,7 @@ 
     } else {
         // check if token is expired
         $data = DB::queryFirstRow(
-            'SELECT end_timestamp FROM ' . prefixTable('tokens') . ' WHERE user_id = %i AND token = %s',
+            'SELECT end_timestamp FROM '.prefixTable('tokens').' WHERE user_id = %i AND token = %s',
             $session->get('user-id'),
             $post_user_token
         );
@@ -154,7 +154,7 @@ 
 
 // HTTP headers for no cache etc
 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 
@@ -166,7 +166,7 @@ 
     }
 
     // Set directory used to store file
-    $targetDir = realpath($SETTINGS['cpassman_dir'] . '/includes/avatars');
+    $targetDir = realpath($SETTINGS['cpassman_dir'].'/includes/avatars');
 } else {
     $targetDir = realpath($SETTINGS['path_to_files_folder']);
 }
@@ -219,7 +219,7 @@ 
     $file_name = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($file->getClientOriginalName())));
     
     if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-        error_log('Invalid file name: ' . $file_name . '.');
+        error_log('Invalid file name: '.$file_name.'.');
         echo handleUploadError('Invalid file name provided.');
         return false;
     }
@@ -233,13 +233,13 @@ 
             $ext = strtolower($ext);
         } else {
             // Case where the file extension is not a string
-            error_log('Invalid file name: ' . $file_name . '.');
+            error_log('Invalid file name: '.$file_name.'.');
             echo handleUploadError('Invalid file extension.');
             return false;
         }
     } else {
         // Case where the file name is not a string
-        error_log('Invalid file name: ' . $file_name . '.');
+        error_log('Invalid file name: '.$file_name.'.');
         echo handleUploadError('Invalid file.');
         return false;
     }
@@ -247,8 +247,8 @@ 
     // Validate against a list of allowed extensions
     $allowed_extensions = explode(
         ',',
-        $SETTINGS['upload_docext'] . ',' . $SETTINGS['upload_imagesext'] .
-            ',' . $SETTINGS['upload_pkgext'] . ',' . $SETTINGS['upload_otherext']
+        $SETTINGS['upload_docext'].','.$SETTINGS['upload_imagesext'].
+            ','.$SETTINGS['upload_pkgext'].','.$SETTINGS['upload_otherext']
     );
     if (
         !in_array($ext, $allowed_extensions) 
@@ -267,25 +267,25 @@ 
 
 // is destination folder writable
 if (is_writable($SETTINGS['path_to_files_folder']) === false) {
-    echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
     return false;
 }
 
 // Make sure the fileName is unique but only if chunking is disabled
-if ($chunks < 2 && file_exists($targetDir . DIRECTORY_SEPARATOR . $fileName)) {
+if ($chunks < 2 && file_exists($targetDir.DIRECTORY_SEPARATOR.$fileName)) {
     // $ext is guaranteed to be a string due to prior checks
     $fileNameA = substr($fileName, 0, strlen(/** @scrutinizer ignore-type */$ext));
     $fileNameB = substr($fileName, strlen(/** @scrutinizer ignore-type */$ext));
 
     $count = 1;
-    while (file_exists($targetDir . DIRECTORY_SEPARATOR . $fileNameA . '_' . $count . $fileNameB)) {
+    while (file_exists($targetDir.DIRECTORY_SEPARATOR.$fileNameA.'_'.$count.$fileNameB)) {
         ++$count;
     }
 
-    $fileName = $fileNameA . '_' . $count . $fileNameB;
+    $fileName = $fileNameA.'_'.$count.$fileNameB;
 }
 
-$filePath = $targetDir . DIRECTORY_SEPARATOR . $fileName;
+$filePath = $targetDir.DIRECTORY_SEPARATOR.$fileName;
 
 // Create target dir
 if (!file_exists($targetDir)) {
@@ -299,7 +299,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($fileClean = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $fileClean;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$fileClean;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -313,7 +313,7 @@ 
 
     closedir($dir);
 } else {
-    echo handleUploadError('Not enough permissions on folder ' . $SETTINGS['path_to_files_folder'] . '.');
+    echo handleUploadError('Not enough permissions on folder '.$SETTINGS['path_to_files_folder'].'.');
     return false;
 }
 
@@ -353,7 +353,7 @@ 
 
                 // Safe destination folder
                 $uploadDir = realpath($SETTINGS['path_to_upload_folder']);
-                $destinationPath = $uploadDir . DIRECTORY_SEPARATOR . $fileName;
+                $destinationPath = $uploadDir.DIRECTORY_SEPARATOR.$fileName;
                 
                 if (move_uploaded_file($tmpFilePath, $destinationPath)) {
                     // Open the moved file in read mode
@@ -394,7 +394,7 @@ 
             return false;
         }
     } else {
-        echo handleUploadError('Failed to move uploaded file to ' . $SETTINGS['path_to_files_folder'] . '.');
+        echo handleUploadError('Failed to move uploaded file to '.$SETTINGS['path_to_files_folder'].'.');
         return false;
     }
 } else {
@@ -410,14 +410,14 @@ 
                 fwrite($out, $buff);
             }
         } else {
-            echo handleUploadError('Failed to open input stream ' . $SETTINGS['path_to_files_folder'] . '.');
+            echo handleUploadError('Failed to open input stream '.$SETTINGS['path_to_files_folder'].'.');
             return false;
         }
 
         fclose($in);
         fclose($out);
     } else {
-        echo handleUploadError('Failed to open output stream ' . $SETTINGS['path_to_files_folder'] . '.');
+        echo handleUploadError('Failed to open output stream '.$SETTINGS['path_to_files_folder'].'.');
         return false;
     }
 }
@@ -450,7 +450,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -479,7 +479,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -512,13 +512,13 @@ 
     // rename the file
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext
     );
 
     // make thumbnail
     $ret = makeThumbnail(
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '.' . $ext,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName . '_thumb' . '.' . $ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'.'.$ext,
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName.'_thumb'.'.'.$ext,
         40
     );
 
@@ -530,21 +530,21 @@ 
     }
 
     // get current avatar and delete it
-    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM ' . prefixTable('users') . ' WHERE id=%i', $session->get('user-id'));
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar'], $SETTINGS);
-    fileDelete($targetDir . DIRECTORY_SEPARATOR . $data['avatar_thumb'], $SETTINGS);
+    $data = DB::queryFirstRow('SELECT avatar, avatar_thumb FROM '.prefixTable('users').' WHERE id=%i', $session->get('user-id'));
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar'], $SETTINGS);
+    fileDelete($targetDir.DIRECTORY_SEPARATOR.$data['avatar_thumb'], $SETTINGS);
 
     // store in DB the new avatar
     DB::query(
-        'UPDATE ' . prefixTable('users') . "
-        SET avatar='" . $newFileName . '.' . $ext . "', avatar_thumb='" . $newFileName . '_thumb' . '.' . $ext . "'
+        'UPDATE '.prefixTable('users')."
+        SET avatar='" . $newFileName.'.'.$ext."', avatar_thumb='".$newFileName.'_thumb'.'.'.$ext."'
         WHERE id=%i",
         $session->get('user-id')
     );
 
     // store in session
-    $session->set('user-avatar', $newFileName . '.' . $ext);
-    $session->set('user-avatar_thumb', $newFileName . '_thumb' . '.' . $ext);
+    $session->set('user-avatar', $newFileName.'.'.$ext);
+    $session->set('user-avatar_thumb', $newFileName.'_thumb'.'.'.$ext);
 
     // return info
     echo prepareExchangedData(
@@ -563,7 +563,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB

pages/profile.js.php

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -97,7 +97,7 @@ 
     })
 
     // Select user properties
-    $('#profile-user-language option[value=<?php echo $session->get('user-language');?>').attr('selected','selected');
+    $('#profile-user-language option[value=<?php echo $session->get('user-language'); ?>').attr('selected','selected');
 
 
     // AVATAR IMPORT
@@ -295,7 +295,7 @@ 
 
                     // reload page in case of language change
                     if ($('#profile-user-language').val()
-                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language');?>') {
+                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language'); ?>') {
                         // prepare reload
                         $(this).delay(3000).queue(function() {
                             document.location.href = "index.php?page=profile";
@@ -306,7 +306,7 @@ 
                         // Inform user
                         toastr.remove();
                         toastr.info(
-                            '<?php echo $lang->get('alert_page_will_reload') . ' ... ' . $lang->get('please_wait'); ?>',
+                            '<?php echo $lang->get('alert_page_will_reload').' ... '.$lang->get('please_wait'); ?>',
                             '', {
                                 timeOut: 3000,
                                 progressBar: true
@@ -410,27 +410,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -523,27 +523,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -559,7 +559,7 @@ 
         }
     });
 
-    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
+    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
 
     $("#open-dialog-keys-download").on('click', function(event) {
         event.preventDefault();

pages/items.php

Spacing +34 added lines, -34 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 // Define Timezone
@@ -90,7 +90,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $usersList[$record['login']] = [
         'id' => $record['id'],
@@ -101,16 +101,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$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 $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 
@@ -185,7 +185,7 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -254,7 +254,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -284,7 +284,7 @@ 
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
                                 </div>
                                 <small class='form-text text-muted'>
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                                 </small>
                             </div>
 
@@ -472,39 +472,39 @@ 
                             <div class="tab-pane" id="tab_4">
                                 <div id="form-item-field" class="hidden">
                                     <?php
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
                                         if (isset($session_item_fields) === true) {
                                             foreach ($session_item_fields as $category) {
                                                 //print_r($category);
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                     if (!empty($field['regex'])) {
                                                         echo '
-                                                    <div>Regex: '. $field['regex'] .'</div>
+                                                    <div>Regex: '. $field['regex'].'</div>
                                                         ';
                                                     }
                                                 }
@@ -515,8 +515,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -526,8 +526,8 @@ 
                                         } else {
                                             echo
                                             '<div class="alert alert-info">
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
-                                                ' . $lang->get('no_fields') . '
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
+                                                ' . $lang->get('no_fields').'
                                             </div>';
                                         } ?>
                                 </div>
@@ -668,7 +668,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         $lang->get('otv_message')
     );
                             ?></p>
@@ -686,9 +686,9 @@ 
 
                     <div class="row">
                         <div class="form-group col-4">
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
                             <div class="input-group mb-3">
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
                             </div>
                         </div>
 
@@ -776,7 +776,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -794,14 +794,14 @@ 
                             <label><?php echo $lang->get('icon'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                         <div class="form-group">
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                     </div>
@@ -1212,18 +1212,18 @@ 
                                 <?php
                                     foreach ($session_item_fields as $elem) {
                                         echo '
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                                    <h5>' . $elem['title'] . '</h5>
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                                    <h5>' . $elem['title'].'</h5>
                                     <p>
                                         <ul class="list-group list-group-unbordered mb-3">';
                                         foreach ($elem['fields'] as $field) {
                                             echo '
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
-                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'] . '">
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
+                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'].'">
                                                     <i class="fa-solid fa-copy"></i>
                                                 </button>
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                             </li>';
                                         }
                                         echo '

scripts/background_tasks___userKeysCreation_subtaskHdl.php

Spacing +33 added lines, -33 removed lines

@@ -122,7 +122,7 @@ 
 DB::update(
     prefixTable('background_subtasks'),
     array(
-        'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+        'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
         'is_in_progress' => 0,
         'finished_at' => time(),
         'updated_at' => time(),
@@ -158,7 +158,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -271,13 +271,13 @@ 
 {
     $userInfo = DB::queryFirstRow(
         'SELECT pw, public_key, private_key, login, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $owner_id
     );
     
     // decrypt owner password
-    $pwd = cryption($owner_pwd, '','decrypt', $SETTINGS)['string'];
+    $pwd = cryption($owner_pwd, '', 'decrypt', $SETTINGS)['string'];
     // decrypt private key and send back
     return [
         'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),
@@ -317,10 +317,10 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw, perso
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso =  %i
         ORDER BY id ASC
-        LIMIT ' . $post_start . ', ' . $post_length,
+        LIMIT ' . $post_start.', '.$post_length,
         ($extra_arguments['only_personal_items'] ?? 0) === 1 ? 1 : 0
     );
 
@@ -328,7 +328,7 @@ 
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -355,7 +355,7 @@ 
         
         $currentUserKey = DB::queryFirstRow(
             'SELECT increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $post_user_id
@@ -429,15 +429,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $extra_arguments['owner_id']
@@ -469,7 +469,7 @@ 
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -491,7 +491,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -531,15 +531,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $extra_arguments['owner_id']
@@ -567,7 +567,7 @@ 
                 if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -590,7 +590,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -630,14 +630,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $extra_arguments['owner_id']
@@ -669,7 +669,7 @@ 
             if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -729,16 +729,16 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT f.id AS id, i.perso AS perso
-        FROM ' . prefixTable('files') . ' AS f
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             (int) $record['perso'] === 0 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -766,7 +766,7 @@ 
 
         $currentUserKey = DB::queryFirstRow(
             'SELECT increment_id
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $post_user_id
@@ -797,8 +797,8 @@ 
     // SHould we change step? Finished ?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
     $counter = DB::count();
     $next_start = (int) $post_start + (int) $post_length;
@@ -864,7 +864,7 @@ 
     // get user info
     $userInfo = DB::queryFirstRow(
         'SELECT email, login, auth_type, special, lastname, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $extra_arguments['new_user_id']
     );
@@ -879,10 +879,10 @@ 
             filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             // @scrutinizer ignore-type
             empty($extra_arguments['email_body']) === false ? $extra_arguments['email_body'] : $lang->get('email_body_user_config_1'),
-            'TEAMPASS - ' . $lang->get('login_credentials'),
+            'TEAMPASS - '.$lang->get('login_credentials'),
             (array) filter_var_array(
                 [
-                    '#code#' => cryption($extra_arguments['new_user_code'], '','decrypt', $SETTINGS)['string'],
+                    '#code#' => cryption($extra_arguments['new_user_code'], '', 'decrypt', $SETTINGS)['string'],
                     '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                     '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
                 ],