nilsteampassnet / TeamPass

sources/logs.datatables.php

Spacing +25 added lines, -27 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;
 }
 
@@ -168,7 +168,7 @@ 
     
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -181,7 +181,7 @@ 
         //col1
         $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).'", ';
         //col2
-        $sOutput .= '"'.str_replace([chr(10), chr(13)], [' ', ' '],(string) $record['label']).'", ';
+        $sOutput .= '"'.str_replace([chr(10), chr(13)], [' ', ' '], (string) $record['label']).'", ';
         //col3
         $sOutput .= '"'.(string) $record['name'].' '.(string) $record['lastname'].' ['.(string) $record['login'].']"';
         //Finish the line
@@ -242,7 +242,7 @@ 
 
     // Output
     $sOutput = '{';
-    $sOutput .= '"sEcho": '. $request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT) . ', ';
+    $sOutput .= '"sEcho": '.$request->query->filter('draw', FILTER_SANITIZE_NUMBER_INT).', ';
     $sOutput .= '"iTotalRecords": '.$iTotal.', ';
     $sOutput .= '"iTotalDisplayRecords": '.$iTotal.', ';
     $sOutput .= '"aaData": ';
@@ -316,7 +316,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": ';
@@ -390,7 +390,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": [ ';
@@ -495,7 +495,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": [ ';
@@ -579,7 +579,7 @@ 
         $iTotal = 0;
     }
     $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": ';
@@ -655,7 +655,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": ';
@@ -725,7 +725,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": ';
@@ -799,7 +799,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": ';
@@ -877,7 +877,7 @@ 
             FROM '.prefixTable('background_tasks').' AS p 
             LEFT JOIN '.prefixTable('users').' AS u ON %l
             WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -885,7 +885,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": ';
@@ -900,7 +900,7 @@ 
         //col1
         $sOutput .= '"<span data-done=\"'.$record['is_in_progress'].'\" data-type=\"'.$record['process_type'].'\" data-process-id=\"'.$record['increment_id'].'\"></span>", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
         //col4
@@ -909,7 +909,7 @@ 
         // col5
         if (in_array($record['process_type'], array('create_user_keys', 'item_copy')) === true) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname FROM ' . prefixTable('users') . '
+                'SELECT name, lastname FROM '.prefixTable('users').'
                 WHERE id = %i',
                 json_decode($record['arguments'], true)['new_user_id']
             );
@@ -966,7 +966,7 @@ 
     FROM '.prefixTable('background_tasks').' AS p 
     LEFT JOIN '.prefixTable('users').' AS u ON %l
     WHERE %l ORDER BY %l %l LIMIT %i, %i';
-    $params = ['u.id = json_extract(p.arguments, "$[0]")',$sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
+    $params = ['u.id = json_extract(p.arguments, "$[0]")', $sWhere, $orderColumn, $orderDirection, $sLimitStart, $sLimitLength];
 
     // Get the records
     $rows = DB::query($sql, ...$params);
@@ -974,7 +974,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": ';
@@ -990,13 +990,12 @@ 
         //col1
         $sOutput .= '"'.(is_null($record['error_message']) ? '' : addslashes($record['error_message'])).'", ';
         //col2
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ';
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ';
         //col3
         $sOutput .= is_null($record['started_at']) === false ?
-            ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['started_at']).'", ') :
-                ('"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['created_at']).'", ');
+            ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['started_at']).'", ') : ('"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['created_at']).'", ');
         //col4
-        $sOutput .= '"'.date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
+        $sOutput .= '"'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['finished_at']).'", '; 
         // col7
         $sOutput .= '"'.gmdate('H:i:s', (int) $record['finished_at'] - (is_null($record['started_at']) === false ? (int) $record['started_at'] : (int) $record['created_at'])).'",';
         //col5
@@ -1019,11 +1018,10 @@ 
         // col6
         $arguments = json_decode($record['arguments'], true);
         $newUserId = array_key_exists('new_user_id', $arguments) ? 
-            $arguments['new_user_id'] : 
-            (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
+            $arguments['new_user_id'] : (array_key_exists('user_id', $arguments) ? $arguments['user_id'] : null);
         if ($record['process_type'] === 'create_user_keys' && is_null($newUserId) === false && empty($newUserId) === false) {
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $newUserId
             );
@@ -1040,7 +1038,7 @@ 
         } elseif ($record['process_type'] === 'user_build_cache_tree') {
             $user = json_decode($record['arguments'], true)['user_id'];
             $data_user = DB::queryFirstRow(
-                'SELECT name, lastname, login FROM ' . prefixTable('users') . '
+                'SELECT name, lastname, login FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $user
             );
@@ -1075,7 +1073,7 @@ 
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1091,5 +1089,5 @@ 
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }

sources/admin.queries.php

Switch Indentation +247 added lines, -247 removed lines

@@ -2904,8 +2904,8 @@ 
 // LIVE ACTIVITY ENDPOINT
 // ========================================
 
-case 'get_live_activity':
-    /**
+    case 'get_live_activity':
+        /**
      * Get recent activity (last 5 minutes, max 10 entries)
      * 
      * @return array [{
@@ -2919,26 +2919,26 @@ 
      * }]
      */
     
-    $timestamp5min = time() - 300; // 5 minutes ago
+        $timestamp5min = time() - 300; // 5 minutes ago
     
-    $activities = DB::query(
-        'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label 
+        $activities = DB::query(
+            'SELECT l.date, l.id_user, u.login, l.action, l.raison, l.id_item, i.label 
         FROM ' . prefixTable('log_items') . ' AS l
         LEFT JOIN ' . prefixTable('users') . ' AS u ON l.id_user = u.id
         LEFT JOIN ' . prefixTable('items') . ' AS i ON l.id_item = i.id
         WHERE l.date > %i
         ORDER BY l.date DESC
         LIMIT 10',
-        $timestamp5min
-    );
-    $activities = secureOutput($activities, ['login']);
+            $timestamp5min
+        );
+        $activities = secureOutput($activities, ['login']);
     
-    $activityList = array();
+        $activityList = array();
     
-    foreach ($activities as $activity) {
-        // Translate action to readable text
-        $actionText = '';
-        switch ($activity['action']) {
+        foreach ($activities as $activity) {
+            // Translate action to readable text
+            $actionText = '';
+            switch ($activity['action']) {
             case 'at_shown':
                 $actionText = $lang->get('action_accessed');
                 break;
@@ -2962,7 +2962,7 @@ 
                 break;
             default:
                 $actionText = $activity['action'];
-        }
+            }
         
         $activityList[] = array(
             'timestamp' => (int) $activity['date'],
@@ -2988,8 +2988,8 @@ 
 // SYSTEM STATUS ENDPOINT
 // ========================================
 
-case 'get_system_status':
-    /**
+    case 'get_system_status':
+        /**
      * Get system status (tasks queue)
      * 
      * @return array {
@@ -2998,49 +2998,49 @@ 
      * }
      */
         
-    // Tasks queue count
-    $tasksQueue = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' 
+        // Tasks queue count
+        $tasksQueue = DB::queryFirstField(
+            'SELECT COUNT(*) FROM ' . prefixTable('background_tasks') . ' 
         WHERE finished_at IS NULL OR finished_at = 0'
-    );
+        );
     
-    // Last cron execution
-    $lastCronLog = DB::queryFirstRow(
-        'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+        // Last cron execution
+        $lastCronLog = DB::queryFirstRow(
+            'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
         ORDER BY created_at DESC 
         LIMIT 1'
-    );
+        );
     
-    $lastCronText = $lang->get('never');
-    if ($lastCronLog && isset($lastCronLog['created_at'])) {
-        $timeDiff = time() - (int) $lastCronLog['created_at'];
-        if ($timeDiff < 60) {
-            $lastCronText = $timeDiff . 's ' . $lang->get('ago');
-        } elseif ($timeDiff < 3600) {
-            $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago');
-        } elseif ($timeDiff < 86400) {
-            $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago');
-        } else {
-            $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago');
+        $lastCronText = $lang->get('never');
+        if ($lastCronLog && isset($lastCronLog['created_at'])) {
+            $timeDiff = time() - (int) $lastCronLog['created_at'];
+            if ($timeDiff < 60) {
+                $lastCronText = $timeDiff . 's ' . $lang->get('ago');
+            } elseif ($timeDiff < 3600) {
+                $lastCronText = floor($timeDiff / 60) . 'm ' . $lang->get('ago');
+            } elseif ($timeDiff < 86400) {
+                $lastCronText = floor($timeDiff / 3600) . 'h ' . $lang->get('ago');
+            } else {
+                $lastCronText = floor($timeDiff / 86400) . 'd ' . $lang->get('ago');
+            }
         }
-    }
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'tasks_queue' => (int) $tasksQueue,
-            'last_cron' => $lastCronText,
-        ),
-        'encode'
-    );
-    break;
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'tasks_queue' => (int) $tasksQueue,
+                'last_cron' => $lastCronText,
+            ),
+            'encode'
+        );
+        break;
 
-// ========================================
-// SYSTEM HEALTH ENDPOINT
-// ========================================
+    // ========================================
+    // SYSTEM HEALTH ENDPOINT
+    // ========================================
 
-case 'get_system_health':
-    /**
+    case 'get_system_health':
+        /**
      * Get system health checks
      * 
      * @return array {
@@ -3052,97 +3052,97 @@ 
      * }
      */
     
-    // Encryption check
-    $encryptionStatus = 'success';
-    $encryptionText = $lang->get('health_status_ok');
+        // Encryption check
+        $encryptionStatus = 'success';
+        $encryptionText = $lang->get('health_status_ok');
     
