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 +24 added lines, -11 removed lines

@@ -2366,7 +2366,9 @@ 
 function encryptUserObjectKey(string $key, string $publicKey): string
 {
     // Empty password
-    if (empty($key)) return '';
+    if (empty($key)) {
+        return '';
+    }
 
     // Sanitize
     $antiXss = new AntiXSS();
@@ -2515,7 +2517,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));
@@ -2650,7 +2654,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,
                     [
@@ -2664,7 +2670,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,
                         [
@@ -3990,7 +3998,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':
                 
@@ -4421,19 +4431,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

Spacing +152 added lines, -154 removed lines

@@ -134,19 +134,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';
     }
 
@@ -231,7 +231,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -279,8 +279,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);
 }
 
@@ -358,7 +358,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']);
     }
@@ -368,20 +368,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;
@@ -464,7 +464,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,
@@ -481,8 +481,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',
@@ -536,16 +536,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
@@ -572,7 +572,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,
@@ -639,7 +639,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,
@@ -672,7 +672,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -740,12 +740,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',
@@ -757,18 +757,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']
             );
@@ -781,7 +781,7 @@ 
                     // Is this a User id?
                     $user = DB::queryfirstrow(
                         'SELECT id, login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -799,11 +799,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'],
@@ -832,7 +832,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
     );
@@ -840,12 +840,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 = [];
@@ -856,7 +856,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -874,10 +874,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'),
@@ -907,8 +907,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,
@@ -918,12 +918,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 = [];
@@ -934,7 +934,7 @@ 
             // Is this a User id?
             $user = DB::queryfirstrow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -953,7 +953,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',
@@ -975,53 +975,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);
@@ -1030,12 +1030,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;
         }
     }
@@ -1130,7 +1130,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>';
@@ -1211,7 +1211,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');
             }
@@ -1322,7 +1322,7 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     if (empty($safeTable) === false) {
         // sanitize string
         return $safeTable;
@@ -1444,7 +1444,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);
 }
@@ -1491,14 +1491,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'
@@ -1573,7 +1573,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
             );
@@ -1581,11 +1581,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'
@@ -1617,8 +1617,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
@@ -1629,7 +1629,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1666,15 +1666,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;
 }
@@ -1730,7 +1730,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'";
         }
@@ -1738,10 +1738,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);
@@ -1786,7 +1786,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;
@@ -1796,7 +1796,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',
@@ -1828,7 +1828,7 @@ 
     $source_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -1839,7 +1839,7 @@ 
     $target_cf = [];
     $rows = DB::QUERY(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -1934,10 +1934,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';
     }
 
@@ -1970,10 +1970,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';
     }
 
@@ -2059,7 +2059,7 @@ 
 ) {
     // Check if the path exists
     $path = basename($path);
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2112,7 +2112,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2175,7 +2175,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;
 }
 
@@ -2206,11 +2206,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) {
@@ -2459,7 +2459,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);
@@ -2467,9 +2467,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),
@@ -2485,9 +2485,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);
     }
     
