nilsteampassnet / TeamPass

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
 {

Braces +12 added lines, -4 removed lines

@@ -2621,7 +2621,9 @@ 
     $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
     $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
 
-    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));
@@ -2749,7 +2751,9 @@ 
         foreach ($users as $user) {
             // 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'] . ' - ' . $objectKey);
+                if (WIP === true) {
+                    error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey);
+                }
                 DB::insert(
                     $object_name,
                     [
@@ -2763,7 +2767,9 @@ 
                 );
             } else {
                 foreach ($objectKeyArray as $object) {
-                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
+                    if (WIP === true) {
+                        error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
+                    }
                     DB::insert(
                         $object_name,
                         [
@@ -3608,7 +3614,9 @@ 
     );
     
     // if not exists then error
-    if (is_null($val) === true || count($val) === 0 || defined('UPGRADE_MIN_DATE') === false) return true;
+    if (is_null($val) === true || count($val) === 0 || defined('UPGRADE_MIN_DATE') === false) {
+        return true;
+    }
 
     // if empty or too old then error
     if (empty($val['valeur']) === true || (int) $val['valeur'] < (int) UPGRADE_MIN_DATE) {

Spacing +147 added lines, -150 removed lines

@@ -226,7 +226,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -274,8 +274,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);
 }
 
@@ -355,7 +355,7 @@ 
     $globalsVisibleFolders = $session->get('user-accessible_folders');
     $globalsPersonalVisibleFolders = $session->get('user-personal_visible_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']);
     }
@@ -374,7 +374,7 @@ 
     }
     // Get ID of personal folder
     $persfld = DB::queryfirstrow(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE title = %s',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE title = %s',
         $globalsUserId
     );
     if (empty($persfld['id']) === false) {
@@ -394,20 +394,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;
@@ -490,7 +490,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,
@@ -507,8 +507,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',
@@ -562,16 +562,16 @@ 
         ), SORT_NUMERIC)
     );
     // Folders and Roles numbers
-    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'));
     $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
@@ -598,7 +598,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,
@@ -665,7 +665,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,
@@ -698,7 +698,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -766,12 +766,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',
@@ -783,18 +783,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']
             );
@@ -807,7 +807,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -825,11 +825,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'],
@@ -858,7 +858,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
     );
@@ -866,12 +866,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 = [];
@@ -882,7 +882,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -900,10 +900,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'),
@@ -933,8 +933,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,
@@ -944,12 +944,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 = [];
@@ -960,7 +960,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -979,7 +979,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => isset($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',
@@ -1001,53 +1001,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);
@@ -1056,12 +1056,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;
         }
     }
@@ -1156,7 +1156,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>';
@@ -1237,7 +1237,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');
             }
@@ -1342,7 +1342,7 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     if (empty($safeTable) === false) {
         // sanitize string
         return $safeTable;
@@ -1464,7 +1464,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);
 }
@@ -1511,14 +1511,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'
@@ -1593,7 +1593,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
             );
@@ -1601,11 +1601,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'
@@ -1637,8 +1637,8 @@ 
     $notification = DB::queryOneColumn(
         'email',
         'SELECT *
-        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
@@ -1649,7 +1649,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1686,15 +1686,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;
 }
@@ -1750,7 +1750,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'";
         }
@@ -1758,10 +1758,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);
@@ -1806,7 +1806,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;
@@ -1816,7 +1816,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',
@@ -1848,7 +1848,7 @@ 
     $source_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -1859,7 +1859,7 @@ 
     $target_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -2078,7 +2078,7 @@ 
 ) {
     // Check if the path exists
     $path = basename($path);
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2131,7 +2131,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2194,7 +2194,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;
 }
 
@@ -2217,7 +2217,7 @@ 
     
     // Insert log in DB
     return DB::query(
-        'SELECT ' . $fields . '
+        'SELECT '.$fields.'
         FROM ' . prefixTable($table)
     );
 }
@@ -2232,11 +2232,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) {
@@ -2479,7 +2479,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);
@@ -2487,9 +2487,9 @@ 
     // Save new file
     // deepcode ignore InsecureHash: is simply used to get a unique name
     $hash = md5($plaintext);
-    $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),
@@ -2507,7 +2507,7 @@ 
  */
 function decryptFile(string $fileName, string $filePath, string $key): string
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
     
@@ -2524,7 +2524,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
     $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
 
     if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