-    // Check if secure file exists
-    if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) {
-        $encryptionStatus = 'danger';
-        $encryptionText = $lang->get('health_secure_file_missing');
-    }
+        // Check if secure file exists
+        if (isset($SETTINGS['securepath']) && isset($SETTINGS['securefile']) && !file_exists($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile'])) {
+            $encryptionStatus = 'danger';
+            $encryptionText = $lang->get('health_secure_file_missing');
+        }
     
-    // Active sessions count
-    $sessionsCount = DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
+        // Active sessions count
+        $sessionsCount = DB::queryFirstField(
+            'SELECT COUNT(*) FROM ' . prefixTable('users') . ' 
         WHERE session_end > %i',
-        time()
-    );
+            time()
+        );
     
-    // Is cron installed
-    DB::query(
-        'SELECT valeur
+        // Is cron installed
+        DB::query(
+            'SELECT valeur
         FROM ' . prefixTable('misc') . '
         WHERE type = %s AND intitule = %s and valeur >= %d',
-        'admin',
-        'last_cron_exec',
-        time() - 600 // max 10 minutes
-    );
+            'admin',
+            'last_cron_exec',
+            time() - 600 // max 10 minutes
+        );
 
-    if (DB::count() === 0) {
-        $cronStatus = 'danger';
-        $cronText = $lang->get('error');
-    } else {
-        // Cron check (last execution should be < 2 minutes ago)
-        $lastCron = DB::queryFirstField(
-            'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
+        if (DB::count() === 0) {
+            $cronStatus = 'danger';
+            $cronText = $lang->get('error');
+        } else {
+            // Cron check (last execution should be < 2 minutes ago)
+            $lastCron = DB::queryFirstField(
+                'SELECT created_at FROM ' . prefixTable('background_tasks_logs') . ' 
             ORDER BY created_at DESC 
             LIMIT 1'
-        );
+            );
         
-        $cronStatus = 'success';
-        $cronText = $lang->get('health_status_ok');
+            $cronStatus = 'success';
+            $cronText = $lang->get('health_status_ok');
         
-        if (!$lastCron || (time() - (int) $lastCron) > 120) {
-            $cronStatus = 'warning';
-            $cronText = $lang->get('health_cron_delayed');
+            if (!$lastCron || (time() - (int) $lastCron) > 120) {
+                $cronStatus = 'warning';
+                $cronText = $lang->get('health_cron_delayed');
+            }
         }
-    }
     
-    // Unknown files count
-    $unknownFilesData = DB::queryFirstField(
-        'SELECT valeur FROM ' . prefixTable('misc') . ' 
+        // Unknown files count
+        $unknownFilesData = DB::queryFirstField(
+            'SELECT valeur FROM ' . prefixTable('misc') . ' 
         WHERE type = %s AND intitule = %s',
-        'admin',
-        'unknown_files'
-    );
+            'admin',
+            'unknown_files'
+        );
     
-    $unknownFilesCount = 0;
-    if ($unknownFilesData) {
-        $unknownFiles = json_decode($unknownFilesData, true);
-        if (is_array($unknownFiles)) {
-            $unknownFilesCount = count($unknownFiles);
+        $unknownFilesCount = 0;
+        if ($unknownFilesData) {
+            $unknownFiles = json_decode($unknownFilesData, true);
+            if (is_array($unknownFiles)) {
+                $unknownFilesCount = count($unknownFiles);
+            }
         }
-    }
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'encryption' => array(
-                'status' => $encryptionStatus,
-                'text' => $encryptionText,
-            ),
-            'sessions' => array(
-                'count' => (int) $sessionsCount,
-            ),
-            'cron' => array(
-                'status' => $cronStatus,
-                'text' => $cronText,
-            ),
-            'unknown_files' => array(
-                'count' => $unknownFilesCount,
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'encryption' => array(
+                    'status' => $encryptionStatus,
+                    'text' => $encryptionText,
+                ),
+                'sessions' => array(
+                    'count' => (int) $sessionsCount,
+                ),
+                'cron' => array(
+                    'status' => $cronStatus,
+                    'text' => $cronText,
+                ),
+                'unknown_files' => array(
+                    'count' => $unknownFilesCount,
+                ),
             ),
-        ),
-        'encode'
-    );
-    break;
+            'encode'
+        );
+        break;
 
-// ========================================
-// QUICK ACTIONS - CLEAN OLD LOGS
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - CLEAN OLD LOGS
+    // ========================================
 
-case 'clean_old_logs':
-    /**
+    case 'clean_old_logs':
+        /**
      * Clean logs older than 90 days
      * 
      * @return array {
@@ -3152,54 +3152,54 @@ 
      * }
      */
     
-    $threshold = time() - (90 * 86400); // 90 days ago
+        $threshold = time() - (90 * 86400); // 90 days ago
     
-    // Delete old log_items entries
-    DB::delete(
-        prefixTable('log_items'),
-        'date < %i',
-        $threshold
-    );
+        // Delete old log_items entries
+        DB::delete(
+            prefixTable('log_items'),
+            'date < %i',
+            $threshold
+        );
     
-    $deletedItems = DB::affectedRows();
+        $deletedItems = DB::affectedRows();
     
-    // Delete old log_system entries
-    DB::delete(
-        prefixTable('log_system'),
-        'date < %i',
-        $threshold
-    );
+        // Delete old log_system entries
+        DB::delete(
+            prefixTable('log_system'),
+            'date < %i',
+            $threshold
+        );
     
-    $deletedSystem = DB::affectedRows();
+        $deletedSystem = DB::affectedRows();
     
-    $totalDeleted = $deletedItems + $deletedSystem;
+        $totalDeleted = $deletedItems + $deletedSystem;
     
-    // Log the action
-    logEvents(
-        $SETTINGS,
-        'admin_action',
-        'clean_old_logs',
-        (string) $session->get('user-id'),
-        $session->get('user-login'),
-        'Cleaned ' . $totalDeleted . ' old log entries'
-    );
+        // Log the action
+        logEvents(
+            $SETTINGS,
+            'admin_action',
+            'clean_old_logs',
+            (string) $session->get('user-id'),
+            $session->get('user-login'),
+            'Cleaned ' . $totalDeleted . ' old log entries'
+        );
     
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'message' => $lang->get('admin_logs_cleaned_success'),
-            'deleted_count' => $totalDeleted,
-        ),
-        'encode'
-    );
-    break;
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'message' => $lang->get('admin_logs_cleaned_success'),
+                'deleted_count' => $totalDeleted,
+            ),
+            'encode'
+        );
+        break;
 
-// ========================================
-// QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY)
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - TEST ENCRYPTION (KEPT FOR COMPATIBILITY)
+    // ========================================
 
-case 'test_encryption':
-    /**
+    case 'test_encryption':
+        /**
      * Test encryption system integrity
      * 
      * @return array {
@@ -3208,117 +3208,117 @@ 
      * }
      */
     
-    try {
-        // Test string
-        $testString = 'TeamPass Encryption Test ' . time();
+        try {
+            // Test string
+            $testString = 'TeamPass Encryption Test ' . time();
         
-        // Get encryption key
-        $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']);
+            // Get encryption key
+            $key = file_get_contents($SETTINGS['securepath'] . DIRECTORY_SEPARATOR . $SETTINGS['securefile']);
         
-        if ($key === false) {
-            throw new Exception($lang->get('admin_encryption_key_not_found'));
-        }
+            if ($key === false) {
+                throw new Exception($lang->get('admin_encryption_key_not_found'));
+            }
         
-        // Use Defuse encryption (TeamPass's current encryption method)
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php';
-        require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php';
+            // Use Defuse encryption (TeamPass's current encryption method)
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/EnvironmentIsBrokenException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/BadFormatException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Exception/WrongKeyOrModifiedCiphertextException.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Crypto.php';
+            require_once $SETTINGS['cpassman_dir'] . '/vendor/defuse/php-encryption/src/Key.php';
         
-        $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key);
+            $encryptionKey = \Defuse\Crypto\Key::loadFromAsciiSafeString($key);
         
-        // Encrypt test string
-        $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey);
+            // Encrypt test string
+            $encrypted = \Defuse\Crypto\Crypto::encrypt($testString, $encryptionKey);
         
-        // Decrypt test string
-        $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey);
+            // Decrypt test string
+            $decrypted = \Defuse\Crypto\Crypto::decrypt($encrypted, $encryptionKey);
         
-        // Verify
-        if ($decrypted !== $testString) {
-            throw new Exception($lang->get('admin_encryption_test_failed'));
-        }
+            // Verify
+            if ($decrypted !== $testString) {
+                throw new Exception($lang->get('admin_encryption_test_failed'));
+            }
         
-        // Log the test
-        logEvents(
-            $SETTINGS,
-            'admin_action',
-            'test_encryption',
-            (string) $session->get('user-id'),
-            $session->get('user-login'),
-            'Encryption test successful'
-        );
+            // Log the test
+            logEvents(
+                $SETTINGS,
+                'admin_action',
+                'test_encryption',
+                (string) $session->get('user-id'),
+                $session->get('user-login'),
+                'Encryption test successful'
+            );
         
-        echo prepareExchangedData(
-            array(
-                'error' => false,
-                'message' => $lang->get('admin_encryption_test_success'),
-            ),
-            'encode'
-        );
+            echo prepareExchangedData(
+                array(
+                    'error' => false,
+                    'message' => $lang->get('admin_encryption_test_success'),
+                ),
+                'encode'
+            );
         
-    } catch (Exception $e) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $e->getMessage(),
-            ),
-            'encode'
-        );
-    }
-    break;
+        } catch (Exception $e) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $e->getMessage(),
+                ),
+                'encode'
+            );
+        }
+        break;
 
-// ========================================
-// QUICK ACTIONS - EXPORT STATISTICS
-// ========================================
+    // ========================================
+    // QUICK ACTIONS - EXPORT STATISTICS
+    // ========================================
 
-case 'export_statistics':
-    /**
+    case 'export_statistics':
+        /**
      * Export statistics as CSV file
      * 
      * @return void (file download)
      */
     
-    // Set headers for CSV download
-    header('Content-Type: text/csv; charset=utf-8');
-    header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"');
+        // Set headers for CSV download
+        header('Content-Type: text/csv; charset=utf-8');
+        header('Content-Disposition: attachment; filename="teampass_statistics_' . date('Y-m-d_H-i-s') . '.csv"');
     
