nilsteampassnet / TeamPass

sources/roles.queries.php

Spacing +5 added lines, -5 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;
 }
 
@@ -461,7 +461,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
@@ -649,7 +649,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) {
                 if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -669,7 +669,7 @@ 
             } else {
                 // Handle successful retrieval of groups
                 // exists in Teampass
-                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
@@ -694,7 +694,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/tree.php

Spacing +19 added lines, -19 removed lines

@@ -64,7 +64,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;
 }
 
@@ -125,7 +125,7 @@ 
 );
 
 $lastFolderChange = DB::queryFirstRow(
-    'SELECT valeur FROM ' . prefixTable('misc') . '
+    'SELECT valeur FROM '.prefixTable('misc').'
     WHERE type = %s AND intitule = %s',
     'timestamp',
     'last_folder_change'
@@ -346,7 +346,7 @@ 
         $nbItemsInSubfolders = (int) $node->nb_items_in_subfolders;
         $nbItemsInFolder = (int) $node->nb_items_in_folder;
         $nbSubfolders = (int) $node->nb_subfolders;
-        break;  // Get out as soon as we find a valid node.
+        break; // Get out as soon as we find a valid node.
     }
     
     if ($displayThisNode === true) {
@@ -458,7 +458,7 @@ 
         foreach ($currentNode->children as $child) {
             recursiveTree(
                 (int) $child,
-                $tree->getNode($child),// get node info for this child
+                $tree->getNode($child), // get node info for this child
                 /** @scrutinizer ignore-type */ $tree,
                 $listFoldersLimitedKeys,
                 $listRestrictedFoldersForItemsKeys,
@@ -505,7 +505,7 @@ 
     $lang = new Language($session->get('user-language') ?? 'english');
 
     // prepare json return for current node
-    $parent = $currentNode->parent_id === '0' ? '#' : 'li_' . $currentNode->parent_id;
+    $parent = $currentNode->parent_id === '0' ? '#' : 'li_'.$currentNode->parent_id;
 
     // handle displaying
     if (isKeyExistingAndEqual('show_only_accessible_folders', 1, $SETTINGS) === true) {
@@ -522,17 +522,17 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => 'jstreeopen',
-                    'title' => 'ID [' . $nodeId . '] ' . $nodeData['title'],
+                    'title' => 'ID ['.$nodeId.'] '.$nodeData['title'],
                 ),
                 'a_attr' => array(
-                    'id' => 'fld_' . $nodeId,
+                    'id' => 'fld_'.$nodeId,
                     'class' => $nodeData['folderClass'],
-                    'onclick' => 'ListerItems(' . $nodeId . ', ' . $nodeData['restricted'] . ', 0, 1)',
+                    'onclick' => 'ListerItems('.$nodeId.', '.$nodeData['restricted'].', 0, 1)',
                     'data-title' => htmlspecialchars($currentNode->title),
                 ),
                 'is_pf' => in_array($nodeId, $inputData['personalFolders']) === true ? 1 : 0,
@@ -548,12 +548,12 @@ 
         array_push(
             $ret_json,
             array(
-                'id' => 'li_' . $nodeId,
+                'id' => 'li_'.$nodeId,
                 'parent' => $last_visible_parent === -1 ? $parent : $last_visible_parent,
                 'text' => '<i class="'.$currentNode->fa_icon.' tree-folder mr-2" data-folder="'.$currentNode->fa_icon.'"  data-folder-selected="'.$currentNode->fa_icon_selected.'"></i>'.'<i class="fas fa-times fa-xs text-danger mr-1 ml-1"></i>'.$text.htmlspecialchars($currentNode->title).$nodeData['html'],
                 'li_attr' => array(
                     'class' => '',
-                    'title' => 'ID [' . $nodeId . '] ' . $lang->get('no_access'),
+                    'title' => 'ID ['.$nodeId.'] '.$lang->get('no_access'),
                 ),
             )
         );
@@ -613,7 +613,7 @@ 
         if (in_array($nodeId, $session_read_only_folders) === true) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1 ml-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 1,
                 'folderClass' => 'folder_not_droppable',
@@ -628,7 +628,7 @@ 
         ) {
             return [
                 'html' => '<i class="far fa-eye fa-xs mr-1"></i>'.
-                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+                    ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
                 'title' => $lang->get('read_only_account'),
                 'restricted' => 0,
                 'folderClass' => 'folder',
@@ -639,7 +639,7 @@ 
         }
         
         return [
-            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . $nbItemsInFolder .'/'.$nbItemsInSubfolders .'/'.$nbSubfolders. '</span>'  : ''),
+            'html' => ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.$nbItemsInFolder.'/'.$nbItemsInSubfolders.'/'.$nbSubfolders.'</span>' : ''),
             'title' => '',
             'restricted' => 0,
             'folderClass' => 'folder',
@@ -650,8 +650,8 @@ 
 
     } elseif (in_array($nodeId, $listFoldersLimitedKeys) === true) {
         return [
-            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '') .
-                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_folders_limited[$nodeId]) . '</span>' : ''),
+            'html' => ($session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '').
+                ($tree_counters === 1 ? '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_folders_limited[$nodeId]).'</span>' : ''),
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -662,8 +662,8 @@ 
 
     } elseif (in_array($nodeId, $listRestrictedFoldersForItemsKeys) === true) {
         return [
-            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : '' .
-                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_' . $nodeId . '">' . count($session_list_restricted_folders_for_items[$nodeId]) . '</span>',
+            'html' => $session_user_read_only === true ? '<i class="far fa-eye fa-xs mr-1"></i>' : ''.
+                '<span class="badge badge-pill badge-light ml-2 items_count" id="itcount_'.$nodeId.'">'.count($session_list_restricted_folders_for_items[$nodeId]).'</span>',
             'title' => '',
             'restricted' => 1,
             'folderClass' => 'folder',
@@ -773,7 +773,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryFirstRow(
         'SELECT data
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $userId
     );

sources/core.php

Spacing +23 added lines, -23 removed lines

@@ -58,16 +58,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>';
 }
 
@@ -93,7 +93,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
@@ -114,11 +114,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'
     );
@@ -136,11 +136,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
                         }
@@ -154,13 +154,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
@@ -178,10 +178,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']);
@@ -238,7 +238,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 {
@@ -293,7 +293,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',
@@ -334,7 +334,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();
@@ -388,7 +388,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, auth_type, last_pw_change 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, auth_type, last_pw_change FROM '.prefixTable('users').' WHERE id=%i',
         $session->get('user-id')
     );
     //Check if user has been deleted or unlogged
