nilsteampassnet / TeamPass

pages/utilities.logs.js.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === 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;
 }
 ?>

sources/fields.queries.php

Spacing +3 added lines, -4 removed lines

@@ -67,7 +67,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;
 }
 
@@ -538,8 +538,7 @@ 
             $post_masked = filter_var($dataReceived['masked'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_encrypted = filter_var($dataReceived['encrypted'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             $post_roles = filter_var_array($dataReceived['roles'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' :
-                filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
+            $post_fieldId = isset($dataReceived['fieldId']) === false ? '' : filter_var($dataReceived['fieldId'], FILTER_SANITIZE_NUMBER_INT);
 
             if (empty($post_fieldId) === false) {
                 // UPDATE FIELD
@@ -555,7 +554,7 @@ 
                         'encrypted_data' => $post_encrypted,
                         'is_mandatory' => $post_mandatory,
                         'masked' => $post_masked,
-                        'role_visibility' => is_null($post_roles) === true || count($post_roles) ===0 ? '' : implode(',', $post_roles),
+                        'role_visibility' => is_null($post_roles) === true || count($post_roles) === 0 ? '' : implode(',', $post_roles),
                         'order' => calculateOrder($post_fieldId, $post_order),
                     ),
                     'id = %i',

sources/utils.queries.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,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;
 }
 

sources/favourites.queries.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,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;
 }
 

pages/backups.js.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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;
 }
 ?>
@@ -137,7 +137,7 @@ 
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo $lang->get('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -164,7 +164,7 @@ 
                                         // error
                                         toastr.remove();
                                         toastr.error(
-                                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                             '<?php echo $lang->get('error'); ?>', {
                                                 timeOut: 5000,
                                                 progressBar: true
@@ -235,7 +235,7 @@ 
                             // ERROR
                             toastr.remove();
                             toastr.error(
-                                '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                                '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                                 '<?php echo $lang->get('error'); ?>', {
                                     timeOut: 5000,
                                     progressBar: true
@@ -271,7 +271,7 @@ 
     // PREPARE UPLOADER with plupload
 <?php
 $maxFileSize = (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false)
-    ? $SETTINGS['upload_maxfilesize'] . 'mb'
+    ? $SETTINGS['upload_maxfilesize'].'mb'
     : $SETTINGS['upload_maxfilesize'];
 ?>
 

pages/utilities.logs.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === 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;
 }
 
@@ -203,7 +203,7 @@ 
                                             echo $session->has('user-admin') && (int) $session->get('user-admin') && null !== $session->get('user-admin') && (int) $session->get('user-admin') === 1 ? '' : ' hidden';
                                             ?>">
                         <div class="form-group">
-                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge') . ' ' . $lang->get('date_range'); ?></h5>
+                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge').' '.$lang->get('date_range'); ?></h5>
                             <div class="input-group">
                                 <div class="input-group-prepend">
                                     <span class="input-group-text">
@@ -226,7 +226,7 @@ 
                                     <select class="form-control" id="purge-filter-user">
                                         <option value="-1"><?php echo $lang->get('all'); ?></option>
                                     <?php
-                                    $rows = DB::query('SELECT id, name, lastname FROM ' . prefixTable('users') . ' WHERE admin = 0');
+                                    $rows = DB::query('SELECT id, name, lastname FROM '.prefixTable('users').' WHERE admin = 0');
 foreach ($rows as $record) {
     echo '
                                         <option value="'.$record['id'].'">'.$record['name'].' '.$record['lastname'].'</option>';

error.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
     // Update table by deleting ID
     if ($session->has('user-id') && null !== $session->get('user-id')) {
         DB::update(
-            DB_PREFIX . 'users',
+            DB_PREFIX.'users',
             [
                 'key_tempo' => '',
             ],

sources/main.functions.php

Indentation +1 added lines, -2 removed lines

@@ -2225,7 +2225,7 @@ 
  * <tt>exec("find ".$path." -type d -exec chmod 755 {} \;");</tt>
  *
  * @author Jeppe Toustrup (tenzer at tenzer dot dk)
-  *
+ *
  * @param string $path      An either relative or absolute path to a file or directory which should be processed.
  * @param int    $filePerm The permissions any found files should get.
  * @param int    $dirPerm  The permissions any found folder should get.
@@ -3848,7 +3848,6 @@ 
  * @param integer $processId
  * @param integer $nbItemsToTreat
  * @return void
- 
  */
 function createUserTasks($processId, $nbItemsToTreat): void
 {

Spacing +194 added lines, -196 removed lines

@@ -99,19 +99,19 @@ 
             $text = Crypto::decrypt($message, $key);
         }
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
-        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage());
         $err = 'wrong_key_or_modified_ciphertext';
     } catch (CryptoException\BadFormatException $ex) {
-        error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage());
         $err = 'bad_format';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-IO: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-IO: '.$ex->getMessage());
         $err = 'io_error';
     } catch (Exception $ex) {
-        error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage());
         $err = 'unexpected_error';
     }
 
@@ -196,7 +196,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -244,8 +244,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -323,7 +323,7 @@ 
     $session->set('user-forbiden_personal_folders', []);
     
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -332,20 +332,20 @@ 
     // get complete list of ROLES
     $tmp = explode(';', $idFonctions);
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $session->set('user-roles', implode(';', $tmp));
     $session->set('user-admin', 1);
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
 
     return true;
@@ -428,7 +428,7 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
         $globalsUserId,
@@ -445,8 +445,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE i.id_tree <> "" '.
         (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : '').
         'ORDER BY i.id_tree ASC',
@@ -490,18 +490,18 @@ 
     $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems);
     $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders);
     // Folders and Roles numbers
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         $countNewItems = DB::query(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -528,7 +528,7 @@ 
 {
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''),
         ['W', 'ND', 'NE', 'NDNE', 'R'],
         $userRoles,
@@ -595,7 +595,7 @@ 
     ) {
         $persoFld = DB::queryFirstRow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -628,7 +628,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -696,12 +696,12 @@ 
     //Load Tree
     $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -713,18 +713,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryFirstRow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -737,7 +737,7 @@ 
                     // Is this a User id?
                     $user = DB::queryFirstRow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -755,11 +755,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' » ', $folder),
                     'author' => $record['id_user'],
@@ -788,7 +788,7 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -796,12 +796,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -812,7 +812,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -830,10 +830,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $session->get('user-id'),
@@ -863,8 +863,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         WHERE i.id = %i
         AND l.action = %s',
         $ident,
@@ -874,12 +874,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -890,7 +890,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -909,7 +909,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -931,53 +931,53 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)',
+        'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)',
         'OTV', 'TP', 'API'
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -986,12 +986,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1086,7 +1086,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1167,7 +1167,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8');
             }
@@ -1278,7 +1278,7 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     return $safeTable;
 }
 
@@ -1395,7 +1395,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port);
     socket_close($sock);
 }
