nilsteampassnet / TeamPass

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'

pages/items.js.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -1056,7 +1056,7 @@ 
             //
         } else if ($(this).data('item-action') === 'link') {
             // Add link to clipboard.
-            navigator.clipboard.writeText("<?php echo $SETTINGS['cpassman_url'];?>/index.php?page=items&group="+store.get('teampassItem').folderId+"&id="+store.get('teampassItem').id);
+            navigator.clipboard.writeText("<?php echo $SETTINGS['cpassman_url']; ?>/index.php?page=items&group="+store.get('teampassItem').folderId+"&id="+store.get('teampassItem').id);
 
             // Display message.
             toastr.remove();
@@ -2698,7 +2698,7 @@ 
                 progress: "#form-item-password-strength",
                 score: "#form-item-password-strength"
             },
-            scores: [<?php echo TP_PW_STRENGTH_1;?>, <?php echo TP_PW_STRENGTH_2;?>, <?php echo TP_PW_STRENGTH_3;?>, <?php echo TP_PW_STRENGTH_4;?>, <?php echo TP_PW_STRENGTH_5;?>],
+            scores: [<?php echo TP_PW_STRENGTH_1; ?>, <?php echo TP_PW_STRENGTH_2; ?>, <?php echo TP_PW_STRENGTH_3; ?>, <?php echo TP_PW_STRENGTH_4; ?>, <?php echo TP_PW_STRENGTH_5; ?>],
         },
         i18n : {
             t: function (key) {
@@ -2725,7 +2725,7 @@ 
     <?php
     $max_file_size = '';
     if (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) {
-        $max_file_size = $SETTINGS['upload_maxfilesize'] . 'mb';
+        $max_file_size = $SETTINGS['upload_maxfilesize'].'mb';
     } else {
         $max_file_size = $SETTINGS['upload_maxfilesize'];
     }
@@ -4647,7 +4647,7 @@ 
                         (retData.edition_locked_delay === null ? 
                         '' 
                         :
-                        ' : ' + retData.edition_locked_delay + ' <?php echo $lang->get('seconds');?>'),
+                        ' : ' + retData.edition_locked_delay + ' <?php echo $lang->get('seconds'); ?>'),
                     '', {
                         timeOut: 5000,
                         progressBar: true
@@ -4804,7 +4804,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                         } else if (data.error_type !== 'undefined') {
@@ -4823,7 +4823,7 @@ 
 
                                 // Show passwords inputs and form
                                 $('#dialog-ldap-user-change-password-info')
-                                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                     .removeClass('hidden');
                                 $('#dialog-ldap-user-change-password').removeClass('hidden');
                             });

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 +276 added lines, -277 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');
 
@@ -365,7 +365,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']
             );
@@ -382,7 +382,7 @@ 
             // Get folder complexity
             $folderComplexity = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type = %s AND intitule = %i',
                 'complex',
                 $inputData['folderId']
@@ -407,7 +407,7 @@ 
             $itemExists = 0;
             $newID = '';
             $data = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE label = %s AND inactif = %i',
                 $inputData['label'],
                 0
@@ -488,8 +488,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
@@ -502,7 +502,7 @@ 
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow(
                                 'SELECT encrypted_data
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -531,8 +531,8 @@ 
                                     (int) $post_folder_is_personal,
                                     (int) $newObjectId,
                                     $cryptedStuff['objectKey'],
-                                    true,   // only for the item creator
-                                    false,  // no delete all
+                                    true, // only for the item creator
+                                    false, // no delete all
                                 );
 
                                 array_push(
@@ -568,7 +568,7 @@ 
                 ) {
                     DB::queryFirstRow(
                         'SELECT *
-                        FROM ' . prefixTable('templates') . '
+                        FROM ' . prefixTable('templates').'
                         WHERE item_id = %i',
                         $newID
                     );
@@ -637,11 +637,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'];
                             }
                         }
                     }