-    // Create output stream
-    $output = fopen('php://output', 'w');
+        // Create output stream
+        $output = fopen('php://output', 'w');
     
-    // Write CSV headers
-    fputcsv($output, array(
-        $lang->get('admin_export_metric'),
-        $lang->get('admin_export_value'),
-    ));
+        // Write CSV headers
+        fputcsv($output, array(
+            $lang->get('admin_export_metric'),
+            $lang->get('admin_export_value'),
+        ));
     
-    // Gather statistics
-    $stats = array(
-        $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'),
-        $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'),
-        $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')),
-        $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)),
-    );
+        // Gather statistics
+        $stats = array(
+            $lang->get('active_users') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('users') . ' WHERE disabled = 0'),
+            $lang->get('total_items') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('items') . ' WHERE inactif = 0'),
+            $lang->get('total_folders') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('nested_tree')),
+            $lang->get('logs_24h') => DB::queryFirstField('SELECT COUNT(*) FROM ' . prefixTable('log_items') . ' WHERE date > ' . (time() - 86400)),
+        );
     
-    // Write statistics
-    foreach ($stats as $metric => $value) {
-        fputcsv($output, array($metric, $value));
-    }
+        // Write statistics
+        foreach ($stats as $metric => $value) {
+            fputcsv($output, array($metric, $value));
+        }
     
-    fclose($output);
+        fclose($output);
     
-    // Log the export
-    logEvents(
-        $SETTINGS,
-        'admin_action',
-        'export_statistics',
-        (string) $session->get('user-id'),
-        $session->get('user-login'),
-        'Statistics exported'
-    );
+        // Log the export
+        logEvents(
+            $SETTINGS,
+            'admin_action',
+            'export_statistics',
+            (string) $session->get('user-id'),
+            $session->get('user-login'),
+            'Statistics exported'
+        );
     
-    exit;
-    break;
+        exit;
+        break;
     
 }
 

sources/main.functions.php

Spacing +224 added lines, -226 removed lines

@@ -99,19 +99,19 @@ 
             $text = Crypto::decrypt($message, $key);
         }
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
-        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Wrong key or modified ciphertext: '.$ex->getMessage());
         $err = 'wrong_key_or_modified_ciphertext';
     } catch (CryptoException\BadFormatException $ex) {
-        error_log('TEAMPASS-Error-Bad format exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Bad format exception: '.$ex->getMessage());
         $err = 'bad_format';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-IO: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-IO: '.$ex->getMessage());
         $err = 'io_error';
     } catch (Exception $ex) {
-        error_log('TEAMPASS-Error-Unexpected exception: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Unexpected exception: '.$ex->getMessage());
         $err = 'unexpected_error';
     }
 
