nilsteampassnet / TeamPass

pages/import.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     || isset($SETTINGS['allow_import']) === false || (int) $SETTINGS['allow_import'] !== 1) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -183,7 +183,7 @@ 
                                         <?php
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
 echo $complexitySelect;
                                         ?>

pages/import.js.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -1043,7 +1043,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
+                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
 
                                         // XSS Filtering :
                                         $('#import-feedback-progress-text').text(itemsList[0].Title);

sources/import.queries.php

Indentation +1 added lines, -1 removed lines

@@ -1364,4 +1364,4 @@
     $string = str_replace("{%}", "?", $string);
     // Trim and return.
     return trim($string);
-  }
+    }

Spacing +33 added lines, -33 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -167,7 +167,7 @@ 
         );
 
         // Initialisation
-        $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur'];
+        $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur'];
         $importation_possible = true;
         $valuesToImport = [];
         $items_number = 0;
@@ -224,26 +224,26 @@ 
                 'ISO-8859-1',
                 'ISO-8859-15',
                 'Windows-1252',
-                'Windows-1251',  // Cyrillique
-                'CP1251',        // Cyrillique alternatif
-                'KOI8-R',        // Cyrillique russe
-                'Shift_JIS',     // Japonais
-                'EUC-JP',        // Japonais
-                'ISO-2022-JP',   // Japonais
-                'TIS-620',       // Thaï
-                'Windows-874',   // Thaï Windows
-                'Big5',          // Chinois traditionnel
-                'GB2312',        // Chinois simplifié
-                'GBK',           // Chinois simplifié étendu
-                'EUC-KR',        // Coréen
-                'ISO-8859-2',    // Europe centrale
-                'ISO-8859-5',    // Cyrillique ISO
-                'ISO-8859-7',    // Grec
-                'Windows-1250',  // Europe centrale
-                'Windows-1253',  // Grec
-                'Windows-1254',  // Turc
-                'Windows-1255',  // Hébreu
-                'Windows-1256',  // Arabe
+                'Windows-1251', // Cyrillique
+                'CP1251', // Cyrillique alternatif
+                'KOI8-R', // Cyrillique russe
+                'Shift_JIS', // Japonais
+                'EUC-JP', // Japonais
+                'ISO-2022-JP', // Japonais
+                'TIS-620', // Thaï
+                'Windows-874', // Thaï Windows
+                'Big5', // Chinois traditionnel
+                'GB2312', // Chinois simplifié
+                'GBK', // Chinois simplifié étendu
+                'EUC-KR', // Coréen
+                'ISO-8859-2', // Europe centrale
+                'ISO-8859-5', // Cyrillique ISO
+                'ISO-8859-7', // Grec
+                'Windows-1250', // Europe centrale
+                'Windows-1253', // Grec
+                'Windows-1254', // Turc
+                'Windows-1255', // Hébreu
+                'Windows-1256', // Arabe
             ];
             
             // Get the list of encodings supported by the system
@@ -286,7 +286,7 @@ 
 
         // Get the data and ensure columns are correctly mapped
         $interpreter = new Interpreter();