@@ -657,7 +657,7 @@ 
                             if (empty($userRest) === false) {
                                 $dataTmp = DB::queryFirstRow(
                                     'SELECT login
-                                    FROM ' . prefixTable('users') . '
+                                    FROM ' . prefixTable('users').'
                                     WHERE id= %i',
                                     $userRest
                                 );
@@ -665,7 +665,7 @@ 
                                 if (empty($oldRestrictionList) === true) {
                                     $oldRestrictionList = $dataTmp['login'];
                                 } else {
-                                    $oldRestrictionList .= ';' . $dataTmp['login'];
+                                    $oldRestrictionList .= ';'.$dataTmp['login'];
                                 }
                             }
                         }
@@ -728,7 +728,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
                     );
@@ -784,7 +784,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,
@@ -888,11 +888,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);
@@ -923,8 +923,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
@@ -984,7 +983,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']
         );
@@ -1000,7 +999,7 @@ 
         // Get folder complexity
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $inputData['folderId']
@@ -1045,8 +1044,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'
@@ -1088,7 +1087,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')
@@ -1149,9 +1148,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']
             );
@@ -1159,7 +1158,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']
@@ -1223,12 +1222,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 {
@@ -1239,7 +1238,7 @@ 
             // Get list of tags
             $itemTags = DB::queryFirstColumn(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i',
                 $inputData['itemId']
             );
@@ -1285,7 +1284,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_tag : ' . implode(' ', $itemTags) . ' => ' . $post_tags
+                    'at_tag : '.implode(' ', $itemTags).' => '.$post_tags
                 );
             }
 
@@ -1330,8 +1329,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']
@@ -1347,7 +1346,7 @@ 
                             // Perform new query
                             $dataTmpCat = DB::queryFirstRow(
                                 'SELECT id, title, encrypted_data, masked
-                                FROM ' . prefixTable('categories') . '
+                                FROM ' . prefixTable('categories').'
                                 WHERE id = %i',
                                 $field['id']
                             );
@@ -1377,8 +1376,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
@@ -1428,7 +1427,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
@@ -1437,7 +1436,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']
@@ -1476,8 +1475,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) {
@@ -1519,7 +1518,7 @@ 
                                     $session->get('user-id'),
                                     'at_modification',
                                     $session->get('user-login'),
-                                    'at_field : ' . $dataTmpCat['title'] . ' => ' . $oldVal
+                                    'at_field : '.$dataTmpCat['title'].' => '.$oldVal
                                 );
                             }
                         }
@@ -1573,7 +1572,7 @@ 
             ) {
                 DB::queryFirstRow(
                     'SELECT *
-                    FROM ' . prefixTable('templates') . '
+                    FROM ' . prefixTable('templates').'
                     WHERE item_id = %i',
                     $inputData['itemId']
                 );
@@ -1616,7 +1615,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']
                 );
@@ -1643,7 +1642,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
@@ -1686,7 +1685,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
@@ -1714,7 +1713,7 @@ 
                     if (empty($userId) === false) {
                         $dataTmp = DB::queryFirstRow(
                             'SELECT id, name, lastname
-                            FROM ' . prefixTable('users') . '
+                            FROM ' . prefixTable('users').'
                             WHERE id= %i',
                             $userId
                         );
@@ -1722,7 +1721,7 @@ 
                         // Add to array
                         array_push(
                             $arrayOfUsersRestriction,
-                            $dataTmp['name'] . ' ' . $dataTmp['lastname']
+                            $dataTmp['name'].' '.$dataTmp['lastname']
                         );
                         array_push(
                             $arrayOfUsersIdRestriction,
@@ -1753,8 +1752,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']
@@ -1788,7 +1787,7 @@ 
                         );
                         $dataTmp = DB::queryFirstRow(
                             'SELECT title
-                            FROM ' . prefixTable('roles_title') . '
+                            FROM ' . prefixTable('roles_title').'
                             WHERE id = %i',
                             $role
                         );
@@ -1816,7 +1815,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']
             );
@@ -1830,7 +1829,7 @@ 
                     'decrypt'
                 )['string'];
             } else {
-                $currentsecret='';
+                $currentsecret = '';
             }
 
             // If OTP secret provided then encrypt it
@@ -1880,7 +1879,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) {
@@ -1891,7 +1890,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) {
@@ -1940,8 +1939,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) : '')
                 );
             }
 