@@ -196,7 +196,7 @@ 
  */
 function trimElement($chaine, string $element): string
 {
-    if (! empty($chaine)) {
+    if (!empty($chaine)) {
         if (is_array($chaine) === true) {
             $chaine = implode(';', $chaine);
         }
@@ -244,8 +244,8 @@ 
  */
 function db_error_handler(array $params): void
 {
-    echo 'Error: ' . $params['error'] . "<br>\n";
-    echo 'Query: ' . $params['query'] . "<br>\n";
+    echo 'Error: '.$params['error']."<br>\n";
+    echo 'Query: '.$params['query']."<br>\n";
     throw new Exception('Error - Query', 1);
 }
 
@@ -319,7 +319,7 @@ 
     $session->set('user-forbiden_personal_folders', []);
     
     // Get list of Folders
-    $rows = DB::query('SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i', 0);
+    $rows = DB::query('SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i', 0);
     foreach ($rows as $record) {
         array_push($groupesVisibles, $record['id']);
     }
@@ -328,20 +328,20 @@ 
     // get complete list of ROLES
     $tmp = array_filter(explode(';', $idFonctions !== null ? $idFonctions : ''));
     $rows = DB::query(
-        'SELECT * FROM ' . prefixTable('roles_title') . '
+        'SELECT * FROM '.prefixTable('roles_title').'
         ORDER BY title ASC'
     );
     foreach ($rows as $record) {
-        if (! empty($record['id']) && ! in_array($record['id'], $tmp)) {
+        if (!empty($record['id']) && !in_array($record['id'], $tmp)) {
             array_push($tmp, $record['id']);
         }
     }
     $session->set('user-roles', implode(';', $tmp));
     $session->set('user-admin', 1);
     // Check if admin has created Folders and Roles
-    DB::query('SELECT * FROM ' . prefixTable('nested_tree') . '');
+    DB::query('SELECT * FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::query('SELECT * FROM ' . prefixTable('roles_title'));
+    DB::query('SELECT * FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
 
     return true;
@@ -424,7 +424,7 @@ 
     // Does this user is allowed to see other items
     $inc = 0;
     $rows = DB::query(
-        'SELECT id, id_tree FROM ' . prefixTable('items') . '
+        'SELECT id, id_tree FROM '.prefixTable('items').'
             WHERE restricted_to LIKE %ss AND inactif = %s'.
             (count($allowedFolders) > 0 ? ' AND id_tree NOT IN ('.implode(',', $allowedFolders).')' : ''),
         $globalsUserId,
@@ -441,8 +441,8 @@ 
     // Check for the users roles if some specific rights exist on items
     $rows = DB::query(
         'SELECT i.id_tree, r.item_id
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('restriction_to_roles') . ' as r ON (r.item_id=i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('restriction_to_roles').' as r ON (r.item_id=i.id)
         WHERE i.id_tree <> "" '.
         (count($userRoles) > 0 ? 'AND r.role_id IN %li ' : '').
         'ORDER BY i.id_tree ASC',
@@ -486,18 +486,18 @@ 
     $session->set('system-list_restricted_folders_for_items', $restrictedFoldersForItems);
     $session->set('user-forbiden_personal_folders', $noAccessPersonalFolders);
     // Folders and Roles numbers
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('nested_tree') . '');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('nested_tree').'');
     $session->set('user-nb_folders', DB::count());
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
-    DB::queryFirstRow('SELECT id FROM ' . prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
+    DB::queryFirstRow('SELECT id FROM '.prefixTable('roles_title'));
     $session->set('user-nb_roles', DB::count());
     // check if change proposals on User's items
     if (isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1) {
         $countNewItems = DB::query(
             'SELECT COUNT(*)
-            FROM ' . prefixTable('items_change') . ' AS c
-            LEFT JOIN ' . prefixTable('log_items') . ' AS i ON (c.item_id = i.id_item)
+            FROM ' . prefixTable('items_change').' AS c
+            LEFT JOIN ' . prefixTable('log_items').' AS i ON (c.item_id = i.id_item)
             WHERE i.action = %s AND i.id_user = %i',
             'at_creation',
             $globalsUserId
@@ -524,7 +524,7 @@ 
 {
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('roles_values') . '
+        FROM ' . prefixTable('roles_values').'
         WHERE type IN %ls'.(count($userRoles) > 0 ? ' AND role_id IN %li' : ''),
         ['W', 'ND', 'NE', 'NDNE', 'R'],
         $userRoles,
@@ -591,7 +591,7 @@ 
     ) {
         $persoFld = DB::queryFirstRow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND personal_folder = %i'.
             (count($allowedFolders) > 0 ? ' AND id NOT IN ('.implode(',', $allowedFolders).')' : ''),
             $globalsUserId,
@@ -624,7 +624,7 @@ 
     }
     $persoFlds = DB::query(
         'SELECT id
-        FROM ' . prefixTable('nested_tree') . '
+        FROM ' . prefixTable('nested_tree').'
         WHERE %l',
         $where
     );
@@ -692,12 +692,12 @@ 
     //Load Tree
     $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
     // truncate table
-    DB::query('TRUNCATE TABLE ' . prefixTable('cache'));
+    DB::query('TRUNCATE TABLE '.prefixTable('cache'));
     // reload date
     $rows = DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         AND l.action = %s
         AND i.inactif = %i',
         'at_creation',
@@ -709,18 +709,18 @@ 
             $tags = '';
             $itemTags = DB::query(
                 'SELECT tag
-                FROM ' . prefixTable('tags') . '
+                FROM ' . prefixTable('tags').'
                 WHERE item_id = %i AND tag != ""',
                 $record['id']
             );
             foreach ($itemTags as $itemTag) {
-                $tags .= $itemTag['tag'] . ' ';
+                $tags .= $itemTag['tag'].' ';
             }
 
             // Get renewal period
             $resNT = DB::queryFirstRow(
                 'SELECT renewal_period
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE id = %i',
                 $record['id_tree']
             );
@@ -733,7 +733,7 @@ 
                     // Is this a User id?
                     $user = DB::queryFirstRow(
                         'SELECT login
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE id = %i',
                         $elem->title
                     );
@@ -751,11 +751,11 @@ 
                     'id' => $record['id'],
                     'label' => $record['label'],
                     'description' => $record['description'] ?? '',
-                    'url' => isset($record['url']) && ! empty($record['url']) ? $record['url'] : '0',
+                    'url' => isset($record['url']) && !empty($record['url']) ? $record['url'] : '0',
                     'tags' => $tags,
                     'id_tree' => $record['id_tree'],
                     'perso' => $record['perso'],
-                    'restricted_to' => isset($record['restricted_to']) && ! empty($record['restricted_to']) ? $record['restricted_to'] : '0',
+                    'restricted_to' => isset($record['restricted_to']) && !empty($record['restricted_to']) ? $record['restricted_to'] : '0',
                     'login' => $record['login'] ?? '',
                     'folder' => implode(' » ', $folder),
                     'author' => $record['id_user'],
@@ -784,7 +784,7 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT label, description, id_tree, perso, restricted_to, login, url
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id=%i',
         $ident
     );
@@ -792,12 +792,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -808,7 +808,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -826,10 +826,10 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => $tags,
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => $data['perso'],
-            'restricted_to' => isset($data['restricted_to']) && ! empty($data['restricted_to']) ? $data['restricted_to'] : '0',
+            'restricted_to' => isset($data['restricted_to']) && !empty($data['restricted_to']) ? $data['restricted_to'] : '0',
             'login' => $data['login'] ?? '',
             'folder' => implode(' » ', $folder),
             'author' => $session->get('user-id'),
@@ -859,8 +859,8 @@ 
     // get new value from db
     $data = DB::queryFirstRow(
         'SELECT i.label, i.description, i.id_tree as id_tree, i.perso, i.restricted_to, i.id, i.login, i.url, l.date
-        FROM ' . prefixTable('items') . ' as i
-        INNER JOIN ' . prefixTable('log_items') . ' as l ON (l.id_item = i.id)
+        FROM ' . prefixTable('items').' as i
+        INNER JOIN ' . prefixTable('log_items').' as l ON (l.id_item = i.id)
         WHERE i.id = %i
         AND l.action = %s',
         $ident,
@@ -870,12 +870,12 @@ 
     $tags = '';
     $itemTags = DB::query(
         'SELECT tag
-            FROM ' . prefixTable('tags') . '
+            FROM ' . prefixTable('tags').'
             WHERE item_id = %i AND tag != ""',
         $ident
     );
     foreach ($itemTags as $itemTag) {
-        $tags .= $itemTag['tag'] . ' ';
+        $tags .= $itemTag['tag'].' ';
     }
     // form id_tree to full foldername
     $folder = [];
@@ -886,7 +886,7 @@ 
             // Is this a User id?
             $user = DB::queryFirstRow(
                 'SELECT id, login
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $elem->title
             );
@@ -905,7 +905,7 @@ 
             'label' => $data['label'],
             'description' => $data['description'],
             'tags' => empty($tags) === false ? $tags : 'None',
-            'url' => isset($data['url']) && ! empty($data['url']) ? $data['url'] : '0',
+            'url' => isset($data['url']) && !empty($data['url']) ? $data['url'] : '0',
             'id_tree' => $data['id_tree'],
             'perso' => isset($data['perso']) && empty($data['perso']) === false && $data['perso'] !== 'None' ? $data['perso'] : '0',
             'restricted_to' => isset($data['restricted_to']) && empty($data['restricted_to']) === false ? $data['restricted_to'] : '0',
@@ -927,53 +927,53 @@ 
 function getStatisticsData(array $SETTINGS): array
 {
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         0
     );
     $counter_folders = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('nested_tree') . ' WHERE personal_folder = %i',
+        'SELECT id FROM '.prefixTable('nested_tree').' WHERE personal_folder = %i',
         1
     );
     $counter_folders_perso = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         0
     );
     $counter_items = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('items') . ' WHERE perso = %i',
+        'SELECT id FROM '.prefixTable('items').' WHERE perso = %i',
         1
     );
     $counter_items_perso = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE login NOT IN (%s, %s, %s)',
+        'SELECT id FROM '.prefixTable('users').' WHERE login NOT IN (%s, %s, %s)',
         'OTV', 'TP', 'API'
     );
     $counter_users = DB::count();
         DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE admin = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE admin = %i',
         1
     );
     $admins = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE gestionnaire = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE gestionnaire = %i',
         1
     );
     $managers = DB::count();
     DB::query(
-        'SELECT id FROM ' . prefixTable('users') . ' WHERE read_only = %i',
+        'SELECT id FROM '.prefixTable('users').' WHERE read_only = %i',
         1
     );
     $readOnly = DB::count();
     // list the languages
     $usedLang = [];
     $tp_languages = DB::query(
-        'SELECT name FROM ' . prefixTable('languages')
+        'SELECT name FROM '.prefixTable('languages')
     );
     foreach ($tp_languages as $tp_language) {
         DB::query(
-            'SELECT * FROM ' . prefixTable('users') . ' WHERE user_language = %s',
+            'SELECT * FROM '.prefixTable('users').' WHERE user_language = %s',
             $tp_language['name']
         );
         $usedLang[$tp_language['name']] = round((DB::count() * 100 / $counter_users), 0);
@@ -982,12 +982,12 @@ 
     // get list of ips
     $usedIp = [];
     $tp_ips = DB::query(
-        'SELECT user_ip FROM ' . prefixTable('users')
+        'SELECT user_ip FROM '.prefixTable('users')
     );
     foreach ($tp_ips as $ip) {
         if (array_key_exists($ip['user_ip'], $usedIp)) {
             $usedIp[$ip['user_ip']] += $usedIp[$ip['user_ip']];
-        } elseif (! empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
+        } elseif (!empty($ip['user_ip']) && $ip['user_ip'] !== 'none') {
             $usedIp[$ip['user_ip']] = 1;
         }
     }
@@ -1082,7 +1082,7 @@ 
         <table width="600" cellpadding="0" cellspacing="0" border="0" class="container" bgcolor="#ffffff" style="border-spacing: 0; border-bottom: 1px solid #e0e0e0; box-shadow: 0 0 3px #ddd; color: #434343; font-family: Helvetica, Verdana, sans-serif;">
         <tr><td class="container-padding" bgcolor="#ffffff" style="border-collapse: collapse; border-left: 1px solid #e0e0e0; background-color: #ffffff; padding-left: 30px; padding-right: 30px;">
         <br><div style="float:right;">' .
-        $textMail .
+        $textMail.
         '<br><br></td></tr></table>
     </td></tr></table>
     <br></body></html>';
@@ -1163,7 +1163,7 @@ 
 {
     array_walk_recursive(
         $array,
-        static function (&$item): void {
+        static function(&$item): void {
             if (mb_detect_encoding((string) $item, 'utf-8', true) === false) {
                 $item = mb_convert_encoding($item, 'ISO-8859-1', 'UTF-8');
             }
@@ -1274,7 +1274,7 @@ 
  */
 function prefixTable(string $table): string
 {
-    $safeTable = htmlspecialchars(DB_PREFIX . $table);
+    $safeTable = htmlspecialchars(DB_PREFIX.$table);
     return $safeTable;
 }
 
@@ -1391,7 +1391,7 @@ 
 function send_syslog($message, $host, $port, $component = 'teampass'): void
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-    $syslog_message = '<123>' . date('M d H:i:s ') . $component . ': ' . $message;
+    $syslog_message = '<123>'.date('M d H:i:s ').$component.': '.$message;
     socket_sendto($sock, (string) $syslog_message, strlen($syslog_message), 0, (string) $host, (int) $port);
     socket_close($sock);
 }
@@ -1438,14 +1438,14 @@ 
     if (isset($SETTINGS['syslog_enable']) === true && (int) $SETTINGS['syslog_enable'] === 1) {
         if ($type === 'user_mngt') {
             send_syslog(
-                'action=' . str_replace('at_', '', $label) . ' attribute=user user=' . $who . ' userid="' . $login . '" change="' . $field_1 . '" ',
+                'action='.str_replace('at_', '', $label).' attribute=user user='.$who.' userid="'.$login.'" change="'.$field_1.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
             );
         } else {
             send_syslog(
-                'action=' . $type . ' attribute=' . $label . ' user=' . $who . ' userid="' . $login . '" ',
+                'action='.$type.' attribute='.$label.' user='.$who.' userid="'.$login.'" ',
                 $SETTINGS['syslog_host'],
                 $SETTINGS['syslog_port'],
                 'teampass'
@@ -1520,7 +1520,7 @@ 
         if (empty($item_label) === true) {
             $dataItem = DB::queryFirstRow(
                 'SELECT id, id_tree, label
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE id = %i',
                 $item_id
             );
@@ -1528,11 +1528,11 @@ 
         }
 
         send_syslog(
-            'action=' . str_replace('at_', '', $action) .
-                ' attribute=' . str_replace('at_', '', $attribute[0]) .
-                ' itemno=' . $item_id .
-                ' user=' . (is_null($login) === true ? '' : addslashes((string) $login)) .
-                ' itemname="' . addslashes($item_label) . '"',
+            'action='.str_replace('at_', '', $action).
+                ' attribute='.str_replace('at_', '', $attribute[0]).
+                ' itemno='.$item_id.
+                ' user='.(is_null($login) === true ? '' : addslashes((string) $login)).
+                ' itemname="'.addslashes($item_label).'"',
             $SETTINGS['syslog_host'],
             $SETTINGS['syslog_port'],
             'teampass'
@@ -1563,8 +1563,8 @@ 
     // send email to user that what to be notified
     $notification = DB::queryFirstField(
         'SELECT email
-        FROM ' . prefixTable('notification') . ' AS n
-        INNER JOIN ' . prefixTable('users') . ' AS u ON (n.user_id = u.id)
+        FROM ' . prefixTable('notification').' AS n
+        INNER JOIN ' . prefixTable('users').' AS u ON (n.user_id = u.id)
         WHERE n.item_id = %i AND n.user_id != %i',
         $item_id,
         $globalsUserId
@@ -1575,7 +1575,7 @@ 
         // Get list of changes
         $htmlChanges = '<ul>';
         foreach ($changes as $change) {
-            $htmlChanges .= '<li>' . $change . '</li>';
+            $htmlChanges .= '<li>'.$change.'</li>';
         }
         $htmlChanges .= '</ul>';
         // send email
@@ -1612,15 +1612,15 @@ 
     $path = '';
     foreach ($arbo as $elem) {
         if (empty($path) === true) {
-            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES) . ' ';
+            $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES).' ';
         } else {
-            $path .= '&#8594; ' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+            $path .= '&#8594; '.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
         }
     }
 
     // Build text to show user
     if (empty($label) === false) {
-        return empty($path) === true ? addslashes($label) : addslashes($label) . ' (' . $path . ')';
+        return empty($path) === true ? addslashes($label) : addslashes($label).' ('.$path.')';
     }
     return empty($path) === true ? '' : $path;
 }
@@ -1676,7 +1676,7 @@ 
 {
     // Perform a copy if the file exists
     if (file_exists($configFilePath)) {
-        $backupFilePath = $configFilePath . '.' . date('Y_m_d_His', time());
+        $backupFilePath = $configFilePath.'.'.date('Y_m_d_His', time());
         if (!copy($configFilePath, $backupFilePath)) {
             return "ERROR: Could not copy file '$configFilePath'";
         }
@@ -1684,10 +1684,10 @@ 
 
     // Regenerate the config file
     $data = ["<?php\n", "global \$SETTINGS;\n", "\$SETTINGS = array (\n"];
-    $rows = DB::query('SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s', 'admin');
+    $rows = DB::query('SELECT * FROM '.prefixTable('misc').' WHERE type=%s', 'admin');
     foreach ($rows as $record) {
         $value = getEncryptedValue($record['valeur'], $record['is_encrypted']);
-        $data[] = "    '{$record['intitule']}' => '". htmlspecialchars_decode($value, ENT_COMPAT) . "',\n";
+        $data[] = "    '{$record['intitule']}' => '".htmlspecialchars_decode($value, ENT_COMPAT)."',\n";
     }
     $data[] = ");\n";
     $data = array_unique($data);
@@ -1732,7 +1732,7 @@ 
 {
     global $SETTINGS;
     /* LOAD CPASSMAN SETTINGS */
-    if (! isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
+    if (!isset($SETTINGS['loaded']) || $SETTINGS['loaded'] !== 1) {
         $SETTINGS = [];
         $SETTINGS['duplicate_folder'] = 0;
         //by default, this is set to 0;
@@ -1742,7 +1742,7 @@ 
         //by default, this value is set to 5;
         $settings = [];
         $rows = DB::query(
-            'SELECT * FROM ' . prefixTable('misc') . ' WHERE type=%s_type OR type=%s_type2',
+            'SELECT * FROM '.prefixTable('misc').' WHERE type=%s_type OR type=%s_type2',
             [
                 'type' => 'admin',
                 'type2' => 'settings',
@@ -1774,7 +1774,7 @@ 
     $source_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $source_id
     );
@@ -1785,7 +1785,7 @@ 
     $target_cf = [];
     $rows = DB::query(
         'SELECT id_category
-            FROM ' . prefixTable('categories_folders') . '
+            FROM ' . prefixTable('categories_folders').'
             WHERE id_folder = %i',
         $target_id
     );
@@ -1880,10 +1880,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -1915,10 +1915,10 @@ 
     } catch (CryptoException\WrongKeyOrModifiedCiphertextException $ex) {
         $err = 'wrong_key';
     } catch (CryptoException\EnvironmentIsBrokenException $ex) {
-        error_log('TEAMPASS-Error-Environment: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-Environment: '.$ex->getMessage());
         $err = 'environment_error';
     } catch (CryptoException\IOException $ex) {
-        error_log('TEAMPASS-Error-General: ' . $ex->getMessage());
+        error_log('TEAMPASS-Error-General: '.$ex->getMessage());
         $err = 'general_error';
     }
 
@@ -2004,7 +2004,7 @@ 
 ) {
     // Check if the path exists
     $path = basename($path);
-    if (! file_exists($path)) {
+    if (!file_exists($path)) {
         return false;
     }
 
@@ -2057,7 +2057,7 @@ 
     // Load item data
     $data = DB::queryFirstRow(
         'SELECT id_tree
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE id = %i',
         $item_id
     );
@@ -2120,7 +2120,7 @@ 
         }
         $host .= substr(explode(".", $email[1])[0], -1, 1);
     }
-    $email = $name . "@" . $host . "." . explode(".", $email[1])[1];
+    $email = $name."@".$host.".".explode(".", $email[1])[1];
     return $email;
 }
 
@@ -2151,11 +2151,11 @@ 
 function formatSizeUnits(int $bytes): string
 {
     if ($bytes >= 1073741824) {
-        $bytes = number_format($bytes / 1073741824, 2) . ' GB';
+        $bytes = number_format($bytes / 1073741824, 2).' GB';
     } elseif ($bytes >= 1048576) {
-        $bytes = number_format($bytes / 1048576, 2) . ' MB';
+        $bytes = number_format($bytes / 1048576, 2).' MB';
     } elseif ($bytes >= 1024) {
-        $bytes = number_format($bytes / 1024, 2) . ' KB';
+        $bytes = number_format($bytes / 1024, 2).' KB';
     } elseif ($bytes > 1) {
         $bytes .= ' bytes';
     } elseif ($bytes === 1) {
@@ -2322,7 +2322,7 @@ 
  */
 function generateKeyIntegrityHash(string $userSeed, string $publicKey, string $serverSecret): string
 {
-    return hash_hmac('sha256', $userSeed . $publicKey, $serverSecret);
+    return hash_hmac('sha256', $userSeed.$publicKey, $serverSecret);
 }
 
 /**
@@ -2397,7 +2397,7 @@ 
                 'security_alert',
                 'key_integrity_check_failed',
                 (string) $userInfo['id'],
-                'User: ' . $userInfo['login']
+                'User: '.$userInfo['login']
             );
             return [
                 'success' => false,
@@ -2444,7 +2444,7 @@ 
             'user_connection',
             'auto_reencryption_success',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login']
+            'User: '.$userInfo['login']
         );
 
         // Store in session for immediate use
@@ -2463,12 +2463,12 @@ 
             'security_alert',
             'auto_reencryption_failed',
             (string) $userInfo['id'],
-            'User: ' . $userInfo['login'] . ' - Error: ' . $e->getMessage()
+            'User: '.$userInfo['login'].' - Error: '.$e->getMessage()
         );
 
         return [
             'success' => false,
-            'error' => 'decryption_failed: ' . $e->getMessage(),
+            'error' => 'decryption_failed: '.$e->getMessage(),
             'private_key_clear' => '',
         ];
     }
@@ -2539,7 +2539,7 @@ 
         'security_alert',
         'auto_reencryption_critical_failure',
         (string) $userId,
-        'User: ' . $userInfo['login'] . ' - disabled due to key recovery failure'
+        'User: '.$userInfo['login'].' - disabled due to key recovery failure'
     );
 
     return false;
@@ -2697,7 +2697,7 @@ 
     $cipher->enableContinuousBuffer();
 
     // Encrypt the file content
-    $filePath = filter_var($fileInPath . '/' . $fileInName, FILTER_SANITIZE_URL);
+    $filePath = filter_var($fileInPath.'/'.$fileInName, FILTER_SANITIZE_URL);
     $fileContent = file_get_contents($filePath);
     $plaintext = $fileContent;
     $ciphertext = $cipher->encrypt($plaintext);
@@ -2705,9 +2705,9 @@ 
     // Save new file
     // deepcode ignore InsecureHash: is simply used to get a unique name
     $hash = uniqid('', true);
-    $fileOut = $fileInPath . '/' . TP_FILE_PREFIX . $hash;
+    $fileOut = $fileInPath.'/'.TP_FILE_PREFIX.$hash;
     file_put_contents($fileOut, $ciphertext);
-    unlink($fileInPath . '/' . $fileInName);
+    unlink($fileInPath.'/'.$fileInName);
     return [
         'fileHash' => base64_encode($hash),
         'objectKey' => base64_encode($objectKey),
@@ -2723,9 +2723,9 @@ 
  *
  * @return string|array
  */
-function decryptFile(string $fileName, string $filePath, string $key): string|array
+function decryptFile(string $fileName, string $filePath, string $key): string | array
 {
-    if (! defined('FILE_BUFFER_SIZE')) {
+    if (!defined('FILE_BUFFER_SIZE')) {
         define('FILE_BUFFER_SIZE', 128 * 1024);
     }
     
@@ -2742,7 +2742,7 @@ 
     $cipher->enableContinuousBuffer();
     $cipher->disablePadding();
     // Get file content
-    $safeFilePath = realpath($filePath . '/' . TP_FILE_PREFIX . $safeFileName);
+    $safeFilePath = realpath($filePath.'/'.TP_FILE_PREFIX.$safeFileName);
     if ($safeFilePath !== false && file_exists($safeFilePath)) {
         $ciphertext = file_get_contents(filter_var($safeFilePath, FILTER_SANITIZE_URL));
     } else {
@@ -2838,7 +2838,7 @@ 
     }
     $users = DB::query(
         'SELECT id, public_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id NOT IN %li
         AND public_key != ""',
         $user_ids
@@ -2847,7 +2847,7 @@ 
         // Insert in DB the new object key for this item by user
         if (count($objectKeyArray) === 0) {
             if (WIP === true) {
-                error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id']);
+                error_log('TEAMPASS Debug - storeUsersShareKey case1 - '.$object_name.' - '.$post_object_id.' - '.$user['id']);
             }
             
             insertOrUpdateSharekey(
@@ -2859,7 +2859,7 @@ 
         } else {
             foreach ($objectKeyArray as $object) {
                 if (WIP === true) {
-                    error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id']);
+                    error_log('TEAMPASS Debug - storeUsersShareKey case2 - '.$object_name.' - '.$object['objectId'].' - '.$user['id']);
                 }
                 
                 insertOrUpdateSharekey(
@@ -2891,7 +2891,7 @@ 
 ): bool {
     try {
         DB::query(
-            'INSERT INTO ' . $tableName . ' 
+            'INSERT INTO '.$tableName.' 
             (object_id, user_id, share_key) 
             VALUES (%i, %i, %s)
             ON DUPLICATE KEY UPDATE share_key = VALUES(share_key)',
@@ -2901,7 +2901,7 @@ 
         );
         return true;
     } catch (Exception $e) {
-        error_log('TEAMPASS Error - insertOrUpdateSharekey: ' . $e->getMessage());
+        error_log('TEAMPASS Error - insertOrUpdateSharekey: '.$e->getMessage());
         return false;
     }
 }
@@ -2916,7 +2916,7 @@ 
 function isBase64(string $str): bool
 {
     $str = (string) trim($str);
-    if (! isset($str[0])) {
+    if (!isset($str[0])) {
         return false;
     }
 
@@ -2990,7 +2990,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         }
         // deepcode ignore ServerLeak: No important data is sent
         echo 'An error occurred.';
@@ -3007,7 +3007,7 @@ 
     } catch (\LdapRecord\Auth\BindException $e) {
         $error = $e->getDetailedError();
         if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+            error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
         }
         // deepcode ignore ServerLeak: No important data is sent
         echo 'An error occurred.';
@@ -3043,7 +3043,7 @@ 
     // expect if personal item
     DB::delete(
         prefixTable('sharekeys_items'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)'',
         $userId
     );
     // Remove all item sharekeys files
@@ -3067,7 +3067,7 @@ 
     // Remove all item sharekeys suggestions
     DB::delete(
         prefixTable('sharekeys_suggestions'),
-        'user_id = %i',// AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
+        'user_id = %i', // AND object_id NOT IN (SELECT i.id FROM ' . prefixTable('items') . ' AS i WHERE i.perso = 1)',
         $userId
     );
     return false;
@@ -3088,7 +3088,7 @@ 
         foreach (DateTimeZone::listIdentifiers() as $timezone) {
             $now->setTimezone(new DateTimeZone($timezone));
             $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            $timezones[$timezone] = '('.format_GMT_offset($offset).') '.format_timezone_name($timezone);
         }
 
         array_multisort($offsets, $timezones);
@@ -3108,7 +3108,7 @@ 
 {
     $hours = intval($offset / 3600);
     $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+    return 'GMT'.($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
 }
 
 /**
@@ -3207,8 +3207,7 @@ 
 {
     if (isset($array[$key]) === true
         && (is_int($value) === true ?
-            (int) $array[$key] === $value :
-            (string) $array[$key] === $value)
+            (int) $array[$key] === $value : (string) $array[$key] === $value)
     ) {
         return true;
     }
@@ -3230,8 +3229,7 @@ 
 {
     if (isset($var) === false
         || (is_int($value) === true ?
-            (int) $var === $value :
-            (string) $var === $value)
+            (int) $var === $value : (string) $var === $value)
     ) {
         return true;
     }
@@ -3282,7 +3280,7 @@ 
  */
 function isSetArrayOfValues(array $arrayOfValues): bool
 {
-    foreach($arrayOfValues as $value) {
+    foreach ($arrayOfValues as $value) {
         if (isset($value) === false) {
             return false;
         }
@@ -3304,7 +3302,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable !== $value) {
             return false;
         }
@@ -3324,7 +3322,7 @@ 
     /*PHP8 - integer|string*/$value
 ) : bool
 {
-    foreach($arrayOfVars as $variable) {
+    foreach ($arrayOfVars as $variable) {
         if ($variable === $value) {
             return true;
         }
@@ -3338,7 +3336,7 @@ 
  * @param string|int|null $value
  * @return boolean
  */
-function isValueSetNullEmpty(string|int|null $value) : bool
+function isValueSetNullEmpty(string | int | null $value) : bool
 {
     if (is_null($value) === true || empty($value) === true) {
         return true;
@@ -3393,7 +3391,7 @@ 
  * @param array     $filters
  * @return array|string
  */
-function dataSanitizer(array $data, array $filters): array|string
+function dataSanitizer(array $data, array $filters): array | string
 {
     // Load Sanitizer library
     $sanitizer = new Sanitizer($data, $filters);
@@ -3422,7 +3420,7 @@ 
     // Exists ?
     $userCacheId = DB::queryFirstRow(
         'SELECT increment_id
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $user_id
     );
@@ -3473,7 +3471,7 @@ 
  */
 function pourcentage(float $nombre, float $total, float $pourcentage): float
 { 
-    $resultat = ($nombre/$total) * $pourcentage;
+    $resultat = ($nombre / $total) * $pourcentage;
     return round($resultat);
 }
 
@@ -3503,7 +3501,7 @@ 
 
     // Get last folder update
     $lastFolderChange = DB::queryFirstRow(
-        'SELECT valeur FROM ' . prefixTable('misc') . '
+        'SELECT valeur FROM '.prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'timestamp',
         'last_folder_change'
@@ -3524,7 +3522,7 @@ 
     // Does this user has a tree cache
     $userCacheTree = DB::queryFirstRow(
         'SELECT '.$fieldName.'
-        FROM ' . prefixTable('cache_tree') . '
+        FROM ' . prefixTable('cache_tree').'
         WHERE user_id = %i',
         $session->get('user-id')
     );
@@ -3562,7 +3560,7 @@ 
     if (count($folderIds) === 0) {
         $folderIds = DB::queryFirstColumn(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE personal_folder=%i',
             0
         );
@@ -3579,8 +3577,8 @@ 
         $rows_tmp = DB::query(
             'SELECT c.id, c.title, c.level, c.type, c.masked, c.order, c.encrypted_data, c.role_visibility, c.is_mandatory,
             f.id_category AS category_id
-            FROM ' . prefixTable('categories_folders') . ' AS f
-            INNER JOIN ' . prefixTable('categories') . ' AS c ON (f.id_category = c.parent_id)
+            FROM ' . prefixTable('categories_folders').' AS f
+            INNER JOIN ' . prefixTable('categories').' AS c ON (f.id_category = c.parent_id)
             WHERE id_folder=%i',
             $folder
         );
@@ -3606,7 +3604,7 @@ 
         $valTemp = '';
         $data = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule=%i',
             'complex',
             $folder
@@ -3623,14 +3621,14 @@ 
         $valTemp = '';
         $rows_tmp = DB::query(
             'SELECT t.title
-            FROM ' . prefixTable('roles_values') . ' as v
-            INNER JOIN ' . prefixTable('roles_title') . ' as t ON (v.role_id = t.id)
+            FROM ' . prefixTable('roles_values').' as v
+            INNER JOIN ' . prefixTable('roles_title').' as t ON (v.role_id = t.id)
             WHERE v.folder_id = %i
             GROUP BY title',
             $folder
         );
         foreach ($rows_tmp as $record) {
-            $valTemp .= (empty($valTemp) === true ? '' : ' - ') . $record['title'];
+            $valTemp .= (empty($valTemp) === true ? '' : ' - ').$record['title'];
         }
         $arr_data['visibilityRoles'] = $valTemp;
 
@@ -3663,7 +3661,7 @@ 
         // loop on users and check if user has this role
         $rows = DB::query(
             'SELECT id, fonction_id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id != %i AND admin = 0 AND fonction_id IS NOT NULL AND fonction_id != ""',
             $session->get('user-id')
         );
@@ -3695,7 +3693,7 @@ 
 
     $val = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -3711,12 +3709,12 @@ 
 function upgradeRequired(): bool
 {
     // Get settings.php
-    include_once __DIR__. '/../includes/config/settings.php';
+    include_once __DIR__.'/../includes/config/settings.php';
 
     // Get timestamp in DB
     $val = DB::queryFirstRow(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s',
         'admin',
         'upgrade_timestamp'
@@ -3769,7 +3767,7 @@ 
     // prepapre background tasks for item keys generation        
     $userTP = DB::queryFirstRow(
         'SELECT pw, public_key, private_key
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         TP_USER_ID
     );
@@ -3830,7 +3828,7 @@ 
     }
 
     // Generate new keys
-    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false){
+    if ($user_self_change === true && empty($recovery_public_key) === false && empty($recovery_private_key) === false) {
         $userKeys = [
             'public_key' => $recovery_public_key,
             'private_key_clear' => $recovery_private_key,
@@ -3881,8 +3879,8 @@ 
             'process_type' => 'create_user_keys',
             'arguments' => json_encode([
                 'new_user_id' => (int) $userId,
-                'new_user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '','encrypt')['string'],
+                'new_user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'new_user_code' => cryption(empty($encryptionKey) === true ? uniqidReal(20) : $encryptionKey, '', 'encrypt')['string'],
                 'owner_id' => (int) TP_USER_ID,
                 'creator_pwd' => $userTP['pw'],
                 'send_email' => $sendEmailToUser === true ? 1 : 0,
@@ -3954,19 +3952,19 @@ 
 
     // Prepare the subtask queries
     $queries = [
-        'step20' => 'SELECT * FROM ' . prefixTable('items'),
+        'step20' => 'SELECT * FROM '.prefixTable('items'),
 
-        'step30' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'step30' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'step40' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'step40' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'step50' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'step50' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'step60' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'step60' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks
@@ -4156,7 +4154,7 @@ 
  */
 function createTaskForItem(
     string $processType,
-    string|array $taskName,
+    string | array $taskName,
     int $itemId,
     int $userId,
     string $objectKey,
@@ -4180,7 +4178,7 @@ 
                 'object_key' => $objectKey,
                 'author' => (int) $userId,
             ]),
-            'item_id' => (int) $parentId !== -1 ?  $parentId : null,
+            'item_id' => (int) $parentId !== -1 ? $parentId : null,
         )
     );
     $processId = DB::insertId();
@@ -4190,7 +4188,7 @@ 
     if (is_array($taskName) === false) {
         $taskName = [$taskName];
     }
-    foreach($taskName as $task) {
+    foreach ($taskName as $task) {
         if (WIP === true) error_log('createTaskForItem - task: '.$task);
         switch ($task) {
             case 'item_password':
@@ -4287,7 +4285,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id=0)
+function purgeUnnecessaryKeys(bool $allUsers = true, int $user_id = 0)
 {
     if ($allUsers === true) {
         // Load class DB
@@ -4297,7 +4295,7 @@ 
 
         $users = DB::query(
             'SELECT id
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
             ORDER BY login ASC'
         );
@@ -4315,7 +4313,7 @@ 
  * @param integer $user_id
  * @return void
  */
-function purgeUnnecessaryKeysForUser(int $user_id=0)
+function purgeUnnecessaryKeysForUser(int $user_id = 0)
 {
     if ($user_id === 0) {
         return;
@@ -4326,8 +4324,8 @@ 
 
     $personalItems = DB::queryFirstColumn(
         'SELECT id
-        FROM ' . prefixTable('items') . ' AS i
-        INNER JOIN ' . prefixTable('log_items') . ' AS li ON li.id_item = i.id
+        FROM ' . prefixTable('items').' AS i
+        INNER JOIN ' . prefixTable('log_items').' AS li ON li.id_item = i.id
         WHERE i.perso = 1 AND li.action = "at_creation" AND li.id_user IN (%i, '.TP_USER_ID.')',
         $user_id
     );
@@ -4337,28 +4335,28 @@ 
             prefixTable('sharekeys_items'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Files keys
         DB::delete(
             prefixTable('sharekeys_files'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Fields keys
         DB::delete(
             prefixTable('sharekeys_fields'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
         // Logs keys
         DB::delete(
             prefixTable('sharekeys_logs'),
             'object_id IN %li AND user_id NOT IN %ls',
             $personalItems,
-            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+            [$user_id, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
         );
     }
 }
@@ -4376,7 +4374,7 @@ 
     // Check if user exists
     $userInfo = DB::queryFirstRow(
         'SELECT login
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4385,7 +4383,7 @@ 
         $now = (int) time();
         // Prepare file content
         $export_value = file_get_contents(__DIR__."/../includes/core/teampass_ascii.txt")."\n".
-            "Generation date: ".date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now)."\n\n".
+            "Generation date: ".date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now)."\n\n".
             "RECOVERY KEYS - Not to be shared - To be store safely\n\n".
             "Public Key:\n".$session->get('user-public_key')."\n\n".
             "Private Key:\n".$session->get('user-private_key')."\n\n";
@@ -4408,7 +4406,7 @@ 
         return prepareExchangedData(
             array(
                 'error' => false,
-                'datetime' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $now),
+                'datetime' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $now),
                 'timestamp' => $now,
                 'content' => base64_encode($export_value),
                 'login' => $userInfo['login'],
@@ -4434,8 +4432,8 @@ 
  */
 function loadClasses(string $className = ''): void
 {
-    require_once __DIR__. '/../includes/config/include.php';
-    require_once __DIR__. '/../includes/config/settings.php';
+    require_once __DIR__.'/../includes/config/include.php';
+    require_once __DIR__.'/../includes/config/settings.php';
     require_once __DIR__.'/../vendor/autoload.php';
 
     if (defined('DB_PASSWD_CLEAR') === false) {
@@ -4648,7 +4646,7 @@ 
 
     // Get current user hash
     $userHash = DB::queryFirstRow(
-        "SELECT pw FROM " . prefixtable('users') . " WHERE id = %d;",
+        "SELECT pw FROM ".prefixtable('users')." WHERE id = %d;",
         $session->get('user-id')
     )['pw'];
 
@@ -4696,11 +4694,11 @@ 
         }
         
         // Alternative: serialize ou json selon le contexte
-        return get_class($value) . (method_exists($value, 'getId') ? '#' . $value->getId() : '');
+        return get_class($value).(method_exists($value, 'getId') ? '#'.$value->getId() : '');
     }
     
     if (is_resource($value)) {
-        return 'Resource#' . get_resource_id($value) . ' of type ' . get_resource_type($value);
+        return 'Resource#'.get_resource_id($value).' of type '.get_resource_type($value);
     }
     
     // Cas par défaut
@@ -4720,7 +4718,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4731,8 +4729,8 @@ 
     // Get file info
     $file = DB::queryFirstRow(
         'SELECT f.id_item, i.id_tree
-        FROM ' . prefixTable('files') . ' as f
-        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
+        FROM ' . prefixTable('files').' as f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
         WHERE f.id = %i',
         $fileId
     );
@@ -4741,7 +4739,7 @@ 
     }
 
     // Check if user has access to the item
-    include_once __DIR__. '/items.queries.php';
+    include_once __DIR__.'/items.queries.php';
     $itemAccess = getCurrentAccessRights(
         (int) filter_var($userId, FILTER_SANITIZE_NUMBER_INT),
         (int) filter_var($file['id_item'], FILTER_SANITIZE_NUMBER_INT),
@@ -4774,7 +4772,7 @@ 
     // Refuse access if user does not exist and/or is not admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4785,7 +4783,7 @@ 
     // Ensure that user has performed the backup
     DB::queryFirstRow(
         'SELECT f.id
-        FROM ' . prefixTable('log_system') . ' as f
+        FROM ' . prefixTable('log_system').' as f
         WHERE f.type = %s AND f.label = %s AND f.qui = %i AND f.field_1 = %s',
         'admin_action',
         'dataBase backup',
@@ -4812,7 +4810,7 @@ 
     // Refuse access if user does not exist and/or is admin
     $user = DB::queryFirstRow(
         'SELECT admin
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $userId
     );
@@ -4823,7 +4821,7 @@ 
     // Get item info
     $item = DB::queryFirstRow(
         'SELECT i.perso, i.id_tree
-        FROM ' . prefixTable('items') . ' as i
+        FROM ' . prefixTable('items').' as i
         WHERE i.id = %i',
         $itemId
     );
@@ -4834,7 +4832,7 @@ 
     // Get item owner
     $itemOwner = DB::queryFirstRow(
         'SELECT li.id_user
-        FROM ' . prefixTable('log_items') . ' as li
+        FROM ' . prefixTable('log_items').' as li
         WHERE li.id_item = %i AND li.action = %s',
         $itemId,
         'at_creation'
@@ -4848,25 +4846,25 @@ 
         prefixTable('sharekeys_items'),
         'object_id = %i AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_files'),
         'object_id IN (SELECT id FROM '.prefixTable('files').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_fields'),
         'object_id IN (SELECT id FROM '.prefixTable('fields').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
     DB::delete(
         prefixTable('sharekeys_logs'),
         'object_id IN (SELECT id FROM '.prefixTable('log_items').' WHERE id_item = %i) AND user_id NOT IN %ls',
         $itemId,
-        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID,SSH_USER_ID]
+        [$userId, TP_USER_ID, API_USER_ID, OTV_USER_ID, SSH_USER_ID]
     );
 
     return true;
@@ -4938,7 +4936,7 @@ 
     
     // 2. Check if user actually has personal items to migrate
     $personalFolderId = DB::queryFirstField(
-        "SELECT id FROM ".prefixTable('nested_tree') ."
+        "SELECT id FROM ".prefixTable('nested_tree')."
          WHERE personal_folder = 1 
          AND title = %s",
         $userId
@@ -5018,8 +5016,8 @@ 
             'process_type' => 'migrate_user_personal_items',
             'arguments' => json_encode([
                 'user_id' => (int) $userId,
-                'user_pwd' => cryption($passwordClear, '','encrypt')['string'],
-                'user_private_key' => cryption($privateKeyDecrypted, '','encrypt')['string'],
+                'user_pwd' => cryption($passwordClear, '', 'encrypt')['string'],
+                'user_private_key' => cryption($privateKeyDecrypted, '', 'encrypt')['string'],
                 'personal_folders_ids' => $personalFolderIds,
             ]),
             'is_in_progress' => 0,
@@ -5048,19 +5046,19 @@ 
 {
     // Prepare the subtask queries
     $queries = [
-        'user-personal-items-migration-step10' => 'SELECT * FROM ' . prefixTable('items'),
+        'user-personal-items-migration-step10' => 'SELECT * FROM '.prefixTable('items'),
 
-        'user-personal-items-migration-step20' => 'SELECT * FROM ' . prefixTable('log_items') . 
+        'user-personal-items-migration-step20' => 'SELECT * FROM '.prefixTable('log_items'). 
                     ' WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step30' => 'SELECT * FROM ' . prefixTable('categories_items') . 
+        'user-personal-items-migration-step30' => 'SELECT * FROM '.prefixTable('categories_items'). 
                     ' WHERE encryption_type = "teampass_aes"',
 
-        'user-personal-items-migration-step40' => 'SELECT * FROM ' . prefixTable('suggestion'),
+        'user-personal-items-migration-step40' => 'SELECT * FROM '.prefixTable('suggestion'),
 
-        'user-personal-items-migration-step50' => 'SELECT * FROM ' . prefixTable('files') . ' AS f
-                        INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-                        WHERE f.status = "' . TP_ENCRYPTION_NAME . '"'
+        'user-personal-items-migration-step50' => 'SELECT * FROM '.prefixTable('files').' AS f
+                        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+                        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"'
     ];
 
     // Perform loop on $queries to create sub-tasks
@@ -5093,7 +5091,7 @@ 
 {
     // 1. Insert or update the item with current timestamp
     DB::query(
-        'INSERT INTO ' . prefixTable('users_latest_items') . ' (user_id, item_id, accessed_at)
+        'INSERT INTO '.prefixTable('users_latest_items').' (user_id, item_id, accessed_at)
         VALUES (%i, %i, NOW())
         ON DUPLICATE KEY UPDATE accessed_at = NOW()',
         $userId,
@@ -5102,12 +5100,12 @@ 
     
     // 2. Keep only the 20 most recent items (delete older ones)
     DB::query(
-        'DELETE FROM ' . prefixTable('users_latest_items') . '
+        'DELETE FROM '.prefixTable('users_latest_items').'
         WHERE user_id = %i
         AND increment_id NOT IN (
             SELECT increment_id FROM (
                 SELECT increment_id 
-                FROM ' . prefixTable('users_latest_items') . '
+                FROM ' . prefixTable('users_latest_items').'
                 WHERE user_id = %i
                 ORDER BY accessed_at DESC
                 LIMIT 20
@@ -5153,14 +5151,14 @@ 
          GROUP_CONCAT(DISTINCT CASE WHEN ur.source = "ad" THEN ur.role_id END ORDER BY ur.role_id SEPARATOR ";") AS roles_from_ad_groups,
          GROUP_CONCAT(DISTINCT uf.item_id ORDER BY uf.created_at SEPARATOR ";") AS favourites,
          GROUP_CONCAT(DISTINCT ul.item_id ORDER BY ul.accessed_at DESC SEPARATOR ";") AS latest_items
-        FROM ' . prefixTable('users') . ' AS u
-        LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
-        LEFT JOIN ' . prefixTable('users_groups') . ' AS ug ON (u.id = ug.user_id)
-        LEFT JOIN ' . prefixTable('users_groups_forbidden') . ' AS ugf ON (u.id = ugf.user_id)
-        LEFT JOIN ' . prefixTable('users_roles') . ' AS ur ON (u.id = ur.user_id)
-        LEFT JOIN ' . prefixTable('users_favorites') . ' AS uf ON (u.id = uf.user_id)
-        LEFT JOIN ' . prefixTable('users_latest_items') . ' AS ul ON (u.id = ul.user_id)
-        WHERE ' . $whereClause . '
+        FROM ' . prefixTable('users').' AS u
+        LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
+        LEFT JOIN ' . prefixTable('users_groups').' AS ug ON (u.id = ug.user_id)
+        LEFT JOIN ' . prefixTable('users_groups_forbidden').' AS ugf ON (u.id = ugf.user_id)
+        LEFT JOIN ' . prefixTable('users_roles').' AS ur ON (u.id = ur.user_id)
+        LEFT JOIN ' . prefixTable('users_favorites').' AS uf ON (u.id = uf.user_id)
+        LEFT JOIN ' . prefixTable('users_latest_items').' AS ul ON (u.id = ul.user_id)
+        WHERE ' . $whereClause.'
         GROUP BY u.id',
         $whereParam
     );
@@ -5175,7 +5173,7 @@ 
         $data['latest_items'] = $data['latest_items'] ?? '';
     }
     
-    return $data;//secureOutput($data, $antiXss);
+    return $data; //secureOutput($data, $antiXss);
 }
 
 
@@ -5190,7 +5188,7 @@ 
 function addUserGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_groups') . ' (user_id, group_id)
+        'INSERT IGNORE INTO '.prefixTable('users_groups').' (user_id, group_id)
         VALUES (%i, %i)',
         $userId,
         $groupId
@@ -5203,7 +5201,7 @@ 
 function removeUserGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups') . '
+        'DELETE FROM '.prefixTable('users_groups').'
         WHERE user_id = %i AND group_id = %i',
         $userId,
         $groupId
@@ -5220,7 +5218,7 @@ 
 {
     // Delete all existing groups
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_groups').' WHERE user_id = %i',
         $userId
     );
     
@@ -5240,7 +5238,7 @@ 
 function getUserGroups(int $userId): array
 {
     $result = DB::query(
-        'SELECT group_id FROM ' . prefixTable('users_groups') . ' 
+        'SELECT group_id FROM '.prefixTable('users_groups').' 
         WHERE user_id = %i ORDER BY group_id',
         $userId
     );
@@ -5257,7 +5255,7 @@ 
 function addUserForbiddenGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_groups_forbidden') . ' (user_id, group_id)
+        'INSERT IGNORE INTO '.prefixTable('users_groups_forbidden').' (user_id, group_id)
         VALUES (%i, %i)',
         $userId,
         $groupId
@@ -5270,7 +5268,7 @@ 
 function removeUserForbiddenGroup(int $userId, int $groupId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups_forbidden') . '
+        'DELETE FROM '.prefixTable('users_groups_forbidden').'
         WHERE user_id = %i AND group_id = %i',
         $userId,
         $groupId
@@ -5283,7 +5281,7 @@ 
 function setUserForbiddenGroups(int $userId, array $groupIds): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_groups_forbidden') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_groups_forbidden').' WHERE user_id = %i',
         $userId
     );
     
@@ -5300,7 +5298,7 @@ 
 function getUserForbiddenGroups(int $userId): array
 {
     $result = DB::query(
-        'SELECT group_id FROM ' . prefixTable('users_groups_forbidden') . ' 
+        'SELECT group_id FROM '.prefixTable('users_groups_forbidden').' 
         WHERE user_id = %i ORDER BY group_id',
         $userId
     );
@@ -5319,7 +5317,7 @@ 
 function addUserRole(int $userId, int $roleId, string $source = 'manual'): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_roles') . ' (user_id, role_id, source)
+        'INSERT IGNORE INTO '.prefixTable('users_roles').' (user_id, role_id, source)
         VALUES (%i, %i, %s)',
         $userId,
         $roleId,
@@ -5333,7 +5331,7 @@ 
 function removeUserRole(int $userId, int $roleId, string $source = 'manual'): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_roles') . '
+        'DELETE FROM '.prefixTable('users_roles').'
         WHERE user_id = %i AND role_id = %i AND source = %s',
         $userId,
         $roleId,
@@ -5347,7 +5345,7 @@ 
 function removeUserRolesBySource(int $userId, string $source): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_roles') . '
+        'DELETE FROM '.prefixTable('users_roles').'
         WHERE user_id = %i AND source = %s',
         $userId,
         $source
@@ -5381,14 +5379,14 @@ 
 {
     if ($source !== null) {
         $result = DB::query(
-            'SELECT role_id FROM ' . prefixTable('users_roles') . ' 
+            'SELECT role_id FROM '.prefixTable('users_roles').' 
             WHERE user_id = %i AND source = %s ORDER BY role_id',
             $userId,
             $source
         );
     } else {
         $result = DB::query(
-            'SELECT role_id FROM ' . prefixTable('users_roles') . ' 
+            'SELECT role_id FROM '.prefixTable('users_roles').' 
             WHERE user_id = %i ORDER BY role_id',
             $userId
         );
@@ -5406,7 +5404,7 @@ 
 function addUserFavorite(int $userId, int $itemId): void
 {
     DB::query(
-        'INSERT IGNORE INTO ' . prefixTable('users_favorites') . ' (user_id, item_id)
+        'INSERT IGNORE INTO '.prefixTable('users_favorites').' (user_id, item_id)
         VALUES (%i, %i)',
         $userId,
         $itemId
@@ -5419,7 +5417,7 @@ 
 function removeUserFavorite(int $userId, int $itemId): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_favorites') . '
+        'DELETE FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId
@@ -5432,7 +5430,7 @@ 
 function toggleUserFavorite(int $userId, int $itemId): bool
 {
     $exists = DB::queryFirstRow(
-        'SELECT increment_id FROM ' . prefixTable('users_favorites') . '
+        'SELECT increment_id FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId
@@ -5453,7 +5451,7 @@ 
 function setUserFavorites(int $userId, array $itemIds): void
 {
     DB::query(
-        'DELETE FROM ' . prefixTable('users_favorites') . ' WHERE user_id = %i',
+        'DELETE FROM '.prefixTable('users_favorites').' WHERE user_id = %i',
         $userId
     );
     
@@ -5470,7 +5468,7 @@ 
 function getUserFavorites(int $userId): array
 {
     $result = DB::query(
-        'SELECT item_id FROM ' . prefixTable('users_favorites') . ' 
+        'SELECT item_id FROM '.prefixTable('users_favorites').' 
         WHERE user_id = %i ORDER BY created_at DESC',
         $userId
     );
@@ -5483,7 +5481,7 @@ 
 function isUserFavorite(int $userId, int $itemId): bool
 {
     $result = DB::queryFirstRow(
-        'SELECT increment_id FROM ' . prefixTable('users_favorites') . '
+        'SELECT increment_id FROM '.prefixTable('users_favorites').'
         WHERE user_id = %i AND item_id = %i',
         $userId,
         $itemId

pages/items.php

Spacing +34 added lines, -34 removed lines

@@ -69,7 +69,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;
 }
 // Define Timezone
@@ -90,7 +90,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $userLoginSafe = htmlspecialchars($record['login'], ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
     $usersList[$userLoginSafe] = [
@@ -102,16 +102,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
 foreach ($rows as $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 
@@ -186,7 +186,7 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -255,7 +255,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -285,7 +285,7 @@ 
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
                                 </div>
                                 <small class='form-text text-muted'>
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                                 </small>
                             </div>
 
@@ -473,39 +473,39 @@ 
                             <div class="tab-pane" id="tab_4">
                                 <div id="form-item-field" class="hidden">
                                     <?php
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
                                         if (isset($session_item_fields) === true) {
                                             foreach ($session_item_fields as $category) {
                                                 //print_r($category);
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                     if (!empty($field['regex'])) {
                                                         echo '
-                                                    <div>Regex: '. $field['regex'] .'</div>
+                                                    <div>Regex: '. $field['regex'].'</div>
                                                         ';
                                                     }
                                                 }
@@ -516,8 +516,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -527,8 +527,8 @@ 
                                         } else {
                                             echo
                                             '<div class="alert alert-info">
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
-                                                ' . $lang->get('no_fields') . '
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
+                                                ' . $lang->get('no_fields').'
                                             </div>';
                                         } ?>
                                 </div>
@@ -669,7 +669,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         $lang->get('otv_message')
     );
                             ?></p>
@@ -687,9 +687,9 @@ 
 
                     <div class="row">
                         <div class="form-group col-4">
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
                             <div class="input-group mb-3">
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
                             </div>
                         </div>
 
@@ -777,7 +777,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -795,14 +795,14 @@ 
                             <label><?php echo $lang->get('icon'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                         <div class="form-group">
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                     </div>
@@ -1263,18 +1263,18 @@ 
                                 <?php
                                     foreach ($session_item_fields as $elem) {
                                         echo '
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                                    <h5>' . $elem['title'] . '</h5>
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                                    <h5>' . $elem['title'].'</h5>
                                     <p>
                                         <ul class="list-group list-group-unbordered mb-3">';
                                         foreach ($elem['fields'] as $field) {
                                             echo '
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
-                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'] . '">
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
+                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'].'">
                                                     <i class="fa-solid fa-copy"></i>
                                                 </button>
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                             </li>';
                                         }
                                         echo '