@@ -1442,14 +1442,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1524,7 +1524,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryFirstRow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1532,11 +1532,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.(is_null($login) === true ? '' : addslashes((string) $login)).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1567,8 +1567,8 @@ 
     // send email to user that what to be notified
     $notification = DB::queryFirstField(
         'SELECT email
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -1579,7 +1579,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1616,15 +1616,15 @@ 
     $path = '';
     foreach ($arbo as $elem) {
         if (empty($path) === true) {
-            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
         } else {
-            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
         }
     }
 
     // Build text to show user
     if (empty($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -1680,7 +1680,7 @@ 
 {
     // Perform a copy if the file exists
     if (file_exists($configFilePath)) {
-        $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time());
+        $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time());
         if (!copy($configFilePath, $backupFilePath)) {
             return "ERROR: Could not copy file '$configFilePath'";
         }
@@ -1688,10 +1688,10 @@ 
 
     // Regenerate the config file
     $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin');
+    $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin');
     foreach ($rows as $record) {
         $value = getEncryptedValue($record['valeur'], $record['is_encrypted']);
-        $data[] = "    '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n";
+        $data[] = "    '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n";
     }
     $data[] = ");\n";
     $data = array_unique($data);
@@ -1736,7 +1736,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -1746,7 +1746,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -1778,7 +1778,7 @@ 
     $source_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -1789,7 +1789,7 @@ 
     $target_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -1884,10 +1884,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -1919,10 +1919,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -2008,7 +2008,7 @@ 
 ) {
     // Check if the path exists
     $path = basename($path);
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2061,7 +2061,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2124,7 +2124,7 @@ 
         }
         $host .= substr(explode(".", $email[1])[0], -1, 1);
     }
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
     return $email;
 }
 