@@ -2504,7 +2504,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 {
@@ -2600,7 +2600,7 @@ 
         // Only create the sharekey for a user
         $user = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i
             AND public_key != ""',
             $userId
@@ -2641,7 +2641,7 @@ 
         }
         $users = DB::query(
             'SELECT id, public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id NOT IN %li
             AND public_key != ""',
             $user_ids
@@ -2650,7 +2650,7 @@ 
         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,
                     [
@@ -2664,7 +2664,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,
                         [
@@ -2692,7 +2692,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -2766,7 +2766,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.';
@@ -2783,7 +2783,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.';
@@ -2810,7 +2810,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
@@ -2818,8 +2818,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
@@ -2829,8 +2829,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
@@ -2838,13 +2838,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;
@@ -2865,7 +2865,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);
@@ -2885,7 +2885,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) : '');
 }
 
 /**
@@ -2985,8 +2985,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;
     }
@@ -3008,8 +3007,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3060,7 +3058,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3082,7 +3080,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3102,7 +3100,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3171,7 +3169,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);
@@ -3200,7 +3198,7 @@ 
     // Exists ?
     $userCacheId = DB::queryfirstrow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3251,7 +3249,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3281,7 +3279,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'
@@ -3312,7 +3310,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')
     );
@@ -3355,7 +3353,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3372,8 +3370,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
         );
@@ -3399,7 +3397,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3416,14 +3414,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;
 
@@ -3456,7 +3454,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')
         );
@@ -3488,7 +3486,7 @@ 
 
     $val = DB::queryfirstrow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3504,12 +3502,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'
@@ -3560,7 +3558,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
     );
@@ -3621,7 +3619,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,
@@ -3664,8 +3662,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,
@@ -3955,7 +3953,7 @@ 
  */
 function createTaskForItem(
     string $processType,
-    string|array $taskName,
+    string | array $taskName,
     int $itemId,
     int $userId,
     string $objectKey,
@@ -3979,7 +3977,7 @@ 
                 'object_key' => $objectKey,
                 'author' => (int) $userId,
             ]),
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
         )
     );
     $processId = DB::insertId();
@@ -3989,7 +3987,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':
@@ -4086,7 +4084,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
@@ -4096,7 +4094,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'
         );
@@ -4114,7 +4112,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeysForUser(int $user_id=0)
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
 {
     if ($user_id === 0) {
         return;
@@ -4125,8 +4123,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
     );
@@ -4175,7 +4173,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT login
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4184,7 +4182,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";
@@ -4207,7 +4205,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'],
@@ -4233,8 +4231,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) {
@@ -4445,7 +4443,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'];
 

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/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">

includes/core/otv.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
         filter_input(INPUT_GET, 'code', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
     );
     
-    if (DB::count() > 0  && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) {
+    if (DB::count() > 0 && (int) $data['timestamp'] === (int) filter_input(INPUT_GET, 'stamp', FILTER_VALIDATE_INT)) {
         // otv is too old
         if ($data['time_limit'] < time() || ($data['views'] + 1) > $data['max_views']) {
             $html = '<div class="text-center text-danger">
@@ -190,7 +190,7 @@ 
                 <tr><th>URL:</th><td>'.$url.'</td></tr>
                 </table></div>
                 <p class="mt-3 text-info"><i class="fas fa-info mr-2"></i>Copy carefully the data you need.<br>This page is visible until <b>'.
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views']+1)).' more time(s)</b>.</div>
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $dataItem['time_limit']).'</b> OR <b>'.($dataItem['max_views'] - ($dataItem['views'] + 1)).' more time(s)</b>.</div>
                 </div>';
             // log
             logItems(

pages/users.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === 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;
 }
 
@@ -89,24 +89,24 @@ 
 // If administrator then all roles are shown
 // else only the Roles the users is associated to.
 if ((int) $session->get('user-admin') === 1) {
-    $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>';
+    $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>';
 }
 
 $rows = DB::query(
     'SELECT id, title, creator_id
-    FROM ' . prefixTable('roles_title') . '
+    FROM ' . prefixTable('roles_title').'
     ORDER BY title ASC'
 );
 foreach ($rows as $record) {
     if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) {
-        $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>';
+        $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>';
     }
     if (
         (int) $session->get('user-admin') === 1
         || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1)
             && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id'))
     ) {
-        $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
+        $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
     }
 }
 
@@ -121,7 +121,7 @@ 
         for ($y = 1; $y < $t->nlevel; ++$y) {
             $ident .= '&nbsp;&nbsp;';
         }
-        $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
+        $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
     }
 }
 
@@ -158,7 +158,7 @@ 
                         </button><?php
                                     echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
-                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . '
+                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').'
                         </button>' : '';
                                     ?>
                     </h3>
@@ -166,7 +166,7 @@ 
 
                 <!-- /.card-header -->
                 <div class="card-body form" id="users-list">