@@ -1961,7 +1960,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_label : ' . $data['label'] . ' => ' . $inputData['label']
+                    'at_label : '.$data['label'].' => '.$inputData['label']
                 );
             }
             // LOGIN
@@ -1980,7 +1979,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_login : ' . $data['login'] . ' => ' . $post_login
+                    'at_login : '.$data['login'].' => '.$post_login
                 );
             }
             // EMAIL
@@ -1999,7 +1998,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_email : ' . $data['email'] . ' => ' . $post_email
+                    'at_email : '.$data['email'].' => '.$post_email
                 );
             }
             // URL
@@ -2018,7 +2017,7 @@ 
                     $session->get('user-id'),
                     'at_modification',
                     $session->get('user-login'),
-                    'at_url : ' . $data['url'] . ' => ' . $post_url
+                    'at_url : '.$data['url'].' => '.$post_url
                 );
             }
             // DESCRIPTION
@@ -2044,7 +2043,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(
@@ -2060,7 +2059,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
@@ -2068,7 +2067,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
@@ -2079,15 +2078,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'
@@ -2096,8 +2095,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']
@@ -2106,14 +2105,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;
                     }
                 }
             }
@@ -2251,7 +2250,7 @@ 
         ) {
             // load the original record into an array
             $originalRecord = DB::queryFirstRow(
-                'SELECT * FROM ' . prefixTable('items') . '
+                'SELECT * FROM '.prefixTable('items').'
                 WHERE id = %i',
                 $inputData['itemId']
             );
@@ -2270,7 +2269,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
             );
@@ -2278,7 +2277,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']
@@ -2355,8 +2354,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']
             );
@@ -2368,7 +2367,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']
@@ -2435,15 +2434,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(
@@ -2454,8 +2453,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(
@@ -2528,7 +2527,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'),
@@ -2540,7 +2539,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'),
@@ -2642,7 +2641,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',
@@ -2653,7 +2652,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',
@@ -2677,8 +2676,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'
@@ -2687,7 +2686,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')
@@ -2706,7 +2705,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;
@@ -2716,7 +2715,7 @@ 
         $tags = array();
         $rows = DB::query(
             'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -2740,7 +2739,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']
         );
@@ -2754,7 +2753,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']
@@ -2867,8 +2866,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']
@@ -2884,8 +2883,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']
@@ -2968,7 +2967,7 @@ 
                 $arrCatList = array();
                 $rows_tmp = DB::query(
                     'SELECT id_category
-                    FROM ' . prefixTable('categories_folders') . '
+                    FROM ' . prefixTable('categories_folders').'
                     WHERE id_folder=%i',
                     $inputData['folderId']
                 );
@@ -2983,8 +2982,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
@@ -2995,7 +2994,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']
@@ -3013,7 +3012,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,
                             ];
@@ -3058,7 +3057,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']
                 );
@@ -3075,7 +3074,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']
             );
@@ -3092,7 +3091,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']
                 );
@@ -3173,14 +3172,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'];
                         }
                     }
                 }
@@ -3254,9 +3253,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']
         );
@@ -3278,7 +3277,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']
         );
@@ -3310,12 +3309,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(
@@ -3328,7 +3327,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']),
                     )
                 );
             }
@@ -3366,7 +3365,7 @@ 
                     array(
                         'latest_items' => implode(';', $session->get('user-latest_items')),
                     ),
-                    'id=' . $session->get('user-id')
+                    'id='.$session->get('user-id')
                 );
             }
 
@@ -3375,8 +3374,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']
             );
@@ -3390,9 +3389,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) {
@@ -3405,7 +3404,7 @@ 
                                 array(
                                     'id' => (int) $record2['id'],
                                     'login' => $record2['login'],
-                                    'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                    'name' => $record2['name'].' '.$record2['lastname'],
                                     'email' => $record2['email'],
                                 )
                             );
@@ -3424,16 +3423,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
@@ -3456,7 +3455,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')
                     ),
@@ -3466,7 +3465,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
@@ -3477,7 +3476,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'],
@@ -3576,7 +3575,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']
@@ -3667,7 +3666,7 @@ 
         // Load item data
         $dataItem = DB::queryFirstRow(
             'SELECT secret, enabled
-            FROM ' . prefixTable('items_otp') . '
+            FROM ' . prefixTable('items_otp').'
             WHERE item_id = %i',
             $inputData['id']
         );