@@ -2610,8 +2610,8 @@ 
         // Only create the sharekey for a user
         $user = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
-            WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . '
+            FROM ' . prefixTable('users').'
+            WHERE id = ' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).'
             AND public_key != ""'
         );
 
@@ -2648,17 +2648,16 @@ 
         //DB::debugmode(true);
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE ' . ($onlyForUser === true ? 
-                'id IN ("' . TP_USER_ID . '","' . ($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId) . '") ' : 
-                'id NOT IN ("' . OTV_USER_ID . '","' . SSH_USER_ID . '","' . API_USER_ID . '"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ') . '
+                'id IN ("'.TP_USER_ID.'","'.($apiUserId === -1 ? (int) $session->get('user-id') : $apiUserId).'") ' : 'id NOT IN ("'.OTV_USER_ID.'","'.SSH_USER_ID.'","'.API_USER_ID.'"'.($all_users_except_id === -1 ? '' : ', "'.$all_users_except_id.'"').') ').'
             AND public_key != ""'
         );
         //DB::debugmode(false);
         foreach ($users as $user) {
             // 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'] . ' - ' . $objectKey);
+                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id'].' - '.$objectKey);
                 DB::insert(
                     $object_name,
                     [
@@ -2672,7 +2671,7 @@ 
                 );
             } else {
                 foreach ($objectKeyArray as $object) {
-                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
+                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id'].' - '.$object['objectKey']);
                     DB::insert(
                         $object_name,
                         [
@@ -2700,7 +2699,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -2774,7 +2773,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         } else {
             error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage());
         }
@@ -2793,7 +2792,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         } else {
             error_log('TEAMPASS Error - LDAP - Code: '.$e->getCode().' - Message: '.$e->getMessage());
         }
@@ -2822,7 +2821,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
@@ -2830,8 +2829,8 @@ 
         prefixTable('sharekeys_files'),
         'user_id = %i AND object_id NOT IN (
             SELECT f.id 
-            FROM ' . prefixTable('items') . ' AS i 
-            INNER JOIN ' . prefixTable('files') . ' AS f ON f.id_item = i.id
+            FROM ' . prefixTable('items').' AS i 
+            INNER JOIN ' . prefixTable('files').' AS f ON f.id_item = i.id
             WHERE i.perso = 1
         )',
         $userId
@@ -2841,8 +2840,8 @@ 
         prefixTable('sharekeys_fields'),
         'user_id = %i AND object_id NOT IN (
             SELECT c.id 
-            FROM ' . prefixTable('items') . ' AS i 
-            INNER JOIN ' . prefixTable('categories_items') . ' AS c ON c.item_id = i.id
+            FROM ' . prefixTable('items').' AS i 
+            INNER JOIN ' . prefixTable('categories_items').' AS c ON c.item_id = i.id
             WHERE i.perso = 1
         )',
         $userId
@@ -2850,13 +2849,13 @@ 
     // Remove all item sharekeys logs
     DB::delete(
         prefixTable('sharekeys_logs'),
-        '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 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;
@@ -2877,7 +2876,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);
@@ -2897,7 +2896,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) : '');
 }
 
 /**
@@ -2997,8 +2996,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;
     }
@@ -3020,8 +3018,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3072,7 +3069,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3094,7 +3091,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3114,7 +3111,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3183,7 +3180,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);
@@ -3212,7 +3209,7 @@ 
     // Exists ?
     $userCacheId = DB::queryfirstrow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3263,7 +3260,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3293,7 +3290,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'
@@ -3324,7 +3321,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')
     );
@@ -3367,7 +3364,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3384,8 +3381,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
         );
@@ -3411,7 +3408,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3428,14 +3425,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;
 
@@ -3468,7 +3465,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')
         );
@@ -3500,7 +3497,7 @@ 
 
     $val = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3516,12 +3513,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'
@@ -3576,7 +3573,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
     );
@@ -3636,7 +3633,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,
@@ -3676,8 +3673,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,
@@ -3967,7 +3964,7 @@ 
  */
 function createTaskForItem(
     string $processType,
-    string|array $taskName,
+    string | array $taskName,
     int $itemId,
     int $userId,
     string $objectKey,
@@ -3991,7 +3988,7 @@ 
                 'object_key' => $objectKey,
                 'author' => (int) $userId,
             ]),
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
         )
     );
     $processId = DB::insertId();