@@ -2155,11 +2155,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2326,7 +2326,7 @@ 
  */
 function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string
 {
-    return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret);
+    return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret);
 }
 
 /**
@@ -2401,7 +2401,7 @@ 
                 'security_alert',
                 'key_integrity_check_failed',
                 (string) $userInfo['id'],
-                'User: ' . $userInfo['login']
+                'User: '.$userInfo['login']
             );
             return [
                 'success' => false,
@@ -2448,7 +2448,7 @@ 
             'user_connection',
             'auto_reencryption_success',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login']
+            'User: '.$userInfo['login']
         );
 
         // Store in session for immediate use
@@ -2467,12 +2467,12 @@ 
             'security_alert',
             'auto_reencryption_failed',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage()
+            'User: '.$userInfo['login'].' - Error: '.$e->getMessage()
         );
 
         return [
             'success' => false,
-            'error' => 'decryption_failed: ' . $e->getMessage(),
+            'error' => 'decryption_failed: '.$e->getMessage(),
             'private_key_clear' => '',
         ];
     }
@@ -2539,7 +2539,7 @@ 
         'security_alert',
         'auto_reencryption_critical_failure',
         (string) $userId,
-        'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure'
+        'User: '.$userInfo['login'].' - disabled due to key recovery failure'
     );
 
     return false;
@@ -2697,7 +2697,7 @@ 
     $cipher->enableContinuousBuffer();
 
     // Encrypt the file content
-    $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL);
+    $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL);
     $fileContent = file_get_contents($filePath);
     $plaintext = $fileContent;
     $ciphertext = $cipher->encrypt($plaintext);
@@ -2705,9 +2705,9 @@ 
     // Save new file
     // deepcode ignore InsecureHash: is simply used to get a unique name
     $hash = uniqid('', true);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2723,9 +2723,9 @@ 
  *
  * @return string|array
  */
-function decryptFile(string $fileName, string $filePath, string $key): string|array
+function decryptFile(string $fileName, string $filePath, string $key): string | array
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
     
@@ -2742,7 +2742,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
     if ($safeFilePath !== false && file_exists($safeFilePath)) {
         $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
     } else {
@@ -2839,7 +2839,7 @@ 
         // Get public keys for all target users
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id IN %li
             AND public_key != ""',
             $userIds
@@ -2878,7 +2878,7 @@ 
         }
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id NOT IN %li
             AND public_key != ""',
             $user_ids
@@ -2887,7 +2887,7 @@ 
             // Insert in DB the new object key for this item by user
             if (count($objectKeyArray) === 0) {
                 if (WIP === true) {
-                    error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']);
+                    error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']);
                 }
                 
                 insertOrUpdateSharekey(
@@ -2899,7 +2899,7 @@ 
             } else {
                 foreach ($objectKeyArray as $object) {
                     if (WIP === true) {
-                        error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']);
+                        error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']);
                     }
                     
                     insertOrUpdateSharekey(
@@ -2932,7 +2932,7 @@ 
 ): bool {
     try {
         DB::query(
-            'INSERT INTO ' . $tableName . ' 
+            'INSERT INTO '.$tableName.' 
             (object_id, user_id, share_key) 
             VALUES (%i, %i, %s)
             ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)',
@@ -2942,7 +2942,7 @@ 
         );
         return true;
     } catch (Exception $e) {
-        error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage());
+        error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage());
         return false;
     }
 }
@@ -2957,7 +2957,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -3031,7 +3031,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         }
         // deepcode ignore ServerLeak: No important data is sent
         echo 'An error occurred.';
@@ -3048,7 +3048,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         }
         // deepcode ignore ServerLeak: No important data is sent
         echo 'An error occurred.';