@@ -3749,13 +3748,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
@@ -3766,9 +3765,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;
             }
         }
@@ -3776,7 +3775,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']
         );
@@ -3786,20 +3785,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) {
@@ -3913,7 +3912,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,
@@ -3928,7 +3927,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
                 );
@@ -3959,11 +3958,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') {
@@ -4028,7 +4027,7 @@ 
             } else {
                 DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE inactif = %i',
                     0
                 );
@@ -4038,7 +4037,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']
             );
@@ -4050,7 +4049,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']
                 );
@@ -4106,8 +4105,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(
@@ -4115,8 +4114,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
@@ -4130,8 +4129,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
@@ -4161,7 +4160,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']
                     );
@@ -4173,7 +4172,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')
@@ -4383,8 +4382,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
             );
@@ -4444,8 +4443,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'] ?? '',
@@ -4557,7 +4556,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']
         );
@@ -4597,8 +4596,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']
@@ -4611,8 +4610,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']
@@ -4621,7 +4620,7 @@ 
                 if (empty($visibilite)) {
                     $visibilite = $record['title'];
                 } else {
-                    $visibilite .= ' - ' . $record['title'];
+                    $visibilite .= ' - '.$record['title'];
                 }
             }
         } else {
@@ -4631,14 +4630,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']);
@@ -4648,8 +4647,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']
         );
@@ -4663,7 +4662,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) {
@@ -4677,7 +4676,7 @@ 
                             array(
                                 'id' => $record2['id'],
                                 'login' => $record2['login'],
-                                'name' => $record2['name'] . ' ' . $record2['lastname'],
+                                'name' => $record2['name'].' '.$record2['lastname'],
                                 'email' => $record2['email'],
                             )
                         );
@@ -4694,12 +4693,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') {
@@ -4727,7 +4726,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'),
             );
@@ -4832,7 +4831,7 @@ 
         // Get some info before deleting
         $data = DB::queryFirstRow(
             'SELECT name, id_item, file
-            FROM ' . prefixTable('files') . '
+            FROM ' . prefixTable('files').'
             WHERE id = %i',
             $fileId
         );
@@ -4840,7 +4839,7 @@ 
         // Load item data
         $data_item = DB::queryFirstRow(
             'SELECT id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $data['id_item']
         );
@@ -4870,7 +4869,7 @@ 
                 $session->get('user-id'),
                 'at_modification',
                 $session->get('user-login'),
-                'at_del_file : ' . $data['name']
+                'at_del_file : '.$data['name']
             );
 
             // DElete sharekeys
@@ -4881,7 +4880,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);
@@ -4935,7 +4934,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']
             );
@@ -4944,7 +4943,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'
@@ -5013,8 +5012,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']
         );
@@ -5058,7 +5057,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']
         );
@@ -5111,7 +5110,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']
             );
@@ -5128,7 +5127,7 @@ 
             // Get FILES for this Item
             $rows = DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
+                FROM ' . prefixTable('files').'
                 WHERE id_item = %i',
                 $inputData['itemId']
             );
@@ -5175,7 +5174,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']
@@ -5186,7 +5185,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']
                 );
 
@@ -5433,7 +5432,7 @@ 
                     // Get fields for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE item_id = %i',
                         $item_id
                     );
@@ -5450,7 +5449,7 @@ 
                     // Get FILES for this Item
                     $rows = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('files') . '
+                        FROM ' . prefixTable('files').'
                         WHERE id_item = %i',
                         $item_id
                     );
@@ -5505,7 +5504,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
@@ -5516,7 +5515,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
@@ -5539,14 +5538,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']
@@ -5557,7 +5556,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
@@ -5581,14 +5580,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']
@@ -5599,7 +5598,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
@@ -5639,13 +5638,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(
@@ -5709,7 +5708,7 @@ 
                 // get info
                 $dataSource = DB::queryFirstRow(
                     'SELECT label, id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item_id
                 );
@@ -5810,14 +5809,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]
             );
@@ -5834,7 +5833,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'],
@@ -5843,7 +5842,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']
             );
@@ -5866,7 +5865,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),
                     ),