@@ -4001,7 +3998,7 @@ 
     if (!is_array($taskName)) {
         $taskName = [$taskName];
     }
-    foreach($taskName as $task) {
+    foreach ($taskName as $task) {
         error_log('createTaskForItem - task: '.$task);
         switch ($task) {
             case 'item_password':
@@ -4098,7 +4095,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
@@ -4108,7 +4105,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'
         );
@@ -4126,7 +4123,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeysForUser(int $user_id=0)
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
 {
     if ($user_id === 0) {
         return;
@@ -4137,8 +4134,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
     );
@@ -4187,7 +4184,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT pw, public_key, private_key, login, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4196,7 +4193,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".$userInfo['public_key']."\n\n".
             "Private Key:\n".decryptPrivateKey($session->get('user-password'), $userInfo['private_key'])."\n\n";
@@ -4219,7 +4216,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'],
@@ -4245,8 +4242,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) {
@@ -4409,10 +4406,10 @@ 
     }
 
     // Nettoyage des IDs pour éviter les injections SQL
-    $ids = array_map('intval', $ids);  // Assure que chaque ID est un entier
+    $ids = array_map('intval', $ids); // Assure que chaque ID est un entier
 
     // Construction de la requête SQL pour vérifier les IDs dans la table
-    $result = DB::query('SELECT id FROM ' . prefixTable($tableName) . ' WHERE ' . $fieldName . ' IN %li', $ids);
+    $result = DB::query('SELECT id FROM '.prefixTable($tableName).' WHERE '.$fieldName.' IN %li', $ids);
 
     // Extraire les IDs existants de la table
     $existingIds = array_column($result, 'id');

sources/core.php

Spacing +23 added lines, -23 removed lines

@@ -54,16 +54,16 @@ 
 {
     // Load AntiXSS
     $antiXss = new AntiXSS();
-    if (! headers_sent()) {    //If headers not sent yet... then do php redirect
-        header('Location: ' . $antiXss->xss_clean($url));
+    if (!headers_sent()) {    //If headers not sent yet... then do php redirect
+        header('Location: '.$antiXss->xss_clean($url));
     }
 
     //If headers are sent... do java redirect... if java disabled, do html redirect.
     echo '<script type="text/javascript">';
-    echo 'window.location.href="' . $antiXss->xss_clean($url) . '";';
+    echo 'window.location.href="'.$antiXss->xss_clean($url).'";';
     echo '</script>';
     echo '<noscript>';
-    echo '<meta http-equiv="refresh" content="0;url=' . $antiXss->xss_clean($url) . '" />';
+    echo '<meta http-equiv="refresh" content="0;url='.$antiXss->xss_clean($url).'" />';
     echo '</noscript>';
 }
 
@@ -89,7 +89,7 @@ 
     && isset($SETTINGS['enable_sts']) === true
     && (int) $SETTINGS['enable_sts'] === 1
 ) {
-    teampassRedirect('https://' . $server['http_host'] . $server['request_uri']);
+    teampassRedirect('https://'.$server['http_host'].$server['request_uri']);
 }
 
 // Load pwComplexity
@@ -110,11 +110,11 @@ 
 // LOAD CPASSMAN SETTINGS
 if (
     isset($SETTINGS['cpassman_dir']) === true
-    && is_dir($SETTINGS['cpassman_dir'] . '/install') === true
+    && is_dir($SETTINGS['cpassman_dir'].'/install') === true
 ) {
     // Should we delete folder INSTALL?
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s AND intitule=%s',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s AND intitule=%s',
         'install',
         'clear_install_folder'
     );
@@ -132,11 +132,11 @@ 
             if ($directories !== false) {
                 $files = array_diff($directories, ['.', '..']);
                 foreach ($files as $file) {
-                    if (is_dir($dir . '/' . $file)) {
-                        delTree($dir . '/' . $file);
+                    if (is_dir($dir.'/'.$file)) {
+                        delTree($dir.'/'.$file);
                     } else {
                         try {
-                            unlink($dir . '/' . $file);
+                            unlink($dir.'/'.$file);
                         } catch (Exception $e) {
                             // do nothing... php will ignore and continue
                         }
@@ -150,13 +150,13 @@ 
             return false;
         }
 
-        if (is_dir($SETTINGS['cpassman_dir'] . '/install')) {
+        if (is_dir($SETTINGS['cpassman_dir'].'/install')) {
             // Set the permissions on the install directory and delete
             // is server Windows or Linux?
             if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-                recursiveChmod($SETTINGS['cpassman_dir'] . '/install', 0755, 0440);
+                recursiveChmod($SETTINGS['cpassman_dir'].'/install', 0755, 0440);
             }
-            delTree($SETTINGS['cpassman_dir'] . '/install');
+            delTree($SETTINGS['cpassman_dir'].'/install');
         }
 
         // Delete temporary install table
@@ -174,10 +174,10 @@ 
 // Load Languages stuff
 if (isset($languagesList) === false) {
     $languagesList = [];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('languages') . ' GROUP BY name, label, code, flag, id ORDER BY name ASC');
+    $rows = DB::query('SELECT * FROM '.prefixTable('languages').' GROUP BY name, label, code, flag, id ORDER BY name ASC');
     foreach ($rows as $record) {
         array_push($languagesList, $record['name']);
-        if ($session->get('user-language') === $record['name'] ) {
+        if ($session->get('user-language') === $record['name']) {
             $session->set('user-language_flag', $record['flag']);
             $session->set('user-language_code', $record['code']);
             //$session->set('user-language_label', $record['label']);
@@ -234,7 +234,7 @@ 
 // CHECK IF SESSION EXISTS AND IF SESSION IS VALID
 if (empty($session->get('user-session_duration')) === false) {
     $dataSession = DB::queryFirstRow(
-        'SELECT key_tempo FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT key_tempo FROM '.prefixTable('users').' WHERE id=%i',
         $session->get('user-id')
     );
 } else {
@@ -289,7 +289,7 @@ 
     && ($session->has('user-admin') && $session->get('user-admin') && null !== $session->get('user-admin') && $session->get('user-admin') === 1)
 ) {
     $row = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type=%s_type AND intitule=%s_intitule',
+        'SELECT valeur FROM '.prefixTable('misc').' WHERE type=%s_type AND intitule=%s_intitule',
         [
             'type' => 'admin',
             'intitule' => 'teampass_version',
@@ -330,7 +330,7 @@ 
 
         syslog(
             LOG_WARNING,
-            'Unlog user: ' . date('Y/m/d H:i:s') . " {$server['remote_addr']} ({$server['http_user_agent']})"
+            'Unlog user: '.date('Y/m/d H:i:s')." {$server['remote_addr']} ({$server['http_user_agent']})"
         );
         // erase session table
         $session->invalidate();
@@ -386,7 +386,7 @@ 
 if ($session->has('user-timezone') && null !== $session->get('user-id') && empty($session->get('user-id')) === false) {
     // query on user
     $data = DB::queryfirstrow(
-        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM ' . prefixTable('users') . ' WHERE id=%i',
+        'SELECT login, admin, gestionnaire, can_manage_all_users, groupes_visibles, groupes_interdits, fonction_id, last_connexion, roles_from_ad_groups FROM '.prefixTable('users').' WHERE id=%i',
         $session->get('user-id')
     );
     //Check if user has been deleted or unlogged
@@ -431,7 +431,7 @@ 
             $data['groupes_visibles'],
             $data['groupes_interdits'],
             $data['admin'],
-            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'] . ';' . $data['roles_from_ad_groups']),
+            is_null($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : (empty($data['roles_from_ad_groups']) === true ? $data['fonction_id'] : $data['fonction_id'].';'.$data['roles_from_ad_groups']),
             $SETTINGS
         );
         if ($session->has('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') && null !== $session->get('user-can_create_root_folder') && (int) $session->get('user-can_create_root_folder') === 1) {
@@ -466,7 +466,7 @@ 
     $session->set('system-item_fields', []);
     $rows = DB::query(
         'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE level=%i',
         '0'
     );
@@ -475,7 +475,7 @@ 
         // get each field
         $rows2 = DB::query(
             'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE parent_id=%i
             ORDER BY `order` ASC',
             $record['id']
@@ -562,5 +562,5 @@ 
 }
 
 /* CHECK NUMBER OF USER ONLINE */
-DB::query('SELECT * FROM ' . prefixTable('users') . ' WHERE timestamp>=%i', time() - 600);
+DB::query('SELECT * FROM '.prefixTable('users').' WHERE timestamp>=%i', time() - 600);
 $session->set('system-nb_users_online', DB::count());

sources/expired.datatables.php

Spacing +20 added lines, -20 removed lines

@@ -73,7 +73,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;
 }
 
@@ -98,7 +98,7 @@ 
 // Is a date sent?
 $dateCriteria = $request->query->get('dateCriteria');
 if ($dateCriteria !== null && !empty($dateCriteria)) {
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
+    $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
 }
 //echo $sWhere;
 /* BUILD QUERY */
@@ -107,7 +107,7 @@ 
 $start = $request->query->getInt('start', 0);
 $length = $request->query->getInt('length', -1);
 if ($length !== -1) {
-    $sLimit = ' LIMIT ' . $start . ', ' . $length;
+    $sLimit = ' LIMIT '.$start.', '.$length;
 }
 
 //Ordering
@@ -120,7 +120,7 @@ 
         $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT);
 
         if (array_key_exists($columnIndex, $aColumns)) {
-            $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir'];
+            $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir'];
         }
 
         // Supprimez la virgule finale si elle existe
@@ -144,9 +144,9 @@ 
 
     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."%' ";
     }
 }
 
@@ -157,26 +157,26 @@ 
 
         if ($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."%' ";
         }
     }
 }
 
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
     $sWhere.
     (string) $sOrder
 );
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
-        $sWhere .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
+        $sWhere.
         $sLimit
 );
 $iFilteredTotal = DB::count();
@@ -194,18 +194,18 @@ 
     // start the line
     $sOutput .= '[';
     // Column 1
-    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\"  data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", ';
+    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\"  data-item-tree-id=\"'.$record['id_tree'].'\"></i>", ';
     // Column 2
-    $sOutput .= '"' . $record['label'] . '", ';
+    $sOutput .= '"'.$record['label'].'", ';
     // Column 3
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
     // Column 4
     $path = [];
     $treeDesc = $tree->getPath($record['id_tree'], true);
     foreach ($treeDesc as $t) {
         array_push($path, $t->title);
     }
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
 }
 
 if ($iTotal > 0) {
@@ -218,4 +218,4 @@ 
 }
 
 // finalize output
-echo '{"recordsTotal": ' . (int) $iTotal . ', "recordsFiltered": ' . (int) $iFilteredTotal . ', "data": ' . htmlspecialchars($sOutput);
+echo '{"recordsTotal": '.(int) $iTotal.', "recordsFiltered": '.(int) $iFilteredTotal.', "data": '.htmlspecialchars($sOutput);

pages/tasks.php

Braces +1 added lines, -2 removed lines

@@ -146,8 +146,7 @@
                                             </div>
         <?php
     }
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     error_log('TEAMPASS Error - tasks page - '.$e->getMessage());
     // deepcode ignore ServerLeak: no critical information is provided
     echo "An error occurred.";

Spacing +6 added lines, -6 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === 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;
 }
 
@@ -229,7 +229,7 @@ 
                                             $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="users_personal_folder_task">
@@ -257,7 +257,7 @@ 
                                             $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task">
@@ -279,7 +279,7 @@ 
                                             $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="purge_temporary_files_task">
@@ -323,7 +323,7 @@ 
                                             $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="reload_cache_table_task">
@@ -528,7 +528,7 @@ 
                         <h5><?php echo $lang->get('day_of_month'); ?></h5>              
                         <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;">
                             <?php
-                            for ($i=1; $i<=31; $i++) {
+                            for ($i = 1; $i <= 31; $i++) {
                                 echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>';
                             }
                             ?>

sources/roles.queries.php

Spacing +5 added lines, -5 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;
 }
 
@@ -450,7 +450,7 @@ 
                         );
 
                         // add new role to user