@@ -3084,7 +3084,7 @@ 
     // expect if personal item
     DB::delete(
         prefixTable('sharekeys_items'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
         $userId
     );
     // Remove all item sharekeys files
@@ -3108,7 +3108,7 @@ 
     // Remove all item sharekeys suggestions
     DB::delete(
         prefixTable('sharekeys_suggestions'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
         $userId
     );
     return false;
@@ -3129,7 +3129,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -3149,7 +3149,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**
@@ -3248,8 +3248,7 @@ 
 {
     if (isset($array[$key]) === true
         && (is_int($value) === true ?
-            (int) $array[$key] === $value :
-            (string) $array[$key] === $value)
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
     ) {
         return true;
     }
@@ -3271,8 +3270,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3323,7 +3321,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3345,7 +3343,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3365,7 +3363,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3379,7 +3377,7 @@ 
  * @param string|int|null $value
  * @return boolean
  */
-function isValueSetNullEmpty(string|int|null $value) : bool
+function isValueSetNullEmpty(string | int | null $value) : bool
 {
     if (is_null($value) === true || empty($value) === true) {
         return true;
@@ -3434,7 +3432,7 @@ 
  * @param array     $filters
  * @return array|string
  */
-function dataSanitizer(array $data, array $filters): array|string
+function dataSanitizer(array $data, array $filters): array | string
 {
     // Load Sanitizer library
     $sanitizer = new Sanitizer($data, $filters);
@@ -3463,7 +3461,7 @@ 
     // Exists ?
     $userCacheId = DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3514,7 +3512,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3544,7 +3542,7 @@ 
 
     // Get last folder update
     $lastFolderChange = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . '
+        'SELECT valeur FROM '.prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'timestamp',
         'last_folder_change'
@@ -3565,7 +3563,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryFirstRow(
         'SELECT '.$fieldName.'
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $session->get('user-id')
     );
@@ -3603,7 +3601,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3620,8 +3618,8 @@ 
         $rows_tmp = DB::query(
             'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
             f.id_category AS category_id
-            FROM ' . prefixTable('categories_folders') . ' AS f
-            INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+            FROM ' . prefixTable('categories_folders').' AS f
+            INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
             WHERE id_folder=%i',
             $folder
         );
@@ -3647,7 +3645,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3664,14 +3662,14 @@ 
         $valTemp = '';
         $rows_tmp = DB::query(
             'SELECT t.title
-            FROM ' . prefixTable('roles_values') . ' as v
-            INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+            FROM ' . prefixTable('roles_values').' as v
+            INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
             WHERE v.folder_id = %i
             GROUP BY title',
             $folder
         );
         foreach ($rows_tmp as $record) {
-            $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+            $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
         }
         $arr_data['visibilityRoles'] = $valTemp;
 
@@ -3704,7 +3702,7 @@ 
         // loop on users and check if user has this role
         $rows = DB::query(
             'SELECT id, fonction_id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""',
             $session->get('user-id')
         );
@@ -3736,7 +3734,7 @@ 
 
     $val = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3752,12 +3750,12 @@ 
 function upgradeRequired(): bool
 {
     // Get settings.php
-    include_once __DIR__. '/../includes/config/settings.php';
+    include_once __DIR__.'/../includes/config/settings.php';
 
     // Get timestamp in DB
     $val = DB::queryFirstRow(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'admin',
         'upgrade_timestamp'
@@ -3810,7 +3808,7 @@ 
     // prepapre background tasks for item keys generation        
     $userTP = DB::queryFirstRow(
         'SELECT pw, public_key, private_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         TP_USER_ID
     );
@@ -3871,7 +3869,7 @@ 
     }
 
     // Generate new keys
-    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){
+    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) {
         $userKeys = [
             'public_key' => $recovery_public_key,
             'private_key_clear' => $recovery_private_key,
@@ -3922,8 +3920,8 @@ 
             'process_type' => 'create_user_keys',
             'arguments' => json_encode([
                 'new_user_id' => (int) $userId,
-                'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
+                'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'],
                 'owner_id' => (int) TP_USER_ID,
                 'creator_pwd' => $userTP['pw'],
                 'send_email' => $sendEmailToUser === true ? 1 : 0,
@@ -3995,19 +3993,19 @@ 
 
     // Prepare the subtask queries
     $queries = [
-        'step20' => 'SELECT * FROM ' . prefixTable('items'),
+        'step20' => 'SELECT * FROM '.prefixTable('items'),
 
-        'step30' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'step30' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'step40' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'step50' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'step50' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'step60' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks
@@ -4197,7 +4195,7 @@ 
  */
 function createTaskForItem(
     string $processType,
-    string|array $taskName,
+    string | array $taskName,
     int $itemId,
     int $userId,
     string $objectKey,
@@ -4221,7 +4219,7 @@ 
                 'object_key' => $objectKey,
                 'author' => (int) $userId,
             ]),
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
         )
     );
     $processId = DB::insertId();
@@ -4231,7 +4229,7 @@ 
     if (is_array($taskName) === false) {
         $taskName = [$taskName];
     }
-    foreach($taskName as $task) {
+    foreach ($taskName as $task) {
         if (WIP === true) error_log('createTaskForItem - task: '.$task);
         switch ($task) {
             case 'item_password':
@@ -4328,7 +4326,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0)
+function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0)
 {
     if ($allUsers === true) {
         // Load class DB
@@ -4338,7 +4336,7 @@ 
 
         $users = DB::query(
             'SELECT id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
             ORDER BY login ASC'
         );
@@ -4356,7 +4354,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeysForUser(int $user_id=0)
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
 {
     if ($user_id === 0) {
         return;
@@ -4367,8 +4365,8 @@ 
 
     $personalItems = DB::queryFirstColumn(
         'SELECT id
-        FROM ' . prefixTable('items') . ' AS i
-        INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id
+        FROM ' . prefixTable('items').' AS i
+        INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')',
         $user_id
     );
@@ -4378,28 +4376,28 @@ 
             prefixTable('sharekeys_items'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Files keys
         DB::delete(
             prefixTable('sharekeys_files'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Fields keys
         DB::delete(
             prefixTable('sharekeys_fields'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Logs keys
         DB::delete(
             prefixTable('sharekeys_logs'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
     }
 }
@@ -4417,7 +4415,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT login
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4426,7 +4424,7 @@ 
         $now = (int) time();
         // Prepare file content
         $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n".
-            "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n".
+            "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n".
             "RECOVERY KEYS - Not to be shared - To be store safely\n\n".
             "Public Key:\n".$session->get('user-public_key')."\n\n".
             "Private Key:\n".$session->get('user-private_key')."\n\n";
@@ -4449,7 +4447,7 @@ 
         return prepareExchangedData(
             array(
                 'error' => false,
-                'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now),
+                'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now),
                 'timestamp' => $now,
                 'content' => base64_encode($export_value),
                 'login' => $userInfo['login'],
@@ -4475,8 +4473,8 @@ 
  */
 function loadClasses(string $className = ''): void
 {
-    require_once __DIR__. '/../includes/config/include.php';
-    require_once __DIR__. '/../includes/config/settings.php';
+    require_once __DIR__.'/../includes/config/include.php';
+    require_once __DIR__.'/../includes/config/settings.php';
     require_once __DIR__.'/../vendor/autoload.php';
 
     if (defined('DB_PASSWD_CLEAR') === false) {
@@ -4689,7 +4687,7 @@ 
 
     // Get current user hash
     $userHash = DB::queryFirstRow(
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
         $session->get('user-id')
     )['pw'];
 
@@ -4737,11 +4735,11 @@ 
         }
         
         // Alternative: serialize ou json selon le contexte
-        return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : '');
+        return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : '');
     }
     
     if (is_resource($value)) {
-        return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value);
+        return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value);
     }
     
     // Cas par défaut
@@ -4761,7 +4759,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4772,8 +4770,8 @@ 
     // Get file info
     $file = DB::queryFirstRow(
         'SELECT f.id_item, i.id_tree
-        FROM ' . prefixTable('files') . ' as f
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
+        FROM ' . prefixTable('files').' as f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
         WHERE f.id = %i',
         $fileId
     );
@@ -4782,7 +4780,7 @@ 
     }
 
     // Check if user has access to the item
-    include_once __DIR__. '/items.queries.php';
+    include_once __DIR__.'/items.queries.php';
     $itemAccess = getCurrentAccessRights(
         (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT),
         (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT),
@@ -4815,7 +4813,7 @@ 
     // Refuse access if user does not exist and/or is not admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4826,7 +4824,7 @@ 
     // Ensure that user has performed the backup
     DB::queryFirstRow(
         'SELECT f.id
-        FROM ' . prefixTable('log_system') . ' as f
+        FROM ' . prefixTable('log_system').' as f
         WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s',
         'admin_action',
         'dataBase backup',
@@ -4853,7 +4851,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4864,7 +4862,7 @@ 
     // Get item info
     $item = DB::queryFirstRow(
         'SELECT i.perso, i.id_tree
-        FROM ' . prefixTable('items') . ' as i
+        FROM ' . prefixTable('items').' as i
         WHERE i.id = %i',
         $itemId
     );
@@ -4875,7 +4873,7 @@ 
     // Get item owner
     $itemOwner = DB::queryFirstRow(
         'SELECT li.id_user
-        FROM ' . prefixTable('log_items') . ' as li
+        FROM ' . prefixTable('log_items').' as li
         WHERE li.id_item = %i AND li.action = %s',
         $itemId,
         'at_creation'
@@ -4889,25 +4887,25 @@ 
         prefixTable('sharekeys_items'),
         'object_id = %i AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_files'),
         'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_fields'),
         'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_logs'),
         'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     return true;
@@ -4979,7 +4977,7 @@ 
     
     // 2. Check if user actually has personal items to migrate
     $personalFolderId = DB::queryFirstField(
-        "SELECT id FROM ".prefixTable('nested_tree') ."
+        "SELECT id FROM ".prefixTable('nested_tree')."
          WHERE personal_folder = 1 
          AND title = %s",
         $userId
@@ -5059,8 +5057,8 @@ 
             'process_type' => 'migrate_user_personal_items',
             'arguments' => json_encode([
                 'user_id' => (int) $userId,
-                'user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'],
+                'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'],
                 'personal_folders_ids' => $personalFolderIds,
             ]),
             'is_in_progress' => 0,
@@ -5089,19 +5087,19 @@ 
 {
     // Prepare the subtask queries
     $queries = [
-        'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'),
+        'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'),
 
-        'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks

Braces +18 added lines, -9 removed lines

@@ -2604,7 +2604,9 @@ 
 function encryptUserObjectKey(string $key, string $publicKey): string
 {
     // Empty password
-    if (empty($key)) return '';
+    if (empty($key)) {
+        return '';
+    }
 
     // Sanitize
     $antiXss = new AntiXSS();
@@ -2753,7 +2755,9 @@ 
         ];
     }
 
-    if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
+    if (WIP) {
+        error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
+    }
 
     // Decrypt file content and return
     return base64_encode($cipher->decrypt($ciphertext));
@@ -4232,7 +4236,9 @@ 
         $taskName = [$taskName];
     }
     foreach($taskName as $task) {
-        if (WIP === true) error_log('createTaskForItem - task: '.$task);
+        if (WIP === true) {
+            error_log('createTaskForItem - task: '.$task);
+        }
         switch ($task) {
             case 'item_password':
                 
@@ -4665,19 +4671,22 @@ 
 
             // Organisation name (removed username@ and .tld)
             $domain = explode('.', $emailParts[1]);
-            if (count($domain) > 1)
-                $forbiddenWords[] = $domain[0];
+            if (count($domain) > 1) {
+                            $forbiddenWords[] = $domain[0];
+            }
         }
     }
 
     // Search forbidden words in password
     foreach ($forbiddenWords as $word) {
-        if (empty($word))
-            continue;
+        if (empty($word)) {
+                    continue;
+        }
 
         // Stop if forbidden word found in password
-        if (stripos($password, $word) !== false)
-            return false;
+        if (stripos($password, $word) !== false) {
+                    return false;
+        }
     }
 
     // Get password complexity

pages/backups.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('backups') === 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;
 }
 
@@ -178,7 +178,7 @@ 
                                             </div>
                                             <div class="alert alert-info ml-2 mt-3 mr-2 hidden" id="onthefly-restore-progress">
                                                 <h5><i class="icon fa fa-info mr-2"></i><?php echo $lang->get('in_progress'); ?></h5>
-                                                <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b><span id="onthefly-restore-progress-text">0</span>%</b>
+                                                <i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b><span id="onthefly-restore-progress-text">0</span>%</b>
                                             </div>
                                             <div class="row mt-3 hidden" id="onthefly-restore-finished"></div>
                                             <div class="row mt-3">