@@ -5915,8 +5914,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'
@@ -5945,18 +5944,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,
@@ -6031,8 +6030,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']
@@ -6087,7 +6086,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(
@@ -6118,7 +6117,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();
@@ -6149,13 +6148,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(
@@ -6190,8 +6189,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']
@@ -6212,7 +6211,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
@@ -6239,7 +6238,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,
             ),
@@ -6351,7 +6350,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)
             );
@@ -6459,7 +6458,7 @@ 
         // get item info
         $dataItem = DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id=%i',
             $inputData['itemId']
         );
@@ -6471,8 +6470,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'],
@@ -6487,18 +6486,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
@@ -6518,7 +6517,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']),
                         ]
                     );
                 }
@@ -6531,19 +6530,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') {
@@ -6552,7 +6551,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) {
@@ -6571,8 +6570,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,
                 )
@@ -6660,11 +6659,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
         );
 
@@ -6673,7 +6672,7 @@ 
         $emailService = new EmailService();
         $rows = DB::query(
             'SELECT email
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE `gestionnaire` = %i AND `email` IS NOT NULL',
             1
         );
@@ -6719,7 +6718,7 @@ 
         // Send email
         $dataItem = DB::queryFirstRow(
             'SELECT label, id_tree
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE id = %i',
             $inputData['itemId']
         );
@@ -6773,7 +6772,7 @@ 
 
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('notification') . '
+            FROM ' . prefixTable('notification').'
             WHERE item_id = %i AND user_id = %i',
             $inputData['itemId'],
             $session->get('user-id')
@@ -6845,7 +6844,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
@@ -6859,12 +6858,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'),
@@ -6923,7 +6922,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
@@ -7039,7 +7038,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) {
@@ -7050,7 +7049,7 @@ 
                 // Load item data
                 $data = DB::queryFirstRow(
                     'SELECT id_tree, id, label
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id = %i',
                     $itemId
                 );
@@ -7133,15 +7132,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;
     }
 }
@@ -7157,7 +7156,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.
@@ -7277,7 +7276,7 @@ 
     // Get item date
     $itemRestrictedUsersList = DB::queryFirstRow(
         'SELECT restricted_to
-         FROM ' . prefixTable('items') . '
+         FROM ' . prefixTable('items').'
          WHERE id = %i',
         $itemId
     );
@@ -7310,7 +7309,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
@@ -7356,7 +7355,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
         );
@@ -7369,7 +7368,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
@@ -7390,7 +7389,7 @@ 
         }
 
         return [
-            'status' => true,   // Encryption in progress
+            'status' => true, // Encryption in progress
             'delay' => $delay - $elapsed, // Time remaining before the lock expires
         ];
     }
@@ -7435,7 +7434,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
     );
 
@@ -7453,7 +7452,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) ?? [];
@@ -7477,7 +7476,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

pages/import.php

Spacing +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
     || isset($SETTINGS['allow_import']) === false || (int) $SETTINGS['allow_import'] !== 1) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -85,9 +85,9 @@ 
  
 if ((int) $session->get('user-admin') === 1) {
     $folderOptions = '';
-    $rows = DB::query('SELECT id, title FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id, title FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
-        $folderOptions .= '<option value="' . $record['id'] . '">' . htmlspecialchars($record['title'], ENT_QUOTES, 'UTF-8') . '</option>';
+        $folderOptions .= '<option value="'.$record['id'].'">'.htmlspecialchars($record['title'], ENT_QUOTES, 'UTF-8').'</option>';
     }
 }
 
@@ -189,7 +189,7 @@ 
                                         <?php
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
 echo $complexitySelect;
                                         ?>

pages/import.js.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === 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;
 }
 ?>
@@ -511,7 +511,7 @@ 
                     const errorMessages = JSON.parse(response.message);
                     let errorHtml = '<ul>';
                     errorMessages.forEach(function(error) {
-                        errorHtml += '<li><?php echo $lang->get('import_error_folder_creation');?> "<b>'+error.errorPath+'</b>": '+error.errorMessage+'</li>';
+                        errorHtml += '<li><?php echo $lang->get('import_error_folder_creation'); ?> "<b>'+error.errorPath+'</b>": '+error.errorMessage+'</li>';
                     });
 
                     $('#import-feedback-progress-text').html(
@@ -997,7 +997,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(0)+'%)');
+                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(0)+'%)');
 
                                         data = {
                                             'edit-all': $('#import-keepass-edit-all-checkbox').prop('checked') === true ? 1 : 0,

sources/expired.datatables.php

Spacing +20 added lines, -20 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;
 }
 