@@ -435,7 +435,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) {
@@ -470,7 +470,7 @@ 
     $session->set('system-item_fields', []);
     $rows = DB::query(
         'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE level=%i',
         '0'
     );
@@ -479,7 +479,7 @@ 
         // get each field
         $rows2 = DB::query(
             'SELECT *
-            FROM ' . prefixTable('categories') . '
+            FROM ' . prefixTable('categories').'
             WHERE parent_id=%i
             ORDER BY `order` ASC',
             $record['id']
@@ -566,5 +566,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());

scripts/task_maintenance_clean_orphan_objects.php

Spacing +11 added lines, -11 removed lines

@@ -72,37 +72,37 @@
 {
     // Delete all item keys for which no user exist
     DB::query(
-        'DELETE k.* FROM ' . prefixTable('sharekeys_items') . ' k
-        LEFT JOIN ' . prefixTable('users') . ' u ON k.user_id = u.id
+        'DELETE k.* FROM '.prefixTable('sharekeys_items').' k
+        LEFT JOIN ' . prefixTable('users').' u ON k.user_id = u.id
         WHERE u.id IS NULL OR u.deleted_at IS NOT NULL'
     );
 
     // Delete all files keys for which no item exist
     DB::query(
-        'DELETE k.* FROM ' . prefixTable('sharekeys_files') . ' k
-        LEFT JOIN ' . prefixTable('items') . ' i ON k.object_id = i.id
+        'DELETE k.* FROM '.prefixTable('sharekeys_files').' k
+        LEFT JOIN ' . prefixTable('items').' i ON k.object_id = i.id
         WHERE i.id IS NULL'
     );
 
     // Delete all fields keys for which no item exist
     DB::query(
-        'DELETE k.* FROM ' . prefixTable('sharekeys_fields') . ' k
-        LEFT JOIN ' . prefixTable('categories_items') . ' c ON k.object_id = c.id
-        LEFT JOIN ' . prefixTable('items') . ' i ON c.item_id = i.id
+        'DELETE k.* FROM '.prefixTable('sharekeys_fields').' k
+        LEFT JOIN ' . prefixTable('categories_items').' c ON k.object_id = c.id
+        LEFT JOIN ' . prefixTable('items').' i ON c.item_id = i.id
         WHERE c.id IS NULL OR i.id IS NULL'
     );
 
     // Delete all item logs for which no user exist
     DB::query(
-        'DELETE l.* FROM ' . prefixTable('log_items') . ' l
-        LEFT JOIN ' . prefixTable('items') . ' i ON l.id_item = i.id
+        'DELETE l.* FROM '.prefixTable('log_items').' l
+        LEFT JOIN ' . prefixTable('items').' i ON l.id_item = i.id
         WHERE i.id IS NULL'
     );
 
     // Delete all system logs for which no user exist
     DB::query(
-        'DELETE l.* FROM ' . prefixTable('log_system') . ' l
-        LEFT JOIN ' . prefixTable('users') . ' u ON l.qui = u.id
+        'DELETE l.* FROM '.prefixTable('log_system').' l
+        LEFT JOIN ' . prefixTable('users').' u ON l.qui = u.id
         WHERE u.id IS NULL OR u.deleted_at IS NOT NULL'
     );
 

scripts/task_maintenance_purge_old_files.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
 {
     global $SETTINGS;
     // Load expected files
-    require_once __DIR__. '/../sources/main.functions.php';
+    require_once __DIR__.'/../sources/main.functions.php';
     $SETTINGS = $SETTINGS ?? [];
 
     // $SETTINGS is set then read folder
@@ -83,7 +83,7 @@ 
             //delete file FILES
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..' && $f !== '.htaccess') {
-                    $filePath = $SETTINGS['path_to_files_folder'] . '/' . $f;
+                    $filePath = $SETTINGS['path_to_files_folder'].'/'.$f;
                     if (file_exists($filePath) && ((time() - filectime($filePath)) > 604800)) {
                         fileDelete($filePath, $SETTINGS);
                     }
@@ -104,7 +104,7 @@ 
             while (false !== ($f = readdir($dir))) {
                 if ($f !== '.' && $f !== '..') {
                     if (strpos($f, '_delete.') > 0) {
-                        fileDelete($SETTINGS['path_to_upload_folder'] . '/' . $f, $SETTINGS);
+                        fileDelete($SETTINGS['path_to_upload_folder'].'/'.$f, $SETTINGS);
                     }
                 }
             }

sources/users.datatable.php

Spacing +15 added lines, -17 removed lines

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

pages/oauth.js.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === 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;
 }
 ?>
@@ -226,7 +226,7 @@ 
                     if (data[i].selected_role === 1) {
                         selected_role = data[i].id;
                     }
-                    html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of') . ' '; ?>' + data[i].title + '</option>';
+                    html_admin_by += '<option value="' + data[i].id + '"><?php echo $lang->get('managers_of').' '; ?>' + data[i].title + '</option>';
                     html_roles += '<option value="' + data[i].id + '">' + data[i].title + '</option>';
                 }
                 $('#oauth_new_user_is_administrated_by')
@@ -255,7 +255,7 @@ 
             }).fail(function(error) {
                 toastr.remove();
                 toastr.error(
-                    '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + error,
+                    '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + error,
                     '', {
                         closeButton: true,
                         positionClass: 'toast-bottom-right'

sources/items.queries.php

Indentation +1 added lines, -1 removed lines

@@ -1836,7 +1836,7 @@
                     '',
                     'encrypt'
                 );
-           }
+            }
 
             // Check if status or secret or phone number has changed
             if (DB::count() > 0

Braces +12 added lines, -5 removed lines

@@ -1228,7 +1228,9 @@ 
                 );
 
                 // Create a task to create sharekeys for users
-                if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
+                if (WIP=== true) {
+                    error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
+                }
                 $tasksToBePerformed = ['item_password'];
                 $encryptionTaskIsRequested = true;
             } else {
@@ -1553,7 +1555,9 @@ 
 
             // create a task for all fields updated
             if ($encryptionTaskIsRequested === true && (int) $dataItem['perso'] !== 1) {
-                if (WIP === true) error_log('createTaskForItem - '.print_r($tasksToBePerformed, true));
+                if (WIP === true) {
+                    error_log('createTaskForItem - '.print_r($tasksToBePerformed, true));
+                }
                 createTaskForItem(
                     'item_update_create_keys',
                     array_unique($tasksToBePerformed),
@@ -2103,7 +2107,9 @@ 
                 $inputData['itemId']
             );
             foreach ($rows as $record) {
-                if ($record['raison'] === NULL) continue;
+                if ($record['raison'] === NULL) {
+                    continue;
+                }
                 $reason = explode(':', $record['raison']);
                 if (count($reason) > 0) {
                     $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
@@ -4819,8 +4825,9 @@ 
                 $ids = $tree->getDescendants($folder['id'], true, false, true);
 
                 // This folder is owned by user
-                if (in_array($inputData['folderId'], $ids))
-                    $accessLevel = 30;
+                if (in_array($inputData['folderId'], $ids)) {
+                                    $accessLevel = 30;
+                }
             }
         }
 

Spacing +278 added lines, -279 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;
 }
 
@@ -104,7 +104,7 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $session->get('user-language') . '.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$session->get('user-language').'.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 
@@ -366,7 +366,7 @@ 
             // About special settings
             $dataFolderSettings = DB::queryFirstRow(
                 'SELECT bloquer_creation, bloquer_modification, personal_folder
-                FROM ' . prefixTable('nested_tree') . ' 
+                FROM ' . prefixTable('nested_tree').' 
                 WHERE id = %i',
                 $inputData['folderId']
             );
@@ -383,7 +383,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -408,7 +408,7 @@ 
             $itemExists = 0;
             $newID = '';
             $data = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE label = %s AND inactif = %i',
                 $inputData['label'],
                 0
@@ -489,8 +489,8 @@ 
                     (int) $post_folder_is_personal,
                     (int) $newID,
                     $cryptedStuff['objectKey'],
-                    true,   // only for the item creator
-                    false,  // no delete all
+                    true, // only for the item creator
+                    false, // no delete all
                 );
 
                 // update fields
@@ -503,7 +503,7 @@ 
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow(
                                 'SELECT encrypted_data
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -532,8 +532,8 @@ 
                                     (int) $post_folder_is_personal,
                                     (int) $newObjectId,
                                     $cryptedStuff['objectKey'],
-                                    true,   // only for the item creator
-                                    false,  // delete all
+                                    true, // only for the item creator
+                                    false, // delete all
                                 );
 
                                 array_push(
@@ -569,7 +569,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $newID
                     );