-                    <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons');?></span></label>
+                    <label><input type="checkbox" id="warnings_display" class="tp-action pointer" data-action="refresh"><span class="ml-2 pointer"><?php echo $lang->get('display_warning_icons'); ?></span></label>
                     <table id="table-users" class="table table-striped nowrap table-responsive-sm">
                         <thead>
                             <tr>
@@ -231,7 +231,7 @@ 
                                             <?php
                                             foreach (TP_PW_COMPLEXITY as $entry) {
                                                 echo '
-                                            <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                            <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                             }
                                             ?>
                                         </select>

scripts/background_tasks___items_handler_subtask.php

Braces +6 added lines, -2 removed lines

@@ -74,7 +74,9 @@ 
 if ($args['step'] === 'create_users_files_key') {
     // Loop on all files for this item
     // and encrypt them for each user
-    if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+    if (WIP === true) {
+        provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+    }
     foreach($args['files_keys'] as $file) {
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
@@ -91,7 +93,9 @@ 
 } elseif ($args['step'] === 'create_users_fields_key') {
     // Loop on all encrypted fields for this item
     // and encrypt them for each user
-    if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+    if (WIP === true) {
+        provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+    }
     foreach($args['fields_keys'] as $field) {
         storeUsersShareKey(
             prefixTable('sharekeys_fields'),

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
 
 $subtask = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('background_subtasks') . '
+    FROM ' . prefixTable('background_subtasks').'
     WHERE process_id = %i AND finished_at IS NULL
     ORDER BY increment_id ASC',
     (int) $request->request->get('subTask')
@@ -64,7 +64,7 @@ 
 
 list($taskArguments) = DB::queryFirstField(
     'SELECT arguments
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE increment_id = %i',
     $subtask['process_id']
 );
@@ -75,7 +75,7 @@ 
     // Loop on all files for this item
     // and encrypt them for each user
     if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
-    foreach($args['files_keys'] as $file) {
+    foreach ($args['files_keys'] as $file) {
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
             0,
@@ -92,7 +92,7 @@ 
     // Loop on all encrypted fields for this item
     // and encrypt them for each user
     if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
-    foreach($args['fields_keys'] as $field) {
+    foreach ($args['fields_keys'] as $field) {
         storeUsersShareKey(
             prefixTable('sharekeys_fields'),
             0,

sources/downloadFile.php

Braces +3 added lines, -1 removed lines

@@ -149,7 +149,9 @@
     }
     $filePath = realpath($filePath);
 
-    if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - ");
+    if (WIP === true) {
+        error_log('downloadFile.php: filePath: ' . $filePath." - ");
+    }
 
     if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) {
         header('Content-Description: File Transfer');

Spacing +13 added lines, -13 removed lines

@@ -76,7 +76,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -118,19 +118,19 @@ 
 $get_filename = str_replace('"', '\"', $get_filename);
 
 // Use Content-Disposition header with double quotes around filename
-header('Content-Disposition: attachment; filename="' . rawurldecode($get_filename) . '"');
+header('Content-Disposition: attachment; filename="'.rawurldecode($get_filename).'"');
 header('Content-Type: application/octet-stream');
 header('Cache-Control: must-revalidate, no-cache, no-store');
 header('Expires: 0');
 if (null !== $request->query->get('pathIsFiles') && (int) $get_pathIsFiles === 1) {
-    readfile($SETTINGS['path_to_files_folder'] . '/' . basename($get_filename));
+    readfile($SETTINGS['path_to_files_folder'].'/'.basename($get_filename));
 } else {
     // get file key
     $file_info = DB::queryfirstrow(
         'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
         s.share_key AS share_key
-        FROM ' . prefixTable('files') . ' AS f
-        INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
         WHERE s.user_id = %i AND s.object_id = %i',
         $session->get('user-id'),
         $get_fileid
@@ -149,7 +149,7 @@ 
         // if not encrypted
         $file_info = DB::queryfirstrow(
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension
-            FROM ' . prefixTable('files') . ' AS f
+            FROM ' . prefixTable('files').' AS f
             WHERE f.id = %i',
             $get_fileid
         );
@@ -159,25 +159,25 @@ 
     // Set the filename of the download
     $filename = basename($file_info['name'], '.'.$file_info['extension']);
     $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
-    $filename = $filename . '.' . $file_info['extension'];
+    $filename = $filename.'.'.$file_info['extension'];
     // Get the full path to the file to be downloaded
-    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' .TP_FILE_PREFIX . $file_info['file'])) {
-        $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . $file_info['file'];
+    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'])) {
+        $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'];
     } else {
-        $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file_info['file']);
+        $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file_info['file']);
     }
     $filePath = realpath($filePath);
 
-    if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - ");
+    if (WIP === true) error_log('downloadFile.php: filePath: '.$filePath." - ");
 
     if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) {
         header('Content-Description: File Transfer');
         header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename="' . basename($filename) . '"');
+        header('Content-Disposition: attachment; filename="'.basename($filename).'"');
         header('Expires: 0');
         header('Cache-Control: must-revalidate');
         header('Pragma: public');
-        header('Content-Length: ' . filesize($filePath));
+        header('Content-Length: '.filesize($filePath));
         flush(); // Clear system output buffer
         if (empty($fileContent) === true) {
             // deepcode ignore PT: File and path are secured directly inside the function decryptFile()

sources/tasks.queries.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,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;
 }
 
@@ -163,7 +163,7 @@ 
     // get exec from processes table
     $rows = DB::query(
         'SELECT max(finished_at), process_type
-        FROM ' . prefixTable('background_tasks') . '
+        FROM ' . prefixTable('background_tasks').'
         GROUP BY process_type'
     );
     foreach ($rows as $row) {
@@ -179,7 +179,7 @@ 
     // get exec from background_tasks_log table
     $rows = DB::query(
         'SELECT MAX(finished_at) AS max_finished_at, job AS process_type 
-        FROM ' . prefixTable('background_tasks_logs') . '
+        FROM ' . prefixTable('background_tasks_logs').'
         WHERE finished_at >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY))
         GROUP BY process_type'
     );

sources/utilities.queries.php

Spacing +29 added lines, -29 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -130,7 +130,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -152,10 +152,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -177,7 +177,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -235,10 +235,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -265,7 +265,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -281,7 +281,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -370,10 +370,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $exploded = explode(',', $data['valeur']);
@@ -384,7 +384,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -398,7 +398,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -415,7 +415,7 @@ 
                         // Delete all fields
                         $fields = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $folderData[0]
                         );
@@ -435,7 +435,7 @@ 
                         // Delete all files
                         $files = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $folderData[0]
                         );
@@ -492,7 +492,7 @@ 
                 // Delete sharekey fields
                 $itemFields = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $itemId
                 );
@@ -507,7 +507,7 @@ 
                 // Delete sharekey files
                 $itemFiles = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $itemId
                 );
@@ -584,7 +584,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -604,7 +604,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -627,7 +627,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -644,7 +644,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -661,7 +661,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -678,7 +678,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,
@@ -749,19 +749,19 @@ 
             // Get info about task
             $taskInfo = DB::queryfirstrow(
                 'SELECT p.process_type as process_type
-                FROM ' . prefixTable('background_tasks') . ' as p
+                FROM ' . prefixTable('background_tasks').' as p
                 WHERE p.increment_id = %i',
                 $post_id
             );
             if ($taskInfo !== null) {
                 // delete task
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_subtasks') . '
+                    'DELETE FROM '.prefixTable('background_subtasks').'
                     WHERE task_id = %i',
                     $post_id
                 );
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_tasks') . '
+                    'DELETE FROM '.prefixTable('background_tasks').'
                     WHERE increment_id = %i',
                     $post_id
                 );
@@ -828,7 +828,7 @@ 
                         ->setDayOfMonth('*')
                         ->setMonths('*')
                         ->setDayOfWeek('*')
-                        ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                        ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                         ->setComments('Teampass scheduler');
                     
                     $crontabRepository->addJob($crontabJob);