@@ -101,7 +101,7 @@ 
 // Is a date sent?
 $dateCriteria = $request->query->get('dateCriteria');
 if ($dateCriteria !== null && !empty($dateCriteria)) {
-    $sWhere .= ' AND a.del_value < ' . round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
+    $sWhere .= ' AND a.del_value < '.round(filter_var($dateCriteria, FILTER_SANITIZE_NUMBER_INT) / 1000, 0);
 }
 //echo $sWhere;
 /* BUILD QUERY */
@@ -110,7 +110,7 @@ 
 $start = $request->query->getInt('start', 0);
 $length = $request->query->getInt('length', -1);
 if ($length !== -1) {
-    $sLimit = ' LIMIT ' . $start . ', ' . $length;
+    $sLimit = ' LIMIT '.$start.', '.$length;
 }
 
 //Ordering
@@ -123,7 +123,7 @@ 
         $columnIndex = filter_var($order[0]['column'], FILTER_SANITIZE_NUMBER_INT);
 
         if (array_key_exists($columnIndex, $aColumns)) {
-            $sOrder .= $aColumns[$columnIndex] . ' ' . $order[0]['dir'];
+            $sOrder .= $aColumns[$columnIndex].' '.$order[0]['dir'];
         }
 
         // Supprimez la virgule finale si elle existe
@@ -147,9 +147,9 @@ 
 
     if ($letter !== '' && $letter !== 'None') {
         $sWhere .= ' AND ';
-        $sWhere .= $aColumns[1] . " LIKE '" . $letter . "%' OR ";
-        $sWhere .= $aColumns[2] . " LIKE '" . $letter . "%' OR ";
-        $sWhere .= $aColumns[3] . " LIKE '" . $letter . "%' ";
+        $sWhere .= $aColumns[1]." LIKE '".$letter."%' OR ";
+        $sWhere .= $aColumns[2]." LIKE '".$letter."%' OR ";
+        $sWhere .= $aColumns[3]." LIKE '".$letter."%' ";
     }
 }
 
@@ -160,26 +160,26 @@ 
 
         if ($searchValue !== '') {
             $sWhere = ' AND ';
-            $sWhere .= $aColumns[1] . " LIKE '" . $searchValue . "%' OR ";
-            $sWhere .= $aColumns[2] . " LIKE '" . $searchValue . "%' OR ";
-            $sWhere .= $aColumns[3] . " LIKE '" . $searchValue . "%' ";
+            $sWhere .= $aColumns[1]." LIKE '".$searchValue."%' OR ";
+            $sWhere .= $aColumns[2]." LIKE '".$searchValue."%' OR ";
+            $sWhere .= $aColumns[3]." LIKE '".$searchValue."%' ";
         }
     }
 }
 
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
     $sWhere.
     (string) $sOrder
 );
 $iTotal = DB::count();
 $rows = DB::query(
     'SELECT a.item_id, i.label, a.del_value, i.id_tree
-    FROM ' . prefixTable('automatic_del') . ' AS a
-    INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = a.item_id)' .
-        $sWhere .
+    FROM ' . prefixTable('automatic_del').' AS a
+    INNER JOIN ' . prefixTable('items').' AS i ON (i.id = a.item_id)'.
+        $sWhere.
         $sLimit
 );
 $iFilteredTotal = DB::count();
@@ -187,7 +187,7 @@ 
    * Output
 */
 $sOutput = '{';