-                        $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id);
+                        $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id);
                         $session->set('user-roles', str_replace(';;', ';', $tmp));
 
                         // store in DB
@@ -722,7 +722,7 @@ 
                         $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS);
                         break;
                     default:
-                        throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                        throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
                 }
             } catch (Exception $e) {
                 error_log('TEAMPASS Error - ldap - '.$e->getMessage());
@@ -740,7 +740,7 @@ 
                 // Handle successful retrieval of groups
                 // exists in Teampass
                 //error_log("Error: " . print_r($groupsData['userGroups'], true));
-                foreach($groupsData['userGroups'] as $key => $group) {
+                foreach ($groupsData['userGroups'] as $key => $group) {
                     $role_detail = DB::queryfirstrow(
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
                         FROM '.prefixTable('ldap_groups_roles').' AS a
@@ -765,7 +765,7 @@ 
             
             // Get all groups in Teampass
             $teampassRoles = array();
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,

sources/backups.queries.php

Braces +3 added lines, -1 removed lines

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

Spacing +26 added lines, -26 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::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         '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) {
                                 // Gestion des valeurs NULL
-                                $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,17 +205,17 @@ 
                     // 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,
                         $SETTINGS,
                         $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
                     );
                 }
 
@@ -235,9 +235,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'
                 );
@@ -292,13 +292,13 @@ 
 
             if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.' | 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
                 );