@@ -638,11 +638,11 @@ 
                 ) {
                     foreach ($post_restricted_to as $userRest) {
                         if (empty($userRest) === false) {
-                            $dataTmp = DB::queryFirstRow('SELECT login FROM ' . prefixTable('users') . ' WHERE id= %i', $userRest);
+                            $dataTmp = DB::queryFirstRow('SELECT login FROM '.prefixTable('users').' WHERE id= %i', $userRest);
                             if (empty($listOfRestricted)) {
                                 $listOfRestricted = $dataTmp['login'];
                             } else {
-                                $listOfRestricted .= ';' . $dataTmp['login'];
+                                $listOfRestricted .= ';'.$dataTmp['login'];
                             }
                         }
                     }
@@ -658,7 +658,7 @@ 
                             if (empty($userRest) === false) {
                                 $dataTmp = DB::queryFirstRow(
                                     'SELECT login
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userRest
                                 );
@@ -666,7 +666,7 @@ 
                                 if (empty($oldRestrictionList) === true) {
                                     $oldRestrictionList = $dataTmp['login'];
                                 } else {
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -729,7 +729,7 @@ 
                 if (empty($post_uploaded_file_id) === false) {
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %s',
                         $post_uploaded_file_id
                     );
@@ -785,7 +785,7 @@ 
                                     $lang->get('email_subject_item_updated'),
                                     str_replace(
                                         array('#label', '#link'),
-                                            array($path, $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $inputData['folderId'] . '&id=' . $newID . $lang['email_body3']),
+                                            array($path, $SETTINGS['email_server_url'].'/index.php?page=items&group='.$inputData['folderId'].'&id='.$newID.$lang['email_body3']),
                                             $lang->get('new_item_email_body')
                                     ),
                                     $emailAddress,
@@ -889,11 +889,11 @@ 
         // Prepare variables
         $itemInfos = array();
         $inputData['label'] = isset($dataReceived['label']) && is_string($dataReceived['label']) ? filter_var($dataReceived['label'], FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-        $post_url = isset($dataReceived['url'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
+        $post_url = isset($dataReceived['url']) === true ? filter_var(htmlspecialchars_decode($dataReceived['url']), FILTER_SANITIZE_URL) : '';
         $post_password = $original_pw = isset($dataReceived['pw']) && is_string($dataReceived['pw']) ? htmlspecialchars_decode($dataReceived['pw']) : '';
         $post_login = isset($dataReceived['login']) && is_string($dataReceived['login']) ? filter_var(htmlspecialchars_decode($dataReceived['login']), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
-        $post_tags = isset($dataReceived['tags'])=== true ? htmlspecialchars($dataReceived['tags']) : '';
-        $post_email = isset($dataReceived['email'])=== true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
+        $post_tags = isset($dataReceived['tags']) === true ? htmlspecialchars($dataReceived['tags']) : '';
+        $post_email = isset($dataReceived['email']) === true ? filter_var(htmlspecialchars_decode($dataReceived['email']), FILTER_SANITIZE_EMAIL) : '';
         $post_template_id = (int) filter_var($dataReceived['template_id'], FILTER_SANITIZE_NUMBER_INT);
         $inputData['itemId'] = (int) filter_var($dataReceived['id'], FILTER_SANITIZE_NUMBER_INT);
         $post_anyone_can_modify = (int) filter_var($dataReceived['anyone_can_modify'], FILTER_SANITIZE_NUMBER_INT);
@@ -924,8 +924,7 @@ 
         $post_to_be_deleted_after_date = isset($dataReceived['to_be_deleted_after_date']) === true ? filter_var(
                 $dataReceived['to_be_deleted_after_date'],
                 FILTER_SANITIZE_FULL_SPECIAL_CHARS
-            ) :
-            '';
+            ) : '';
         $post_fields = (filter_var_array(
             $dataReceived['fields'],
             FILTER_SANITIZE_FULL_SPECIAL_CHARS
@@ -985,7 +984,7 @@ 
         // About special settings
         $dataFolderSettings = DB::queryFirstRow(
             'SELECT bloquer_creation, bloquer_modification, personal_folder, title
-            FROM ' . prefixTable('nested_tree') . ' 
+            FROM ' . prefixTable('nested_tree').' 
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -1001,7 +1000,7 @@ 
         // Get folder complexity
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $inputData['folderId']
@@ -1046,8 +1045,8 @@ 
         // Get all informations for this item
         $dataItem = DB::queryFirstRow(
             '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)
             WHERE i.id=%i AND l.action = %s',
             $inputData['itemId'],
             'at_creation'
@@ -1089,7 +1088,7 @@ 
         // Does the user has the sharekey for this item?
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %s',
             $inputData['itemId'],
             $session->get('user-id')
@@ -1150,9 +1149,9 @@ 
                 'SELECT i.id as id, i.label as label, i.description as description, i.pw as pw, i.url as url, i.id_tree as id_tree, i.perso as perso, i.login as login, 
                 i.inactif as inactif, i.restricted_to as restricted_to, i.anyone_can_modify as anyone_can_modify, i.email as email, i.notification as notification,
                 u.login as user_login, u.email as user_email
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('log_items') . ' as l ON (i.id=l.id_item)
-                INNER JOIN ' . prefixTable('users') . ' as u ON (u.id=l.id_user)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('log_items').' as l ON (i.id=l.id_item)
+                INNER JOIN ' . prefixTable('users').' as u ON (u.id=l.id_user)
                 WHERE i.id=%i',
                 $inputData['itemId']
             );
@@ -1160,7 +1159,7 @@ 
             // Should we log a password change?
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -1224,12 +1223,12 @@ 
                     (int) $post_folder_is_personal,
                     (int) $inputData['itemId'],
                     $encrypted_password_key,
-                    true,   // only for the item creator
-                    true,   // delete all
+                    true, // only for the item creator
+                    true, // delete all
                 );
 
                 // Create a task to create sharekeys for users
-                if (WIP=== true) error_log('createTaskForItem - new password for this item - '.$post_password ." -- ". $pw);
+                if (WIP === true) error_log('createTaskForItem - new password for this item - '.$post_password." -- ".$pw);
                 $tasksToBePerformed = ['item_password'];
                 $encryptionTaskIsRequested = true;
             } else {
@@ -1240,7 +1239,7 @@ 
             // Get list of tags
             $itemTags = DB::queryFirstColumn(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -1286,7 +1285,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                    'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                 );
             }
 
@@ -1331,8 +1330,8 @@ 
                             'SELECT c.id AS id, c.title AS title, i.data AS data, i.data_iv AS data_iv,
                             i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data,
                             c.masked AS masked, i.id AS field_item_id
-                            FROM ' . prefixTable('categories_items') . ' AS i
-                            INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                            FROM ' . prefixTable('categories_items').' AS i
+                            INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                             WHERE i.field_id = %i AND i.item_id = %i',
                             $field['id'],
                             $inputData['itemId']
@@ -1348,7 +1347,7 @@ 
                             // Perform new query
                             $dataTmpCat = DB::queryFirstRow(
                                 'SELECT id, title, encrypted_data, masked
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -1378,8 +1377,8 @@ 
                                     (int) $post_folder_is_personal,
                                     (int) $newId,
                                     $cryptedStuff['objectKey'],
-                                    true,   // only for the item creator
-                                    true,   // delete all
+                                    true, // only for the item creator
+                                    true, // delete all
                                 );
 
                                 // update value
@@ -1429,7 +1428,7 @@ 
                                 $session->get('user-id'),
                                 'at_modification',
                                 $session->get('user-login'),
-                                'at_field : ' . $dataTmpCat['title'] . ' : ' . $field['value']
+                                'at_field : '.$dataTmpCat['title'].' : '.$field['value']
                             );
                         } else {
                             // Case where the field already exists
@@ -1438,7 +1437,7 @@ 
                                 // Get user sharekey for this field
                                 $userKey = DB::queryFirstRow(
                                     'SELECT share_key
-                                    FROM ' . prefixTable('sharekeys_fields') . '
+                                    FROM ' . prefixTable('sharekeys_fields').'
                                     WHERE user_id = %i AND object_id = %i',
                                     $session->get('user-id'),
                                     $dataTmpCat['field_item_id']
@@ -1477,8 +1476,8 @@ 
                                         (int) $post_folder_is_personal,
                                         (int) $dataTmpCat['field_item_id'],
                                         $cryptedStuff['objectKey'],
-                                        true,   // only for the item creator
-                                        true,   // delete all
+                                        true, // only for the item creator
+                                        true, // delete all
                                     );
 
                                     if ($encryptedFieldIsChanged === false) {
@@ -1520,7 +1519,7 @@ 
                                     $session->get('user-id'),
                                     'at_modification',
                                     $session->get('user-login'),
-                                    'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                    'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                 );
                             }
                         }
@@ -1574,7 +1573,7 @@ 
             ) {
                 DB::queryFirstRow(
                     'SELECT *
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1617,7 +1616,7 @@ 
                 // check if elem exists in Table. If not add it or update it.
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1644,7 +1643,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('enabled')
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('enabled')
                         );
 
                         // update LOG
@@ -1687,7 +1686,7 @@ 
                         // Store updates performed
                         array_push(
                             $arrayOfChanges,
-                            $lang->get('automatic_deletion_engaged') . ': ' . $lang->get('disabled')
+                            $lang->get('automatic_deletion_engaged').': '.$lang->get('disabled')
                         );
 
                         // update LOG
@@ -1715,7 +1714,7 @@ 
                     if (empty($userId) === false) {
                         $dataTmp = DB::queryFirstRow(
                             'SELECT id, name, lastname
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id= %i',
                             $userId
                         );
@@ -1723,7 +1722,7 @@ 
                         // Add to array
                         array_push(
                             $arrayOfUsersRestriction,
-                            $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                            $dataTmp['name'].' '.$dataTmp['lastname']
                         );
                         array_push(
                             $arrayOfUsersIdRestriction,
@@ -1754,8 +1753,8 @@ 
                 // get values before deleting them
                 $rows = DB::query(
                     'SELECT t.title, t.id AS id
-                    FROM ' . prefixTable('roles_title') . ' as t
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (t.id=r.role_id)
+                    FROM ' . prefixTable('roles_title').' as t
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (t.id=r.role_id)
                     WHERE r.item_id = %i
                     ORDER BY t.title ASC',
                     $inputData['itemId']
@@ -1789,7 +1788,7 @@ 
                         );
                         $dataTmp = DB::queryFirstRow(
                             'SELECT title
-                            FROM ' . prefixTable('roles_title') . '
+                            FROM ' . prefixTable('roles_title').'
                             WHERE id = %i',
                             $role
                         );
@@ -1817,7 +1816,7 @@ 
             // Get current status
             $otpStatus = DB::queryFirstRow(
                 'SELECT enabled as otp_is_enabled, phone_number, secret
-                FROM ' . prefixTable('items_otp') . '
+                FROM ' . prefixTable('items_otp').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -1831,7 +1830,7 @@ 
                     'decrypt'
                 )['string'];
             } else {
-                $currentsecret='';
+                $currentsecret = '';
             }
 
             // If OTP secret provided then encrypt it
@@ -1881,7 +1880,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_otp_status:' . ((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
+                        'at_otp_status:'.((int) $post_otp_is_enabled === 0 ? 'disabled' : 'enabled')
                     );
                 }
                 if ($otpStatus['phone_number'] !== $post_otp_phone_number) {
@@ -1892,7 +1891,7 @@ 
                         $session->get('user-id'),
                         'at_modification',
                         $session->get('user-login'),
-                        'at_phone_number:' . $otpStatus['phone_number'] . ' => ' . $post_otp_phone_number
+                        'at_phone_number:'.$otpStatus['phone_number'].' => '.$post_otp_phone_number
                     );
                 }
                 if ($currentsecret !== $post_otp_secret) {
@@ -1941,8 +1940,8 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_restriction : ' . (count($diffUsersRestiction) > 0 ?
-                        implode(', ', $arrayOfUsersRestriction) . (count($diffRolesRestiction) > 0 ? ', ' : '') : '') . (count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
+                    'at_restriction : '.(count($diffUsersRestiction) > 0 ?
+                        implode(', ', $arrayOfUsersRestriction).(count($diffRolesRestiction) > 0 ? ', ' : '') : '').(count($diffRolesRestiction) > 0 ? implode(', ', $arrayOfRestrictionRoles) : '')
                 );
             }
 
@@ -1962,7 +1961,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_label : ' . $data['label'] . ' => ' . $inputData['label']
+                    'at_label : '.$data['label'].' => '.$inputData['label']
                 );
             }
             // LOGIN
@@ -1981,7 +1980,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_login : ' . $data['login'] . ' => ' . $post_login
+                    'at_login : '.$data['login'].' => '.$post_login
                 );
             }
             // EMAIL
@@ -2000,7 +1999,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_email : ' . $data['email'] . ' => ' . $post_email
+                    'at_email : '.$data['email'].' => '.$post_email
                 );
             }
             // URL
@@ -2019,7 +2018,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_url : ' . $data['url'] . ' => ' . $post_url
+                    'at_url : '.$data['url'].' => '.$post_url
                 );
             }
             // DESCRIPTION
@@ -2045,7 +2044,7 @@ 
             // FOLDER
             if ((int) $data['id_tree'] !== (int) $inputData['folderId']) {
                 // Get name of folders
-                $dataTmp = DB::query('SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
+                $dataTmp = DB::query('SELECT title FROM '.prefixTable('nested_tree').' WHERE id IN %li', array($data['id_tree'], $inputData['folderId']));
 
                 // Store updates performed
                 array_push(
@@ -2061,7 +2060,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_category : ' . $dataTmp[0]['title'] . ' => ' . $dataTmp[1]['title']
+                    'at_category : '.$dataTmp[0]['title'].' => '.$dataTmp[1]['title']
                 );
             }
             // ANYONE_CAN_MODIFY
@@ -2069,7 +2068,7 @@ 
                 // Store updates performed
                 array_push(
                     $arrayOfChanges,
-                    $lang->get('at_anyoneconmodify') . ': ' . ((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
+                    $lang->get('at_anyoneconmodify').': '.((int) $post_anyone_can_modify === 0 ? $lang->get('disabled') : $lang->get('enabled'))
                 );
 
                 // Log
@@ -2080,15 +2079,15 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_anyoneconmodify : ' . ((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
+                    'at_anyoneconmodify : '.((int) $post_anyone_can_modify === 0 ? 'disabled' : 'enabled')
                 );
             }
 
             // Reload new values
             $dataItem = DB::queryFirstRow(
                 '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)
                 WHERE i.id = %i AND l.action = %s',
                 $inputData['itemId'],
                 'at_creation'
@@ -2097,8 +2096,8 @@ 
             $history = '';
             $rows = DB::query(
                 'SELECT l.date as date, l.action as action, l.raison as raison, u.login as login
-                FROM ' . prefixTable('log_items') . ' as l
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+                FROM ' . prefixTable('log_items').' as l
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
                 WHERE l.action <> %s AND id_item=%s',
                 'at_shown',
                 $inputData['itemId']
@@ -2107,14 +2106,14 @@ 
                 if ($record['raison'] === NULL) continue;
                 $reason = explode(':', $record['raison']);
                 if (count($reason) > 0) {
-                    $sentence = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - '
-                        . $record['login'] . ' - ' . $lang->get($record['action']) . ' - '
-                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])) . ' : ' . $reason[1]
+                    $sentence = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '
+                        . $record['login'].' - '.$lang->get($record['action']).' - '
+                        . (empty($record['raison']) === false ? (count($reason) > 1 ? $lang->get(trim($reason[0])).' : '.$reason[1]
                             : $lang->get(trim($reason[0]))) : '');
                     if (empty($history)) {
                         $history = $sentence;
                     } else {
-                        $history .= '<br />' . $sentence;
+                        $history .= '<br />'.$sentence;
                     }
                 }
             }