-$sOutput .= '"sEcho": '. (int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+$sOutput .= '"sEcho": '.(int) $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
 $sOutput .= '"iTotalRecords": '.$iTotal.', ';
 $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
 $sOutput .= '"aaData": ';
@@ -201,18 +201,18 @@ 
     // start the line
     $sOutput .= '[';
     // Column 1
-    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"' . $record['item_id'] . '\"  data-item-tree-id=\"' . $record['id_tree'] . '\"></i>", ';
+    $sOutput .= '"<i class=\"fas fa-external-link-alt pointer text-primary mr-2\" onclick=\"showItemCard($(this))\" data-item-id=\"'.$record['item_id'].'\"  data-item-tree-id=\"'.$record['id_tree'].'\"></i>", ';
     // Column 2
-    $sOutput .= '"' . $record['label'] . '", ';
+    $sOutput .= '"'.$record['label'].'", ';
     // Column 3
-    $sOutput .= '"' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['del_value']) . '", ';
+    $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['del_value']).'", ';
     // Column 4
     $path = [];
     $treeDesc = $tree->getPath($record['id_tree'], true);
     foreach ($treeDesc as $t) {
         array_push($path, $t->title);
     }
-    $sOutput .= '"' . implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path) . '"],';
+    $sOutput .= '"'.implode('<i class=\"fas fa-angle-right ml-1 mr-1\"></i>', $path).'"],';
 }
 
 if (count($rows) > 0) {

sources/utilities.queries.php

Spacing +30 added lines, -30 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 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -151,11 +151,11 @@ 
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title,
                 a.del_enabled as del_enabled, a.del_value as del_value, a.del_type as del_type
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
-                INNER JOIN ' . prefixTable('automatic_del') . ' as a ON (l.id_item = a.item_id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
+                INNER JOIN ' . prefixTable('automatic_del').' as a ON (l.id_item = a.item_id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -177,7 +177,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                             'del_enabled' => (bool) $record['del_enabled'],
@@ -238,10 +238,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -268,7 +268,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -284,7 +284,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -373,10 +373,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $exploded = explode(',', $data['valeur']);
@@ -387,7 +387,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -401,7 +401,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -418,7 +418,7 @@ 
                         // Delete all fields
                         $fields = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('categories_items') . '
+                            FROM ' . prefixTable('categories_items').'
                             WHERE item_id = %i',
                             $folderData[0]
                         );
@@ -438,7 +438,7 @@ 
                         // Delete all files
                         $files = DB::query(
                             'SELECT id
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE id_item = %i',
                             $folderData[0]
                         );
@@ -495,7 +495,7 @@ 
                 // Delete sharekey fields
                 $itemFields = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('categories_items') . '
+                    FROM ' . prefixTable('categories_items').'
                     WHERE item_id = %i',
                     $itemId
                 );
@@ -510,7 +510,7 @@ 
                 // Delete sharekey files
                 $itemFiles = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('files') . '
+                    FROM ' . prefixTable('files').'
                     WHERE id_item = %i',
                     $itemId
                 );
@@ -587,7 +587,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -607,7 +607,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -630,7 +630,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -647,7 +647,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -664,7 +664,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -681,7 +681,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,
@@ -752,19 +752,19 @@ 
             // Get info about task
             $taskInfo = DB::queryFirstRow(
                 'SELECT p.process_type as process_type
-                FROM ' . prefixTable('background_tasks') . ' as p
+                FROM ' . prefixTable('background_tasks').' as p
                 WHERE p.increment_id = %i',
                 $post_id
             );
             if ($taskInfo !== null) {
                 // delete task
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_subtasks') . '
+                    'DELETE FROM '.prefixTable('background_subtasks').'
                     WHERE task_id = %i',
                     $post_id
                 );
                 DB::query(
-                    'DELETE FROM ' . prefixTable('background_tasks') . '
+                    'DELETE FROM '.prefixTable('background_tasks').'
                     WHERE increment_id = %i',
                     $post_id
                 );
@@ -831,7 +831,7 @@ 
                         ->setDayOfMonth('*')
                         ->setMonths('*')
                         ->setDayOfWeek('*')
-                        ->setTaskCommandLine($phpBinaryPath . ' ' . $SETTINGS['cpassman_dir'] . '/sources/scheduler.php')
+                        ->setTaskCommandLine($phpBinaryPath.' '.$SETTINGS['cpassman_dir'].'/sources/scheduler.php')
                         ->setComments('Teampass scheduler');
                     
                     $crontabRepository->addJob($crontabJob);