-        $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) {
+        $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
             $rowData = array_combine($header, $row);
 
             if ($rowData !== false) {
@@ -339,7 +339,7 @@ 
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label . " " . $comments;
+                $comment .= " ".$label." ".$comments;
             } else {
                 // Insert previous line if changing line
                 if (!empty($label)) {
@@ -348,7 +348,7 @@ 
                     // Insert in batch
                     $batchInsert[] = array(
                         'label'        => $label,
-                        'description'  => $comment . $comments,
+                        'description'  => $comment.$comments,
                         'pwd'          => $pwd,
                         'url'          => $url,
                         'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -379,7 +379,7 @@ 
             // Insert in batch
             $batchInsert[] = array(
                 'label'        => $label,
-                'description'  => $comment . $comments,
+                'description'  => $comment.$comments,
                 'pwd'          => $pwd,
                 'url'          => $url,
                 'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -403,10 +403,10 @@ 
             $values = [];
         
             foreach ($batchInsert as $data) {
-                $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')";
+                $values[] = "('".implode("','", array_map('addslashes', $data))."')";
             }
         
-            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values);
+            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values);
             
             DB::query($sql);
         }
@@ -489,7 +489,7 @@ 
             $parentId = $dataReceived['folderId']; // Strating with provided folder
 
             foreach ($parts as $part) {
-                $currentPath = trim($currentPath . "/" . $part, "/");
+                $currentPath = trim($currentPath."/".$part, "/");
                 $currentFolder = $part;
 
                 // Check if this folder has already been created
@@ -550,7 +550,7 @@ 
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -1072,7 +1072,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -1143,7 +1143,7 @@ 
         DB::startTransaction();
 
         // Import all items
-        foreach($post_items as $item) {
+        foreach ($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -1368,7 +1368,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

scripts/traits/UserHandlerTrait.php

Braces +9 added lines, -3 removed lines

@@ -54,13 +54,17 @@ 
         );
     
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}");
+            if (LOG_TASKS=== true) {
+                $this->logger->log("No subtask was found for task {$this->taskId}");
+            }
             return;
         }
     
         // Process each subtask
         foreach ($subtasks as $subtask) {
-            if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            if (LOG_TASKS=== true) {
+                $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            }
             $this->processGenerateUserKeysSubtask($subtask, $arguments);
         }
     
@@ -97,7 +101,9 @@ 
                 $subtask['increment_id']
             );
             
-            if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            if (LOG_TASKS=== true) {
+                $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            }
             switch ($taskData['step'] ?? '') {
                 case 'step0':
                     $this->generateNewUserStep0($arguments);

Spacing +29 added lines, -29 removed lines

@@ -50,24 +50,24 @@ 
     private function generateUserKeys($arguments) {
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("No subtask was found for task {$this->taskId}");
             return;
         }
     
         // Process each subtask
         foreach ($subtasks as $subtask) {
-            if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
             $this->processGenerateUserKeysSubtask($subtask, $arguments);
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );    
         if ($remainingSubtasks == 0) {
@@ -98,7 +98,7 @@ 
                 $subtask['increment_id']
             );
             
-            if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            if (LOG_TASKS === true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
             switch ($taskData['step'] ?? '') {
                 case 'step0':
                     $this->generateNewUserStep0($arguments);
@@ -152,7 +152,7 @@ 
                 $subtask['increment_id']
             );
             
-            $this->logger->log("Subtask {$subtask['increment_id']} failure: " . $e->getMessage(), 'ERROR');
+            $this->logger->log("Subtask {$subtask['increment_id']} failure: ".$e->getMessage(), 'ERROR');
         }
     }
     
@@ -186,7 +186,7 @@ 
         // Loop on items
         $rows = DB::query(
             'SELECT id, pw, perso
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso =  %i
             ORDER BY id ASC
             LIMIT %i, %i',
@@ -199,7 +199,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id']
@@ -226,7 +226,7 @@ 
             
             $currentUserKey = DB::queryFirstRow(
                 'SELECT increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['new_user_id']
@@ -276,16 +276,16 @@ 
         // Loop on logs
         $rows = DB::query(
             'SELECT increment_id
-            FROM ' . prefixTable('log_items') . '
+            FROM ' . prefixTable('log_items').'
             WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
             ORDER BY increment_id ASC
-            LIMIT ' . $taskData['index'] . ', ' . $taskData['nb']
+            LIMIT ' . $taskData['index'].', '.$taskData['nb']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_logs') . '
+                FROM ' . prefixTable('sharekeys_logs').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['increment_id'],
                 $arguments['owner_id']
@@ -317,7 +317,7 @@ 
                 if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $arguments['new_user_id']
@@ -358,7 +358,7 @@ 
         // Loop on fields
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('categories_items') . '
+            FROM ' . prefixTable('categories_items').'
             WHERE encryption_type = "teampass_aes"
             ORDER BY id ASC
             LIMIT %i, %i',
@@ -369,7 +369,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_fields') . '
+                FROM ' . prefixTable('sharekeys_fields').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['owner_id']
@@ -397,7 +397,7 @@ 
                     if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) {
                         $currentUserKey = DB::queryFirstRow(
                             'SELECT increment_id
-                            FROM ' . prefixTable('sharekeys_items') . '
+                            FROM ' . prefixTable('sharekeys_items').'
                             WHERE object_id = %i AND user_id = %i',
                             $record['id'],
                             $arguments['new_user_id']
@@ -439,7 +439,7 @@ 
         // Loop on suggestions
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('suggestion') . '
+            FROM ' . prefixTable('suggestion').'
             ORDER BY id ASC
             LIMIT %i, %i',
             $taskData['index'],
@@ -449,7 +449,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_suggestions') . '
+                FROM ' . prefixTable('sharekeys_suggestions').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['owner_id']
@@ -481,7 +481,7 @@ 
                 if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $arguments['new_user_id']
@@ -522,9 +522,9 @@ 
         // Loop on files
         $rows = DB::query(
             'SELECT f.id AS id, i.perso AS perso
-            FROM ' . prefixTable('files') . ' AS f
-            INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-            WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
+            FROM ' . prefixTable('files').' AS f
+            INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+            WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
             LIMIT %i, %i',
             $taskData['index'],
             $taskData['nb']
@@ -533,7 +533,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_files') . '
+                FROM ' . prefixTable('sharekeys_files').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id']
@@ -561,7 +561,7 @@ 
 
             $currentUserKey = DB::queryFirstRow(
                 'SELECT increment_id
-                FROM ' . prefixTable('sharekeys_files') . '
+                FROM ' . prefixTable('sharekeys_files').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['new_user_id']
@@ -623,7 +623,7 @@ 
         // get user info
         $userInfo = DB::queryFirstRow(
             'SELECT email, login, auth_type, special, lastname, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $arguments['new_user_id']
         );
@@ -638,10 +638,10 @@ 
                 filter_var($userInfo['email'], FILTER_SANITIZE_EMAIL),
                 // @scrutinizer ignore-type
                 empty($arguments['email_body']) === false ? $arguments['email_body'] : $lang->get('email_body_user_config_1'),
-                'TEAMPASS - ' . $lang->get('login_credentials'),
+                'TEAMPASS - '.$lang->get('login_credentials'),
                 (array) filter_var_array(
                     [
-                        '#code#' => cryption($arguments['new_user_code'], '','decrypt', $this->settings)['string'],
+                        '#code#' => cryption($arguments['new_user_code'], '', 'decrypt', $this->settings)['string'],
                         '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                         '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
                     ],
@@ -677,13 +677,13 @@ 
     private function getOwnerInfos(int $owner_id, string $owner_pwd) {
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $owner_id
         );
 
         // decrypt owner password
-        $pwd = cryption($owner_pwd, '','decrypt', $this->settings)['string'];
+        $pwd = cryption($owner_pwd, '', 'decrypt', $this->settings)['string'];
         // decrypt private key and send back
         return [
             'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),

scripts/traits/ItemHandlerTrait.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
         // Generate keys for user passwords   
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
@@ -49,8 +49,8 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
-        foreach($taskData['files_keys'] as $file) {
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        foreach ($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_files'),
                 0,
@@ -70,9 +70,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
-        foreach($arguments['fields_keys'] as $field) {
-            $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        foreach ($arguments['fields_keys'] as $field) {
+            $this->logger->log('Processing generateUserFieldKeys for: '.$field['object_id'], 'DEBUG');
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),
                 0,

Braces +9 added lines, -3 removed lines

@@ -29,7 +29,9 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         // Generate keys for user passwords   
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
@@ -49,7 +51,9 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        }
         foreach($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_files'),
@@ -70,7 +74,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         foreach($arguments['fields_keys'] as $field) {
             $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
             storeUsersShareKey(

scripts/task_maintenance_users_personal_folder.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
     //get through all users with enabled personnal folder.
     $users = DB::query(
         'SELECT id, login, email
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
         AND personal_folder = 1
         ORDER BY login ASC'
@@ -89,7 +89,7 @@ 
         //if folder doesn't exist then create it
         $data = DB::queryFirstRow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND parent_id = %i',
             $user['id'],
             0

scripts/background_tasks___do_calculation.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
     // get count of Items in this folder
     $get = DB::queryFirstRow(
         'SELECT count(*) as num_results
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE inactif = %i AND id_tree = %i',
         0,
         $child->id
@@ -81,14 +81,14 @@ 
     $ret[$child->id]['id'] = $child->id;
 
     // get number of subfolders
-    $nodeDescendants =$tree->getDescendants($child->id, false, false, true);
+    $nodeDescendants = $tree->getDescendants($child->id, false, false, true);
     $ret[$child->id]['subfoldersCount'] = count($nodeDescendants);
 
     // get items number in subfolders
     if (count($nodeDescendants) > 0) {
         $get = DB::queryFirstRow(
             'SELECT count(*) as num_results
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE inactif = %i AND id_tree IN (%l)',
             0,
             implode(',', $nodeDescendants)
@@ -139,7 +139,7 @@ 
     // Get item key
     $itemKey = DB::queryFirstRow(
         'SELECT share_key
-        FROM ' . prefixTable('sharekeys_items') . '
+        FROM ' . prefixTable('sharekeys_items').'
         WHERE user_id = %i AND object_id = %i',
         TP_USER_ID,
         $item['itemId']

sources/logs.datatables.php

Spacing +24 added lines, -26 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": ';
@@ -241,7 +241,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": ';
@@ -314,7 +314,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": ';
@@ -387,7 +387,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": [ ';
@@ -490,7 +490,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": [ ';
@@ -572,7 +572,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": ';
@@ -648,7 +648,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": ';
@@ -717,7 +717,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": ';
@@ -790,7 +790,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": ';
@@ -867,7 +867,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);
@@ -875,7 +875,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": ';
@@ -890,7 +890,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 .= '"'.($record['updated_at'] === '' ? '-' : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['updated_at'])).'", ';
         $sOutput .= '"<div class=\"progress mt-2\"><div class=\"progress-bar\" style=\"width: '.$subtaskProgress.'\">'.$subtaskProgress.'</div></div>", ';
@@ -900,7 +900,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']
             );
@@ -956,7 +956,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);
@@ -964,7 +964,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": ';
@@ -980,13 +980,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
@@ -1009,11 +1008,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
             );
@@ -1029,7 +1027,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
             );
@@ -1063,7 +1061,7 @@ 
 {
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i',
         $id
     );
@@ -1079,5 +1077,5 @@ 
         $i++;
     }
 
-    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0) .'%';
+    return ($finished_nb !== 0 ? pourcentage($finished_nb, $nb, 100) : 0).'%';
 }
\ No newline at end of file

scripts/taskLogger.php

Spacing +2 added lines, -2 removed lines

@@ -47,8 +47,8 @@
      */
     public function log(string $message, string $level = 'INFO') {
         if (!empty($this->settings['enable_tasks_log'])) {
-            $formattedMessage = date($this->settings['date_format'] . ' ' . $this->settings['time_format']) . 
-                                " - [$level] $message" . PHP_EOL;
+            $formattedMessage = date($this->settings['date_format'].' '.$this->settings['time_format']). 
+                                " - [$level] $message".PHP_EOL;
 
             if (!empty($this->logFile)) {
                 // WWrite to the specified log file