@@ -317,8 +317,8 @@ 
                     // Decrypt the file
                     $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,
                         $SETTINGS,
                         $post_key
                     );
@@ -335,10 +335,10 @@ 
                     }
 
                     // 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 {
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
                 }
             } else {
                 $post_backupFile = $post_clearFilename;

pages/backups.js.php

Spacing +6 added lines, -6 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
@@ -271,7 +271,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
@@ -291,7 +291,7 @@ 
                 function updateProgressBar(offset, totalSize) {
                     // Show progress to user
                     var percentage = Math.round((offset / totalSize) * 100);
-                    //var message = '<i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress');?> <b>' + percentage  + '%</b>';
+                    //var message = '<i class="mr-2 fa-solid fa-rocket fa-beat"></i><?php echo $lang->get('restore_in_progress'); ?> <b>' + percentage  + '%</b>';
                     //console.log(message)
                     $('#onthefly-restore-progress-text').text(percentage);
                 }
@@ -307,7 +307,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/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">

sources/upload.files.php

Spacing +32 added lines, -32 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;
 }
 
@@ -123,7 +123,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
         );
@@ -147,12 +147,12 @@ 
 
 // 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);
 
 if (null !== $post_type_upload && $post_type_upload === 'upload_profile_photo') {
-    $targetDir = realpath($SETTINGS['cpassman_dir'] . '/includes/avatars');
+    $targetDir = realpath($SETTINGS['cpassman_dir'].'/includes/avatars');
 } else {
     $targetDir = realpath($SETTINGS['path_to_files_folder']);
 }