@@ -2252,7 +2251,7 @@ 
         ) {
             // load the original record into an array
             $originalRecord = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -2271,7 +2270,7 @@ 
 
             // Load the destination folder record into an array
             $dataDestination = DB::queryFirstRow(
-                'SELECT personal_folder FROM ' . prefixTable('nested_tree') . '
+                'SELECT personal_folder FROM '.prefixTable('nested_tree').'
                 WHERE id = %i',
                 $post_dest_id
             );
@@ -2279,7 +2278,7 @@ 
             // Get the ITEM object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -2356,8 +2355,8 @@ 
             // Manage Custom Fields
             $rows = DB::query(
                 'SELECT ci.id AS id, ci.data AS data, ci.field_id AS field_id, c.encrypted_data AS encrypted_data
-                FROM ' . prefixTable('categories_items') . ' AS ci
-                INNER JOIN ' . prefixTable('categories') . ' AS c ON (c.id = ci.field_id)
+                FROM ' . prefixTable('categories_items').' AS ci
+                INNER JOIN ' . prefixTable('categories').' AS c ON (c.id = ci.field_id)
                 WHERE ci.item_id = %i',
                 $inputData['itemId']
             );
@@ -2369,7 +2368,7 @@ 
                     // Get user key
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_fields') . '
+                        FROM ' . prefixTable('sharekeys_fields').'
                         WHERE user_id = %i AND object_id = %i',
                         $session->get('user-id'),
                         $field['id']
@@ -2436,15 +2435,15 @@ 
             $rows = DB::query(
                 'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
                 f.size AS size, f.type AS type, 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 f.id_item = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
             );
             foreach ($rows as $record) {
                 // Check if file still exists
-                if (file_exists($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . TP_FILE_PREFIX . base64_decode($record['file'])) === true) {
+                if (file_exists($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.TP_FILE_PREFIX.base64_decode($record['file'])) === true) {
                     // Step1 - decrypt the file
                     // deepcode ignore PT: path is sanitized inside decryptFile()
                     $fileContent = decryptFile(
@@ -2455,8 +2454,8 @@ 
 
                     // Step2 - create file
                     // deepcode ignore InsecureHash: md5 is used jonly for file name in order to get a hashed value in database
-                    $newFileName = md5(time() . '_' . $record['id']) . '.' . $record['extension'];
-                    $outstream = fopen($SETTINGS['path_to_upload_folder'] . DIRECTORY_SEPARATOR . $newFileName, 'ab');
+                    $newFileName = md5(time().'_'.$record['id']).'.'.$record['extension'];
+                    $outstream = fopen($SETTINGS['path_to_upload_folder'].DIRECTORY_SEPARATOR.$newFileName, 'ab');
                     if ($outstream === false) {
                         echo prepareExchangedData(
                             array(
@@ -2529,7 +2528,7 @@ 
 
             // -------------------------
             // Add specific restrictions
-            $rows = DB::query('SELECT * FROM ' . prefixTable('restriction_to_roles') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('restriction_to_roles').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('restriction_to_roles'),
@@ -2541,7 +2540,7 @@ 
             }
 
             // Add Tags
-            $rows = DB::query('SELECT * FROM ' . prefixTable('tags') . ' WHERE item_id = %i', $inputData['itemId']);
+            $rows = DB::query('SELECT * FROM '.prefixTable('tags').' WHERE item_id = %i', $inputData['itemId']);
             foreach ($rows as $record) {
                 DB::insert(
                     prefixTable('tags'),
@@ -2643,7 +2642,7 @@ 
         // then we can show it
         $item_deleted = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE id_item = %i AND action = %s
             ORDER BY date DESC
             LIMIT 0, 1',
@@ -2654,7 +2653,7 @@ 
 
         $item_restored = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE id_item = %i AND action = %s
             ORDER BY date DESC
             LIMIT 0, 1',
@@ -2678,8 +2677,8 @@ 
         // Get all informations for this item
         $dataItem = DB::queryFirstRow(
             '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)
             WHERE i.id = %i AND l.action = %s',
             $inputData['id'],
             'at_creation'
@@ -2688,7 +2687,7 @@ 
         // Notification
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['id'],
             $session->get('user-id')
@@ -2707,7 +2706,7 @@ 
 
         // manage case of API user
         if ($dataItem['id_user'] === API_USER_ID) {
-            $arrData['author'] = 'API [' . $dataItem['description'] . ']';
+            $arrData['author'] = 'API ['.$dataItem['description'].']';
             $arrData['id_user'] = API_USER_ID;
             $arrData['author_email'] = '';
             $arrData['notification_status'] = false;
@@ -2717,7 +2716,7 @@ 
         $tags = array();
         $rows = DB::query(
             'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -2741,7 +2740,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -2755,7 +2754,7 @@ 
         // Get the object key for the user
         $userKeys = DB::query(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE user_id = %i AND object_id = %i',
             $session->get('user-id'),
             $inputData['id']
@@ -2868,8 +2867,8 @@ 
                 // Add restriction if item is restricted to roles
                 $rows = DB::query(
                     'SELECT t.title, t.id
-                    FROM ' . prefixTable('roles_title') . ' AS t
-                    INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (t.id=r.role_id)
+                    FROM ' . prefixTable('roles_title').' AS t
+                    INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (t.id=r.role_id)
                     WHERE r.item_id = %i
                     ORDER BY t.title ASC',
                     $inputData['id']
@@ -2885,8 +2884,8 @@ 
                 $tmp = array();
                 $rows = DB::query(
                     'SELECT k.label, k.id
-                    FROM ' . prefixTable('kb_items') . ' as i
-                    INNER JOIN ' . prefixTable('kb') . ' as k ON (i.kb_id=k.id)
+                    FROM ' . prefixTable('kb_items').' as i
+                    INNER JOIN ' . prefixTable('kb').' as k ON (i.kb_id=k.id)
                     WHERE i.item_id = %i
                     ORDER BY k.label ASC',
                     $inputData['id']
@@ -2969,7 +2968,7 @@ 
                 $arrCatList = array();
                 $rows_tmp = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder=%i',
                     $inputData['folderId']
                 );
@@ -2984,8 +2983,8 @@ 
                         'SELECT i.id AS id, i.field_id AS field_id, i.data AS data, i.item_id AS item_id,
                         i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data, c.parent_id AS parent_id,
                         c.type as field_type, c.masked AS field_masked, c.role_visibility AS role_visibility
-                        FROM ' . prefixTable('categories_items') . ' AS i
-                        INNER JOIN ' . prefixTable('categories') . ' AS c ON (i.field_id=c.id)
+                        FROM ' . prefixTable('categories_items').' AS i
+                        INNER JOIN ' . prefixTable('categories').' AS c ON (i.field_id=c.id)
                         WHERE i.item_id=%i AND c.parent_id IN %ls',
                         $inputData['id'],
                         $arrCatList
@@ -2996,7 +2995,7 @@ 
                         //db::debugmode(true);
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $row['id']
@@ -3014,7 +3013,7 @@ 
                         } else if (DB::count() === 0 && (int) $row['encrypted_data'] === 0) {
                             // Data is not encrypted in DB
                             $fieldText = [
-                                'string' => $row['data'],//#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
+                                'string' => $row['data'], //#3945 - isBase64($row['data']) === true ? base64_decode($row['data']) : 
                                 'encrypted' => false,
                                 'error' => false,
                             ];
@@ -3059,7 +3058,7 @@ 
             if (isset($SETTINGS['item_creation_templates']) && (int) $SETTINGS['item_creation_templates'] === 1) {
                 $rows_tmp = DB::queryFirstRow(
                     'SELECT category_id
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -3076,7 +3075,7 @@ 
             // Evaluate if item is ready for all users
             $rows_tmp = DB::queryFirstRow(
                 'SELECT finished_at
-                FROM ' . prefixTable('background_tasks') . '
+                FROM ' . prefixTable('background_tasks').'
                 WHERE item_id = %i',
                 $inputData['id']
             );
@@ -3093,7 +3092,7 @@ 
                 // Is the Item to be deleted?
                 $dataDelete = DB::queryFirstRow(
                     'SELECT * 
-                    FROM ' . prefixTable('automatic_del') . '
+                    FROM ' . prefixTable('automatic_del').'
                     WHERE item_id = %i',
                     $inputData['id']
                 );
@@ -3174,14 +3173,14 @@ 
                     if (empty($userRest) === false) {
                         $dataTmp = DB::queryFirstRow(
                             'SELECT login
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id= %i',
                             $userRest
                         );
                         if (empty($listOfRestricted)) {
                             $listOfRestricted = $dataTmp['login'];
                         } else {
-                            $listOfRestricted .= ';' . $dataTmp['login'];
+                            $listOfRestricted .= ';'.$dataTmp['login'];
                         }
                     }
                 }
@@ -3255,9 +3254,9 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT i.*, n.title AS folder_title, o.enabled AS otp_for_item_enabled, o.phone_number AS otp_phone_number, o.secret AS otp_secret
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
-            LEFT JOIN ' . prefixTable('items_otp') . ' AS o ON (o.item_id = i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
+            LEFT JOIN ' . prefixTable('items_otp').' AS o ON (o.item_id = i.id)
             WHERE i.id = %i',
             $inputData['id']
         );
@@ -3279,7 +3278,7 @@ 
         // Check if user has a role that is accepted
         $rows_tmp = DB::query(
             'SELECT role_id
-            FROM ' . prefixTable('restriction_to_roles') . '
+            FROM ' . prefixTable('restriction_to_roles').'
             WHERE item_id=%i',
             $inputData['id']
         );
@@ -3311,12 +3310,12 @@ 
             // launch query
             $rows = DB::query(
                 'SELECT id, name, file, extension, size
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i AND confirmed = 1',
                 $inputData['id']
             );
             foreach ($rows as $record) {
-                $filename = basename($record['name'], '.' . $record['extension']);
+                $filename = basename($record['name'], '.'.$record['extension']);
                 $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
 
                 array_push(
@@ -3329,7 +3328,7 @@ 
                         'is_image' => in_array(strtolower($record['extension']), TP_IMAGE_FILE_EXT) === true ? 1 : 0,
                         'id' => $record['id'],
                         'key' => $session->get('user-key_tmp'),
-                        'internalFilename' => basename($record['name'], '.' . $record['extension']),
+                        'internalFilename' => basename($record['name'], '.'.$record['extension']),
                     )
                 );
             }
@@ -3367,7 +3366,7 @@ 
                     array(
                         'latest_items' => implode(';', $session->get('user-latest_items')),
                     ),
-                    'id=' . $session->get('user-id')
+                    'id='.$session->get('user-id')
                 );
             }
 
@@ -3376,8 +3375,8 @@ 
             $listOptionsForRoles = array();
             $rows = DB::query(
                 'SELECT r.role_id AS role_id, t.title AS title
-                FROM ' . prefixTable('roles_values') . ' AS r
-                INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+                FROM ' . prefixTable('roles_values').' AS r
+                INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
                 WHERE r.folder_id = %i',
                 $dataItem['id_tree']
             );
@@ -3391,9 +3390,9 @@ 
                 );
                 $rows2 = DB::query(
                     'SELECT id, login, fonction_id, email, name, lastname
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE fonction_id LIKE %s',
-                    '%' . $record['role_id'] . '%'
+                    '%'.$record['role_id'].'%'
                 );
                 foreach ($rows2 as $record2) {
                     foreach (explode(';', $record2['fonction_id']) as $role) {
@@ -3406,7 +3405,7 @@ 
                                 array(
                                     'id' => (int) $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -3425,16 +3424,16 @@ 
                 $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($path) === true) {
                     $path = addslashes($dataItem['label']);
                 } else {
-                    $path = addslashes($dataItem['label']) . ' (' . $path . ')';
+                    $path = addslashes($dataItem['label']).' ('.$path.')';
                 }
 
                 // Add Admins to notification list if expected
@@ -3457,7 +3456,7 @@ 
                         array(
                             addslashes($session->get('user-login')),
                             $path,
-                            $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $dataItem['id'],
+                            $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$dataItem['id'],
                         ),
                         $lang->get('email_on_open_notification_mail')
                     ),
@@ -3467,7 +3466,7 @@ 
             }
 
             // has this item a change proposal
-            DB::query('SELECT * FROM ' . prefixTable('items_change') . ' WHERE item_id = %i', $inputData['id']);
+            DB::query('SELECT * FROM '.prefixTable('items_change').' WHERE item_id = %i', $inputData['id']);
             $returnArray['has_change_proposal'] = DB::count();
 
             // Setting
@@ -3478,7 +3477,7 @@ 
             if (isset($SETTINGS['otv_is_enabled']) === true && (int) $SETTINGS['otv_is_enabled'] === 1) {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('otv') . '
+                    FROM ' . prefixTable('otv').'
                     WHERE item_id = %i
                     AND time_limit > %i',
                     $inputData['id'],
@@ -3577,7 +3576,7 @@ 
         // Load item data
         $data = DB::queryFirstRow(
             'SELECT id_tree, id, label
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i OR item_key = %s',
             $inputData['itemId'],
             $inputData['itemKey']
@@ -3668,7 +3667,7 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT secret, enabled
-            FROM ' . prefixTable('items_otp') . '
+            FROM ' . prefixTable('items_otp').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -3750,13 +3749,13 @@ 
 
         // Check if user is allowed to access this folder
         if (!in_array($inputData['folderId'], $session->get('user-accessible_folders'))) {
-            echo '[{"error" : "' . $lang->get('error_not_allowed_to') . '"}]';
+            echo '[{"error" : "'.$lang->get('error_not_allowed_to').'"}]';
             break;
         }
 
         // Check if title doesn't contains html codes
         if (preg_match_all('|<[^>]+>(.*)</[^>]+>|U', $title, $out)) {
-            echo '[ { "error" : "' . $lang->get('error_html_codes') . '" } ]';
+            echo '[ { "error" : "'.$lang->get('error_html_codes').'" } ]';
             break;
         }
         // check that title is not numeric
@@ -3767,9 +3766,9 @@ 
 
         // Check if duplicate folders name are allowed
         if (isset($SETTINGS['duplicate_folder']) && $SETTINGS['duplicate_folder'] === '0') {
-            $data = DB::queryFirstRow('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE title = %s', $title);
+            $data = DB::queryFirstRow('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE title = %s', $title);
             if (empty($data['id']) === false && $dataReceived['folder'] !== $data['id']) {
-                echo '[ { "error" : "' . $lang->get('error_group_exist') . '" } ]';
+                echo '[ { "error" : "'.$lang->get('error_group_exist').'" } ]';
                 break;
             }
         }
@@ -3777,7 +3776,7 @@ 
         // query on folder
         $data = DB::queryFirstRow(
             'SELECT parent_id, personal_folder
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -3787,20 +3786,20 @@ 
         if ($session->get('user-admin') !== 1 && $session->get('user-manager') !== 1 && $data['personal_folder'] === '0') {
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %i AND type = %s',
                 $data['parent_id'],
                 'complex'
             );
             if (intval($dataReceived['complexity']) < intval($data['valeur'])) {
-                echo '[ { "error" : "' . $lang->get('error_folder_complexity_lower_than_top_folder') . ' [<b>' . TP_PW_COMPLEXITY[$data['valeur']][1] . '</b>]"} ]';
+                echo '[ { "error" : "'.$lang->get('error_folder_complexity_lower_than_top_folder').' [<b>'.TP_PW_COMPLEXITY[$data['valeur']][1].'</b>]"} ]';
                 break;
             }
         }
 
         // update Folders table
         $tmp = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $dataReceived['folder']
         );
         if ($tmp['parent_id'] !== 0 || $tmp['title'] !== $session->get('user-id') || $tmp['personal_folder'] !== 1) {
@@ -3914,7 +3913,7 @@ 
             $uniqueLoadData['path'] = $arr_arbo;
 
             // store last folder accessed in cookie
-            $arr_cookie_options = array (
+            $arr_cookie_options = array(
                 'expires' => time() + TP_ONE_DAY_SECONDS * 5,
                 'path' => '/', 
                 'secure' => true,
@@ -3929,7 +3928,7 @@ 
             foreach ($session->get('user-roles_array') as $role) {
                 $roleQ = DB::queryFirstRow(
                     'SELECT allow_pw_change
-                    FROM ' . prefixTable('roles_title') . '
+                    FROM ' . prefixTable('roles_title').'
                     WHERE id = %i',
                     $role
                 );
@@ -3960,11 +3959,11 @@ 
                 
                 foreach ($session->get('user-roles_array') as $role) {
                     $access = DB::queryFirstRow(
-                        'SELECT type FROM ' . prefixTable('roles_values') . ' WHERE role_id = %i AND folder_id = %i',
+                        'SELECT type FROM '.prefixTable('roles_values').' WHERE role_id = %i AND folder_id = %i',
                         $role,
                         $inputData['id']
                     );
-                    if (DB::count()>0) {
+                    if (DB::count() > 0) {
                         if ($access['type'] === 'R') {
                             array_push($arrTmp, 10);
                         } elseif ($access['type'] === 'W') {
@@ -4029,7 +4028,7 @@ 
             } else {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif = %i',
                     0
                 );
@@ -4039,7 +4038,7 @@ 
 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
-                'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %i',
+                'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['id']
             );
@@ -4051,7 +4050,7 @@ 
             if (isset($SETTINGS['item_extra_fields']) && (int) $SETTINGS['item_extra_fields'] === 1) {
                 $folderRow = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder = %i',
                     $inputData['id']
                 );
@@ -4107,8 +4106,8 @@ 
                 $where->add('i.inactif=%i', 0);
                 $where->add('i.deleted_at IS NULL');
 
-                $query_limit = ' LIMIT ' .
-                    $start . ',' .
+                $query_limit = ' LIMIT '.
+                    $start.','.
                     $post_nb_items_to_display_once;
                     
                 $rows = DB::query(
@@ -4116,8 +4115,8 @@ 
                     i.label, i.description, i.pw, i.login,
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
                     n.renewal_period, i.url AS link, i.email
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                     WHERE %l
                     ORDER BY i.label ASC' . $query_limit,
                     $where
@@ -4131,8 +4130,8 @@ 
                     i.label, i.description, i.pw, i.login,
                     i.anyone_can_modify, i.id_tree AS tree_id, i.fa_icon,
                     n.renewal_period, i.url AS link, i.email
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (i.id_tree = n.id)
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('nested_tree').' AS n ON (i.id_tree = n.id)
                     WHERE %l
                     ORDER BY i.label ASC',
                     $where
@@ -4162,7 +4161,7 @@ 
                     $item_is_restricted_to_role = false;
                     DB::queryFirstRow(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i',
                         $record['id']
                     );
@@ -4174,7 +4173,7 @@ 
                     $user_is_included_in_role = false;
                     DB::query(
                         'SELECT role_id
-                        FROM ' . prefixTable('restriction_to_roles') . '
+                        FROM ' . prefixTable('restriction_to_roles').'
                         WHERE item_id = %i AND role_id IN %ls',
                         $record['id'],
                         $session->get('user-roles_array')
@@ -4384,8 +4383,8 @@ 
         if ((int) $start === 0) {
             DB::query(
                 'SELECT i.id
-                FROM ' . prefixTable('items') . ' as i
-                INNER JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree = n.id)
+                FROM ' . prefixTable('items').' as i
+                INNER JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree = n.id)
                 WHERE %l',
                 $where
             );
@@ -4445,8 +4444,8 @@ 
         $dataItem = DB::queryFirstRow(
             'SELECT i.pw AS pw, s.share_key AS share_key, i.id AS id,
                     i.label AS label, i.id_tree AS id_tree
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (s.object_id = i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (s.object_id = i.id)
             WHERE user_id = %i AND (i.item_key = %s OR i.id = %i)',
             $session->get('user-id'),
             $inputData['itemKey'] ?? '',
@@ -4558,7 +4557,7 @@ 
         // do query on this folder
         $data_this_folder = DB::queryFirstRow(
             'SELECT id, personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %s',
             $inputData['folderId']
         );
@@ -4598,8 +4597,8 @@ 
         $visibilite = '';
         $data = DB::queryFirstRow(
             'SELECT m.valeur, n.personal_folder
-            FROM ' . prefixTable('misc') . ' AS m
-            INNER JOIN ' . prefixTable('nested_tree') . ' AS n ON (m.intitule = n.id)
+            FROM ' . prefixTable('misc').' AS m
+            INNER JOIN ' . prefixTable('nested_tree').' AS n ON (m.intitule = n.id)
             WHERE type=%s AND intitule = %s',
             'complex',
             $inputData['folderId']
@@ -4612,8 +4611,8 @@ 
             // Prepare Item actual visibility (what Users/Roles can see it)
             $rows = 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',
                 $inputData['folderId']
@@ -4622,7 +4621,7 @@ 
                 if (empty($visibilite)) {
                     $visibilite = $record['title'];
                 } else {
-                    $visibilite .= ' - ' . $record['title'];
+                    $visibilite .= ' - '.$record['title'];
                 }
             }
         } else {
@@ -4632,14 +4631,14 @@ 
             // do new query to know if current folder is pf
             $data_pf = DB::queryFirstRow(
                 'SELECT personal_folder
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %s',
                 $inputData['folderId']
             );
             
             $folder_is_personal = $data_pf !== null ? (int) $data_pf['personal_folder'] : 0;
             
-            $visibilite = $session->get('user-name') . ' ' . $session->get('user-lastname') . ' (' . $session->get('user-login') . ')';
+            $visibilite = $session->get('user-name').' '.$session->get('user-lastname').' ('.$session->get('user-login').')';
         }
 
         recupDroitCreationSansComplexite($inputData['folderId']);
@@ -4649,8 +4648,8 @@ 
         $listOptionsForRoles = array();
         $rows = DB::query(
             'SELECT r.role_id AS role_id, t.title AS title
-            FROM ' . prefixTable('roles_values') . ' AS r
-            INNER JOIN ' . prefixTable('roles_title') . ' AS t ON (r.role_id = t.id)
+            FROM ' . prefixTable('roles_values').' AS r
+            INNER JOIN ' . prefixTable('roles_title').' AS t ON (r.role_id = t.id)
             WHERE r.folder_id = %i',
             $inputData['folderId']
         );
@@ -4664,7 +4663,7 @@ 
             );
             $rows2 = DB::query(
                 'SELECT id, login, fonction_id, email, name, lastname
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE admin = 0 AND fonction_id is not null'
             );
             foreach ($rows2 as $record2) {
@@ -4678,7 +4677,7 @@ 
                             array(
                                 'id' => $record2['id'],
                                 'login' => $record2['login'],
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                'name' => $record2['name'].' '.$record2['lastname'],
                                 'email' => $record2['email'],
                             )
                         );
@@ -4695,12 +4694,12 @@ 
             foreach ($session->get('user-roles_array') as $role) {
                 $access = DB::queryFirstRow(
                     'SELECT type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id = %i AND folder_id = %i',
                     $role,
                     $inputData['folderId']
                 );
-                if (DB::count()>0) {
+                if (DB::count() > 0) {
                     if ($access['type'] === 'R') {
                         array_push($arrTmp, 10);
                     } elseif ($access['type'] === 'W') {
@@ -4728,7 +4727,7 @@ 
             // Check if personal folder is owned by user
             $folder = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s',
                 $session->get('user-id'),
             );
@@ -4833,7 +4832,7 @@ 
         // Get some info before deleting
         $data = DB::queryFirstRow(
             'SELECT name, id_item, file
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id = %i',
             $fileId
         );
@@ -4841,7 +4840,7 @@ 
         // Load item data
         $data_item = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $data['id_item']
         );
@@ -4871,7 +4870,7 @@ 
                 $session->get('user-id'),
                 'at_modification',
                 $session->get('user-login'),
-                'at_del_file : ' . $data['name']
+                'at_del_file : '.$data['name']
             );
 
             // DElete sharekeys
@@ -4882,7 +4881,7 @@ 
             );
 
             // Delete file from server
-            $fileToDelete = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($data['file']);
+            $fileToDelete = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($data['file']);
             $fileToDelete = realpath($fileToDelete);
             if ($fileToDelete && strpos($fileToDelete, $SETTINGS['path_to_upload_folder']) === 0) {
                 fileDelete($fileToDelete, $SETTINGS);
@@ -4936,7 +4935,7 @@ 
             // Update SESSION with this new favourite
             $data = DB::queryFirstRow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -4945,7 +4944,7 @@ 
                 [
                     $inputData['itemId'] => [
                         'label' => $data['label'],
-                        'url' => 'index.php?page=items&amp;group=' . $data['id_tree'] . '&amp;id=' . $inputData['itemId'],
+                        'url' => 'index.php?page=items&amp;group='.$data['id_tree'].'&amp;id='.$inputData['itemId'],
                     ],
                 ],
                 'add'
@@ -5014,8 +5013,8 @@ 
         // get data about item
         $dataSource = DB::queryFirstRow(
             'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-            FROM ' . prefixTable('items') . ' as i
-            INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+            FROM ' . prefixTable('items').' as i
+            INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
             WHERE i.id=%i',
             $inputData['itemId']
         );
@@ -5059,7 +5058,7 @@ 
         // get data about new folder
         $dataDestination = DB::queryFirstRow(
             'SELECT personal_folder, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $inputData['folderId']
         );
@@ -5112,7 +5111,7 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -5129,7 +5128,7 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
@@ -5176,7 +5175,7 @@ 
             // Get the ITEM object key for the user
             $userKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $session->get('user-id'),
                 $inputData['itemId']
@@ -5187,7 +5186,7 @@ 
                 // This is a public object
                 $users = DB::query(
                     'SELECT id, public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id NOT IN %li
                     AND public_key != ""',
                     $tpUsersIDs
@@ -5209,14 +5208,14 @@ 
             // Get fields for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $field) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_fields') . '
+                    FROM ' . prefixTable('sharekeys_fields').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $field['id']
@@ -5227,7 +5226,7 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id NOT IN %li
                         AND public_key != ""',
                         $tpUsersIDs
@@ -5250,14 +5249,14 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
             foreach ($rows as $attachment) {
                 $userKey = DB::queryFirstRow(
                     'SELECT share_key
-                    FROM ' . prefixTable('sharekeys_files') . '
+                    FROM ' . prefixTable('sharekeys_files').'
                     WHERE user_id = %i AND object_id = %i',
                     $session->get('user-id'),
                     $attachment['id']
@@ -5268,7 +5267,7 @@ 
                     // This is a public object
                     $users = DB::query(
                         'SELECT id, public_key
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id NOT IN %li
                         AND public_key != ""',
                         $tpUsersIDs
@@ -5309,7 +5308,7 @@ 
             $session->get('user-id'),
             'at_modification',
             $session->get('user-login'),
-            'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+            'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
         );
 
         // Update cache table
@@ -5368,8 +5367,8 @@ 
                 // get data about item
                 $dataSource = DB::queryFirstRow(
                     'SELECT i.pw, f.personal_folder,i.id_tree, f.title,i.label
-                    FROM ' . prefixTable('items') . ' as i
-                    INNER JOIN ' . prefixTable('nested_tree') . ' as f ON (i.id_tree=f.id)
+                    FROM ' . prefixTable('items').' as i
+                    INNER JOIN ' . prefixTable('nested_tree').' as f ON (i.id_tree=f.id)
                     WHERE i.id=%i',
                     $item_id
                 );
@@ -5391,7 +5390,7 @@ 
 
                 // get data about new folder
                 $dataDestination = DB::queryFirstRow(
-                    'SELECT personal_folder, title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+                    'SELECT personal_folder, title FROM '.prefixTable('nested_tree').' WHERE id = %i',
                     $inputData['folderId']
                 );
 
@@ -5425,14 +5424,14 @@ 
                         prefixTable('sharekeys_items'),
                         'object_id = %i AND user_id NOT IN %ls',
                         $item_id,
-                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+                        [$session->get('user-id'), TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
                     );
 
                     // Remove all item sharekeys fields
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
@@ -5449,7 +5448,7 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
@@ -5504,7 +5503,7 @@ 
                     // Get the ITEM object key for the user
                     $userKey = DB::queryFirstRow(
                         'SELECT share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE user_id = %i AND object_id = %i',
                         $session->get('user-id'),
                         $item_id
@@ -5515,7 +5514,7 @@ 
                         // This is a public object
                         $users = DB::query(
                             'SELECT id, public_key
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id NOT IN %li
                             AND public_key != ""',
                             $tpUsersIDs
@@ -5538,14 +5537,14 @@ 
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
                     foreach ($rows as $field) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_fields') . '
+                            FROM ' . prefixTable('sharekeys_fields').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $field['id']
@@ -5556,7 +5555,7 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id NOT IN %li
                                 AND public_key != ""',
                                 $tpUsersIDs
@@ -5580,14 +5579,14 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
                     foreach ($rows as $attachment) {
                         $userKey = DB::queryFirstRow(
                             'SELECT share_key
-                            FROM ' . prefixTable('sharekeys_files') . '
+                            FROM ' . prefixTable('sharekeys_files').'
                             WHERE user_id = %i AND object_id = %i',
                             $session->get('user-id'),
                             $attachment['id']
@@ -5598,7 +5597,7 @@ 
                             // This is a public object
                             $users = DB::query(
                                 'SELECT id, public_key
-                                FROM ' . prefixTable('users') . '
+                                FROM ' . prefixTable('users').'
                                 WHERE id NOT IN %li
                                 AND public_key != ""',
                                 $tpUsersIDs
@@ -5638,13 +5637,13 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_moved : ' . $dataSource['title'] . ' -> ' . $dataDestination['title']
+                    'at_moved : '.$dataSource['title'].' -> '.$dataDestination['title']
                 );
             }
         }
 
         // reload cache table
-        require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+        require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
         updateCacheTable('reload', null);
 
         echo (string) prepareExchangedData(
@@ -5708,7 +5707,7 @@ 
                 // get info
                 $dataSource = DB::queryFirstRow(
                     'SELECT label, id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item_id
                 );
@@ -5809,14 +5808,14 @@ 
             // Variables
             $dataAuthor = DB::queryFirstRow(
                 'SELECT email,login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_content[1]
             );
 
             $dataItem = DB::queryFirstRow(
                 'SELECT label, id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $post_content[0]
             );
@@ -5833,7 +5832,7 @@ 
                 $lang->get('email_request_access_subject'),
                 str_replace(
                     array('#tp_item_author#', '#tp_user#', '#tp_item#'),
-                    array(' ' . addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
+                    array(' '.addslashes($dataAuthor['login']), addslashes($session->get('user-login')), $path),
                     $lang->get('email_request_access_mail')
                 ),
                 $dataAuthor['email'],
@@ -5842,7 +5841,7 @@ 
         } elseif ($inputData['cat'] === 'share_this_item') {
             $dataItem = DB::queryFirstRow(
                 'SELECT label,id_tree
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id= %i',
                 $inputData['id']
             );
@@ -5865,7 +5864,7 @@ 
                     ),
                     array(
                         empty($SETTINGS['email_server_url']) === false ?
-                            $SETTINGS['email_server_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'] : $SETTINGS['cpassman_url'] . '/index.php?page=items&group=' . $dataItem['id_tree'] . '&id=' . $inputData['id'],
+                            $SETTINGS['email_server_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'] : $SETTINGS['cpassman_url'].'/index.php?page=items&group='.$dataItem['id_tree'].'&id='.$inputData['id'],
                         addslashes($session->get('user-login')),
                         addslashes($path),
                     ),
@@ -5914,8 +5913,8 @@ 
         // Get all informations for this item
         $dataItem = DB::queryFirstRow(
             '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)
             WHERE i.id=%i AND l.action = %s',
             $item_id,
             'at_creation'
@@ -5944,18 +5943,18 @@ 
                 $session->get('user-login'),
                 htmlspecialchars_decode($label, ENT_QUOTES),
                 null,
-                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'])
+                (string) dateToStamp($date.' '.$time, $SETTINGS['date_format'].' '.$SETTINGS['time_format'])
             );
             // Prepare new line
             $data = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('log_items') . ' WHERE id_item = %i ORDER BY date DESC',
+                'SELECT * FROM '.prefixTable('log_items').' WHERE id_item = %i ORDER BY date DESC',
                 $item_id
             );
-            $historic = date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $data['date']) . ' - ' . $session->get('user-login') . ' - ' . $lang->get($data['action']) . ' - ' . $data['raison'];
+            $historic = date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $data['date']).' - '.$session->get('user-login').' - '.$lang->get($data['action']).' - '.$data['raison'];
             // send back
             $data = array(
                 'error' => '',
-                'new_line' => '<br>' . addslashes($historic),
+                'new_line' => '<br>'.addslashes($historic),
             );
             echo (string) prepareExchangedData(
                 $data,
@@ -6030,8 +6029,8 @@ 
         // Should we log a password change?
         $itemQ = DB::queryFirstRow(
             'SELECT s.share_key, i.pw
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('sharekeys_items') . ' AS s ON (i.id = s.object_id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('sharekeys_items').' AS s ON (i.id = s.object_id)
             WHERE s.user_id = %i AND s.object_id = %i',
             $session->get('user-id'),
             $dataReceived['id']
@@ -6086,7 +6085,7 @@ 
         if (isset($SETTINGS['otv_expiration_period']) === false) {
             $SETTINGS['otv_expiration_period'] = 7;
         }
-        $url = $SETTINGS['cpassman_url'] . '/index.php?' . http_build_query($otv_session);
+        $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
 
         echo json_encode(
             array(
@@ -6117,7 +6116,7 @@ 
         // get parameters from original link
         $url = $dataReceived['original_link'];
         $parts = parse_url($url);
-        if(isset($parts['query'])){
+        if (isset($parts['query'])) {
             parse_str($parts['query'], $orignal_link_parameters);
         } else {
             $orignal_link_parameters = array();
@@ -6148,13 +6147,13 @@ 
             $domain_scheme = parse_url($SETTINGS['cpassman_url'], PHP_URL_SCHEME);
             $domain_host = parse_url($SETTINGS['cpassman_url'], PHP_URL_HOST);
             if (str_contains($domain_host, 'www.') === true) {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . substr($domain_host, 4);
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.substr($domain_host, 4);
             } else {
-                $domain_host = (string) $SETTINGS['otv_subdomain'] . '.' . $domain_host;
+                $domain_host = (string) $SETTINGS['otv_subdomain'].'.'.$domain_host;
             }
-            $url = $domain_scheme.'://'.$domain_host . '/index.php?'.http_build_query($otv_session);
+            $url = $domain_scheme.'://'.$domain_host.'/index.php?'.http_build_query($otv_session);
         } else {
-            $url = $SETTINGS['cpassman_url'] . '/index.php?'.http_build_query($otv_session);
+            $url = $SETTINGS['cpassman_url'].'/index.php?'.http_build_query($otv_session);
         }
 
         echo (string) prepareExchangedData(
@@ -6189,8 +6188,8 @@ 
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status,
             f.extension AS extension, f.type AS type,
             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'),
             $inputData['id']
@@ -6211,7 +6210,7 @@ 
         //$fileName = basename($file_info['name'], '.'.$file_info['extension']);
 
         // prepare image info
-        $post_title = basename($file_info['name'], '.' . $file_info['extension']);
+        $post_title = basename($file_info['name'], '.'.$file_info['extension']);
         $post_title = isBase64($post_title) === true ? base64_decode($post_title) : $post_title;
         
         // Get image content
@@ -6238,7 +6237,7 @@ 
         echo (string) prepareExchangedData(
             array(
                 'error' => false,
-                'filename' => $post_title . '.' . $file_info['extension'],
+                'filename' => $post_title.'.'.$file_info['extension'],
                 'file_type' => $file_info['type'],
                 'file_content' => $fileContent,
             ),
@@ -6350,7 +6349,7 @@ 
                     $arbo = $tree->getPath($folder->id, false);
                     $path = '';
                     foreach ($arbo as $elem) {
-                        $path = (empty($path) ? '' : $path . ' / ') . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                        $path = (empty($path) ? '' : $path.' / ').htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                     }
 
                     // Build array
@@ -6417,7 +6416,7 @@ 
         if (is_array($foldersArray) === true && $inputData['data'] !== '[null]') {
             $rows = DB::query(
                 'SELECT id, categories
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id IN (%l)',
                 implode(',', $foldersArray)
             );
@@ -6435,7 +6434,7 @@ 
             if (count($ids) > 0) {
                 $subfolders = DB::queryFirstColumn(
                     'SELECT title
-                    FROM ' . prefixTable('nested_tree') . '
+                    FROM ' . prefixTable('nested_tree').'
                     WHERE id IN %li',
                     $ids
                 );
@@ -6471,7 +6470,7 @@ 
         // get item info
         $dataItem = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id=%i',
             $inputData['itemId']
         );
@@ -6483,8 +6482,8 @@ 
             'SELECT l.date as date, l.action as action, l.raison as raison,
                 u.login as login, u.avatar_thumb as avatar_thumb, u.name as name, u.lastname as lastname,
                 l.old_value as old_value
-            FROM ' . prefixTable('log_items') . ' as l
-            INNER JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
+            FROM ' . prefixTable('log_items').' as l
+            INNER JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
             WHERE id_item=%i AND l.action NOT IN (%l)
             ORDER BY date DESC',
             $inputData['itemId'],
@@ -6499,18 +6498,18 @@ 
             
             // imported via API
             if (empty($record['login']) === true) {
-                $record['login'] = $lang->get('imported_via_api') . ' [' . $record['raison'] . ']';
+                $record['login'] = $lang->get('imported_via_api').' ['.$record['raison'].']';
             }
             
             // Prepare avatar
             if (isset($record['avatar_thumb']) && empty($record['avatar_thumb']) === false) {
-                if (file_exists($SETTINGS['cpassman_dir'] . '/includes/avatars/' . $record['avatar_thumb'])) {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $record['avatar_thumb'];
+                if (file_exists($SETTINGS['cpassman_dir'].'/includes/avatars/'.$record['avatar_thumb'])) {
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$record['avatar_thumb'];
                 } else {
-                    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
                 }
             } else {
-                $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
+                $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
             }
 
             // Prepare action
@@ -6530,7 +6529,7 @@ 
                         $previous_passwords, 
                         [
                             'password' => htmlentities($previous_pwd['string']),
-                            'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                            'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                         ]
                     );
                 }
@@ -6543,19 +6542,19 @@ 
                 $action = $lang->get($reason[0]);
                 if ($reason[0] === 'at_moved') {
                     $tmp = explode(' -> ', $reason[1]);
-                    $detail = $lang->get('from') . ' <span class="font-weight-light">' . $tmp[0] . '</span> ' . $lang->get('to') . ' <span class="font-weight-light">' . $tmp[1] . ' </span>';
+                    $detail = $lang->get('from').' <span class="font-weight-light">'.$tmp[0].'</span> '.$lang->get('to').' <span class="font-weight-light">'.$tmp[1].' </span>';
                 } elseif ($reason[0] === 'at_field') {
                     $tmp = explode(' => ', $reason[1]);
                     if (count($tmp) > 1) {
-                        $detail = '<b>' . trim($tmp[0]) . '</b> | ' . $lang->get('previous_value') .
-                            ': <span class="font-weight-light">' . trim($tmp[1]) . '</span>';
+                        $detail = '<b>'.trim($tmp[0]).'</b> | '.$lang->get('previous_value').
+                            ': <span class="font-weight-light">'.trim($tmp[1]).'</span>';
                     } else {
                         $detail = trim($reason[1]);
                     }
                 } elseif (in_array($reason[0], array('at_restriction', 'at_email', 'at_login', 'at_label', 'at_url', 'at_tag')) === true) {
                     $tmp = explode(' => ', $reason[1]);
                     $detail = empty(trim($tmp[0])) === true ?
-                        $lang->get('no_previous_value') : $lang->get('previous_value') . ': <span class="font-weight-light">' . $tmp[0] . ' </span>';
+                        $lang->get('no_previous_value') : $lang->get('previous_value').': <span class="font-weight-light">'.$tmp[0].' </span>';
                 } elseif ($reason[0] === 'at_automatic_del') {
                     $detail = $lang->get($reason[1]);
                 } elseif ($reason[0] === 'at_anyoneconmodify' || $reason[0] === 'at_otp_status' || $reason[0] === 'at_otp_secret' || $reason[0] === 'at_phone_number') {
@@ -6564,7 +6563,7 @@ 
                     $tmp = explode(':', $reason[1]);
                     $tmp = explode('.', $tmp[0]);
                     $detail = isBase64($tmp[0]) === true ?
-                        base64_decode($tmp[0]) . '.' . $tmp[1] : $tmp[0];
+                        base64_decode($tmp[0]).'.'.$tmp[1] : $tmp[0];
                 } elseif ($reason[0] === 'at_import') {
                     $detail = '';
                 } elseif (in_array($reason[0], array('csv', 'pdf')) === true) {
@@ -6583,8 +6582,8 @@ 
                 array(
                     'avatar' => $avatar,
                     'login' => $record['login'],
-                    'name' => $record['name'] . ' ' . $record['lastname'],
-                    'date' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']),
+                    'name' => $record['name'].' '.$record['lastname'],
+                    'date' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']),
                     'action' => $action,
                     'detail' => $detail,
                 )
@@ -6672,11 +6671,11 @@ 
 
         // get some info to add to the notification email
         $resp_user = DB::queryFirstRow(
-            'SELECT login FROM ' . prefixTable('users') . ' WHERE id = %i',
+            'SELECT login FROM '.prefixTable('users').' WHERE id = %i',
             $session->get('user-id')
         );
         $resp_folder = DB::queryFirstRow(
-            'SELECT title FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $folder
         );
 
@@ -6685,7 +6684,7 @@ 
         $emailService = new EmailService();
         $rows = DB::query(
             'SELECT email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
             1
         );
@@ -6731,7 +6730,7 @@ 
         // Send email
         $dataItem = DB::queryFirstRow(
             'SELECT label, id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -6785,7 +6784,7 @@ 
 
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['itemId'],
             $session->get('user-id')
@@ -6857,7 +6856,7 @@ 
         // And related logs
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -6871,12 +6870,12 @@ 
             );
 
             // Delete file on server
-            unlink($SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file['filename']));
+            unlink($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file['filename']));
 
             // Delete related logs
             $logFile = DB::query(
                 'SELECT increment_id, raison
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE id_item = %i AND id_user = %i AND action = %s AND raison LIKE "at_add_file :%"',
                 $inputData['itemId'],
                 $session->get('user-id'),
@@ -6935,7 +6934,7 @@ 
         // Confirm attachments
         $rows = DB::query(
             'SELECT id, file AS filename
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id_item = %i AND confirmed = %i',
             $inputData['itemId'],
             0
@@ -7051,7 +7050,7 @@ 
             $successfulDeletions = array();
             $failedDeletions = array();
 
-            foreach( $selectedItemIds as $itemId) {
+            foreach ($selectedItemIds as $itemId) {
                 // Check that user can access this item
                 $granted = accessToItemIsGranted((int) $itemId, $SETTINGS);
                 if ($granted !== true) {
@@ -7062,7 +7061,7 @@ 
                 // Load item data
                 $data = DB::queryFirstRow(
                     'SELECT id_tree, id, label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = %i',
                     $itemId
                 );
@@ -7145,15 +7144,15 @@ 
         case 'autocomplete_tags':
             // Get a list off all existing TAGS
             $listOfTags = '';
-            $rows = DB::query('SELECT tag FROM ' . prefixTable('tags') . ' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
+            $rows = DB::query('SELECT tag FROM '.prefixTable('tags').' WHERE tag LIKE %ss GROUP BY tag', $inputData['getTerm']);
             foreach ($rows as $record) {
                 if (empty($listOfTags)) {
-                    $listOfTags = '"' . $record['tag'] . '"';
+                    $listOfTags = '"'.$record['tag'].'"';
                 } else {
-                    $listOfTags .= ', "' . $record['tag'] . '"';
+                    $listOfTags .= ', "'.$record['tag'].'"';
                 }
             }
-            echo '[' . $listOfTags . ']';
+            echo '['.$listOfTags.']';
             break;
     }
 }
@@ -7169,7 +7168,7 @@ 
 {
     $data = DB::queryFirstRow(
         'SELECT bloquer_creation, bloquer_modification, personal_folder
-        FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+        FROM ' . prefixTable('nested_tree').' WHERE id = %i',
         $groupe
     );
     // Check if it's in a personal folder. If yes, then force complexity overhead.
@@ -7289,7 +7288,7 @@ 
     // Get item date
     $itemRestrictedUsersList = DB::queryFirstRow(
         'SELECT restricted_to
-         FROM ' . prefixTable('items') . '
+         FROM ' . prefixTable('items').'
          WHERE id = %i',
         $itemId
     );
@@ -7322,7 +7321,7 @@ 
     $now = time();
     $editionLocks = DB::query(
         'SELECT timestamp, user_id, increment_id
-         FROM ' . prefixTable('items_edition') . '
+         FROM ' . prefixTable('items_edition').'
          WHERE item_id = %i 
          ORDER BY increment_id DESC',
         $itemId
@@ -7368,7 +7367,7 @@ 
 
         // Delete related background tasks if any
         $task = DB::queryFirstRow(
-            'SELECT increment_id FROM ' . prefixTable('background_tasks') . '
+            'SELECT increment_id FROM '.prefixTable('background_tasks').'
              WHERE item_id = %i AND finished_at = ""',
             $itemId
         );
@@ -7381,7 +7380,7 @@ 
         // Check if encryption process is still running
         DB::queryFirstRow(
             'SELECT JSON_EXTRACT(arguments, "$.all_users_except_id") AS all_users_except_id
-             FROM ' . prefixTable('background_tasks') . '
+             FROM ' . prefixTable('background_tasks').'
              WHERE item_id = %i AND finished_at = ""
              ORDER BY increment_id DESC',
             $itemId
@@ -7402,7 +7401,7 @@ 
         }
 
         return [
-            'status' => true,   // Encryption in progress
+            'status' => true, // Encryption in progress
             'delay' => $delay - $elapsed, // Time remaining before the lock expires
         ];
     }
@@ -7447,7 +7446,7 @@ 
 {
     // Check if there's an ongoing background encryption process for the item
     $ongoingProcess = DB::queryFirstRow(
-        'SELECT 1 FROM ' . prefixTable('background_tasks') . ' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
+        'SELECT 1 FROM '.prefixTable('background_tasks').' WHERE item_id = %i AND finished_at = "" LIMIT 1', 
         $itemId
     );
 
@@ -7465,7 +7464,7 @@ 
 function getUserVisibleFolders(int $userId): array
 {
     // Query to retrieve visible folders for the user
-    $data = DB::queryFirstRow('SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', $userId);
+    $data = DB::queryFirstRow('SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', $userId);
     
     // Decode JSON data into an array; return an empty array if the data is invalid
     return json_decode($data['visible_folders'], true) ?? [];
@@ -7489,7 +7488,7 @@ 
 
     // Query the access rights for the given roles and folder
     $accessTypes = DB::queryFirstColumn(
-        'SELECT DISTINCT type FROM ' . prefixTable('roles_values') . ' WHERE role_id IN %ls AND folder_id = %i', 
+        'SELECT DISTINCT type FROM '.prefixTable('roles_values').' WHERE role_id IN %ls AND folder_id = %i', 
         $roles, 
         $treeId
     );

sources/upload.files.php

Spacing +33 added lines, -33 removed lines

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