@@ -213,7 +213,7 @@ 
 // Validate file name (for our purposes we'll just remove invalid characters)
 $file_name = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($_FILES['file']['name'])));
 if (strlen($file_name) == 0 || strlen($file_name) > $MAX_FILENAME_LENGTH) {
-    echo handleUploadError('Invalid file name: ' . $file_name . '.');
+    echo handleUploadError('Invalid file name: '.$file_name.'.');
     return false;
 }
 
@@ -228,8 +228,8 @@ 
         $ext,
         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']
         )
     ) === false
     && $post_type_upload !== 'import_items_from_keepass'
@@ -243,7 +243,7 @@ 
 
 // 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;
 }
 
@@ -251,19 +251,19 @@ 
 $fileName = preg_replace('/[^a-zA-Z0-9-_\.]/', '', strtolower(basename($fileName)));
 
 // 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)) {
     $fileNameA = substr($fileName, 0, strlen($ext));
     $fileNameB = substr($fileName, strlen($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)) {
@@ -277,7 +277,7 @@ 
 // Remove old temp files
 if ($cleanupTargetDir && is_dir($targetDir) && ($dir = opendir($targetDir))) {
     while (($file = readdir($dir)) !== false) {
-        $tmpfilePath = $targetDir . DIRECTORY_SEPARATOR . $file;
+        $tmpfilePath = $targetDir.DIRECTORY_SEPARATOR.$file;
 
         // Remove temp file if it is older than the max age and is not the current file
         if (
@@ -291,7 +291,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;
 }
 
@@ -320,18 +320,18 @@ 
                     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);
             fileDelete($_FILES['file']['tmp_name'], $SETTINGS);
         } 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;
         }
     } 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 {
@@ -347,14 +347,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;
     }
 }
@@ -379,7 +379,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -408,7 +408,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB
@@ -441,13 +441,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
     );
 
@@ -458,21 +458,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(
@@ -491,7 +491,7 @@ 
 ) {
     rename(
         $filePath,
-        $targetDir . DIRECTORY_SEPARATOR . $newFileName
+        $targetDir.DIRECTORY_SEPARATOR.$newFileName
     );
 
     // Add in DB