nilsteampassnet / TeamPass

sources/folders.class.php

Indentation +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
     private function isParentFolderAllowed($parent_id, $user_accessible_folders, $user_is_admin, $user_can_create_root_folder)
     {
         if ($parent_id == 0 && $user_can_create_root_folder == true)
-	    return true;
+        return true;
 
         if (in_array($parent_id, $user_accessible_folders) === false
             && (int) $user_is_admin !== 1

Braces +6 added lines, -4 removed lines

@@ -112,8 +112,9 @@ 
      */
     private function isParentFolderAllowed($parent_id, $user_accessible_folders, $user_is_admin, $user_can_create_root_folder)
     {
-        if ($parent_id == 0 && $user_can_create_root_folder == true)
-	    return true;
+        if ($parent_id == 0 && $user_can_create_root_folder == true) {
+        	    return true;
+        }
 
         if (in_array($parent_id, $user_accessible_folders) === false
             && (int) $user_is_admin !== 1
@@ -438,8 +439,9 @@ 
             )['count'];
 
             // Don't insert duplicates
-            if ($count > 0)
-                continue;
+            if ($count > 0) {
+                            continue;
+            }
 
             // Insert new background task
             DB::insert(

Spacing +16 added lines, -16 removed lines

@@ -85,7 +85,7 @@ 
 
         $parentComplexity = $this->checkComplexityLevel($parentFolderData, $complexity, $parent_id);
         if (isset($parentComplexity ['error']) && $parentComplexity['error'] === true) {
-            return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder') . " [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]");
+            return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder')." [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]");
         }
 
         return $this->createFolder($params, array_merge($parentFolderData, $parentComplexity), $options);
@@ -138,7 +138,7 @@ 
         ) {
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND personal_folder = 0',
                 $title
             );
@@ -162,7 +162,7 @@ 
         //check if parent folder is personal
         $data = DB::queryfirstrow(
             'SELECT personal_folder, bloquer_creation, bloquer_modification
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $parent_id
         );
@@ -201,7 +201,7 @@ 
             // get complexity level for this folder
             $data = DB::queryfirstrow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %i AND type = %s',
                 $parent_id,
                 'complex'
@@ -262,11 +262,11 @@ 
      */
     private function canCreateFolder($isPersonal, $user_is_admin, $user_is_manager, $user_can_manage_all_users, $user_can_create_root_folder)
     {
-        return (int)$isPersonal === 1 ||
-            (int)$user_is_admin === 1 ||
-            ((int)$user_is_manager === 1 || (int)$user_can_manage_all_users === 1) ||
+        return (int) $isPersonal === 1 ||
+            (int) $user_is_admin === 1 ||
+            ((int) $user_is_manager === 1 || (int) $user_can_manage_all_users === 1) ||
             ($this->settings['enable_user_can_create_folders'] ?? false) ||
-            ((int)$user_can_create_root_folder === 1);
+            ((int) $user_can_create_root_folder === 1);
     }
 
     /**
@@ -346,7 +346,7 @@ 
         $path = '';
         $tree_path = $tree->getPath(0, false);
         foreach ($tree_path as $fld) {
-            $path .= empty($path) ? $fld->title : '/' . $fld->title;
+            $path .= empty($path) ? $fld->title : '/'.$fld->title;
         }
 
         $new_json = [
@@ -360,7 +360,7 @@ 
             "is_visible_active" => 0,
         ];
 
-        $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', (int)$user_id);
+        $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', (int) $user_id);
 
         if (empty($cache_tree)) {
             DB::insert(prefixTable('cache_tree'), [
@@ -380,7 +380,7 @@ 
                 'folders' => json_encode($folders),
                 'visible_folders' => json_encode($visible_folders),
                 'timestamp' => time(),
-            ], 'increment_id = %i', (int)$cache_tree['increment_id']);
+            ], 'increment_id = %i', (int) $cache_tree['increment_id']);
         }
     }
 
@@ -390,7 +390,7 @@ 
     private function manageFolderPermissions($parent_id, $newId, $user_roles, $access_rights, $user_is_admin)
     {
         if ($parent_id !== 0 && $this->settings['subfolder_rights_as_parent'] ?? false) {
-            $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $parent_id);
+            $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $parent_id);
             foreach ($rows as $record) {
                 DB::insert(prefixTable('roles_values'), [
                     'role_id' => $record['role_id'],
@@ -398,7 +398,7 @@ 
                     'type' => $record['type'],
                 ]);
             }
-        } elseif ((int)$user_is_admin !== 1) {
+        } elseif ((int) $user_is_admin !== 1) {
             foreach (array_unique(explode(';', $user_roles)) as $role) {
                 if (!empty($role)) {
                     DB::insert(prefixTable('roles_values'), [
@@ -416,7 +416,7 @@ 
      */
     private function copyCustomFieldsCategories($parent_id, $newId)
     {
-        $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $parent_id);
+        $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $parent_id);
         foreach ($rows as $record) {
             DB::insert(prefixTable('categories_folders'), [
                 'id_category' => $record['id_category'],
@@ -441,7 +441,7 @@ 
             // Search for existing job
             $count = DB::queryFirstRow(
                 'SELECT COUNT(*) AS count
-                FROM ' . prefixTable('background_tasks') . '
+                FROM ' . prefixTable('background_tasks').'
                 WHERE is_in_progress = %i AND process_type = %s AND arguments = %s',
                 0,
                 'user_build_cache_tree',
@@ -475,7 +475,7 @@ 
         return [
             'error' => true,
             'message' => $message,
-            'newId' => '' . $newIdSuffix,
+            'newId' => ''.$newIdSuffix,
         ];
     }
 }

sources/import.queries.php

Spacing +11 added lines, -11 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;
@@ -209,7 +209,7 @@ 
 
         // Observer pour récupérer les données et respecter l'ordre des colonnes
         $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) {
@@ -260,7 +260,7 @@ 
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label;
+                $comment .= " ".$label;
             } else {
                 // Insert previous line if changing line
                 if (!empty($account)) {
@@ -324,10 +324,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);
         }
@@ -410,7 +410,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
@@ -471,7 +471,7 @@ 
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -963,7 +963,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -1034,7 +1034,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',
@@ -1276,7 +1276,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

Indentation +1 added lines, -1 removed lines

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

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);

includes/language/english.php

Indentation +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
  * @see       https://www.teampass.net
  */
 
- // TO REMOVE
- // - selected_items_to_be_imported
+    // TO REMOVE
+    // - selected_items_to_be_imported
 
 return array(
     'import_csv_keys_generation_strategy' => 'Keys generation strategy',

_things/delete_background_tasks___sending_emails.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 $emailService = new EmailService();
 $rows = DB::query(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC LIMIT 0,10',
     0,
@@ -138,7 +138,7 @@ 
     
     //if ((int) $SETTINGS['enable_backlog_mail'] === 1) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -146,7 +146,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );

_things/delete_background_tasks___userKeysCreation_subtaskHdl.php

Spacing +33 added lines, -33 removed lines

@@ -122,7 +122,7 @@ 
 DB::update(
     prefixTable('background_subtasks'),
     array(
-        'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+        'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
         'is_in_progress' => 0,
         'finished_at' => time(),
         'updated_at' => time(),
@@ -158,7 +158,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -271,13 +271,13 @@ 
 {
     $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', $SETTINGS)['string'];
+    $pwd = cryption($owner_pwd, '', 'decrypt', $SETTINGS)['string'];
     // decrypt private key and send back
     return [
         'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),
@@ -317,10 +317,10 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw, perso
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso =  %i
         ORDER BY id ASC
-        LIMIT ' . $post_start . ', ' . $post_length,
+        LIMIT ' . $post_start.', '.$post_length,
         ($extra_arguments['only_personal_items'] ?? 0) === 1 ? 1 : 0
     );
 
@@ -328,7 +328,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 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -355,7 +355,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'],
             $post_user_id
@@ -429,15 +429,15 @@ 
     // 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"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     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'],
             $extra_arguments['owner_id']
@@ -469,7 +469,7 @@ 
             if ((int) $post_user_id !== (int) $extra_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'],
                     $post_user_id
@@ -491,7 +491,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -531,15 +531,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // 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'],
             $extra_arguments['owner_id']
@@ -567,7 +567,7 @@ 
                 if ((int) $post_user_id !== (int) $extra_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'],
                         $post_user_id
@@ -590,7 +590,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -630,14 +630,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // 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'],
             $extra_arguments['owner_id']
@@ -669,7 +669,7 @@ 
             if ((int) $post_user_id !== (int) $extra_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'],
                     $post_user_id
@@ -729,16 +729,16 @@ 
     // 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 . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+        WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // 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 ? $extra_arguments['owner_id'] : $extra_arguments['new_user_id']
@@ -766,7 +766,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'],
             $post_user_id
@@ -797,8 +797,8 @@ 
     // SHould we change step? Finished ?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
     $counter = DB::count();
     $next_start = (int) $post_start + (int) $post_length;
@@ -864,7 +864,7 @@ 
     // get user info
     $userInfo = DB::queryFirstRow(
         'SELECT email, login, auth_type, special, lastname, name
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id = %i',
         $extra_arguments['new_user_id']
     );
@@ -879,10 +879,10 @@ 
             filter_var($userInfo['email'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             // @scrutinizer ignore-type
             empty($extra_arguments['email_body']) === false ? $extra_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($extra_arguments['new_user_code'], '','decrypt', $SETTINGS)['string'],
+                    '#code#' => cryption($extra_arguments['new_user_code'], '', 'decrypt', $SETTINGS)['string'],
                     '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                     '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
                 ],

_things/delete_background_tasks___items_handler.php

Spacing +13 added lines, -13 removed lines

@@ -75,7 +75,7 @@ 
 DB::debugmode(false);
 $process_to_perform = DB::queryFirstRow(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE is_in_progress = %i AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys")
     ORDER BY increment_id ASC',
     1
@@ -93,7 +93,7 @@ 
     // search for next process to handle
     $process_to_perform = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('background_tasks') . '
+        FROM ' . prefixTable('background_tasks').'
         WHERE is_in_progress = %i AND (finished_at = "" OR finished_at IS NULL) AND process_type IN ("item_copy", "new_item", "update_item", "item_update_create_keys")
         ORDER BY increment_id ASC',
         0
@@ -111,7 +111,7 @@ 
             $process_to_perform['increment_id']
         );
 
-        provideLog('[PROCESS][#'. $process_to_perform['increment_id'].'][START]', $SETTINGS);
+        provideLog('[PROCESS][#'.$process_to_perform['increment_id'].'][START]', $SETTINGS);
         handleTask(
             $process_to_perform['increment_id'],
             json_decode($process_to_perform['arguments'], true),
@@ -146,7 +146,7 @@ 
         // Search if there are remaining tasks
         $process_to_perform = DB::queryFirstField(
             'SELECT 1
-            FROM ' . prefixTable('background_tasks') . '
+            FROM ' . prefixTable('background_tasks').'
             WHERE is_in_progress = %i AND process_type IN (
                 "item_copy",
                 "new_item",
@@ -185,10 +185,10 @@ 
  */
 function handleTask(int $processId, array $ProcessArguments, array $SETTINGS, int $itemId = null): bool
 {
-    provideLog('[PROCESS][#'. $processId.'][START]', $SETTINGS);
+    provideLog('[PROCESS][#'.$processId.'][START]', $SETTINGS);
     $task_to_perform = DB::queryFirstRow(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i AND finished_at IS NULL
         ORDER BY increment_id ASC',
         $processId
@@ -202,13 +202,13 @@ 
         // if sub_task_in_progress === 1 then exit
         if ((int) $task_to_perform['sub_task_in_progress'] !== 0) {
             // Task is currently being in progress by another server process
-            provideLog('[TASK][#'. $task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
+            provideLog('[TASK][#'.$task_to_perform['increment_id'].'][WARNING] Similar task already being processes', $SETTINGS);
             return false;
         }
 
         // handle next task
         $args = json_decode($task_to_perform['task'], true);
-        provideLog('[TASK][#'. $task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS);
+        provideLog('[TASK][#'.$task_to_perform['increment_id'].'][START]Task '.$args['step'], $SETTINGS);
 
         // flag as in progress
         DB::update(
@@ -250,7 +250,7 @@ 
         DB::update(
             prefixTable('background_subtasks'),
             array(
-                'sub_task_in_progress' => 0,    // flag sub task is no more in prgoress
+                'sub_task_in_progress' => 0, // flag sub task is no more in prgoress
                 'task' => json_encode(["status" => "Done"]),
                 'is_in_progress' => -1,
                 'finished_at' => time(),
@@ -265,7 +265,7 @@ 
         // are all tasks done?
         DB::query(
             'SELECT *
-            FROM ' . prefixTable('background_subtasks') . '
+            FROM ' . prefixTable('background_subtasks').'
             WHERE task_id = %i AND finished_at IS NULL',
             $processId
         );
@@ -337,7 +337,7 @@ 
         // Loop on all files for this item
         // and encrypt them for each user
         if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
-        foreach($args['files_keys'] as $file) {
+        foreach ($args['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_items'),
                 0,
@@ -353,7 +353,7 @@ 
         // Loop on all encrypted fields for this item
         // and encrypt them for each user
         if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
-        foreach($args['fields_keys'] as $field) {
+        foreach ($args['fields_keys'] as $field) {
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),
                 0,
@@ -405,6 +405,6 @@ 
     DB::query(
         'DELETE FROM '.prefixTable('items_edition').'
         WHERE timestamp < %i',
-        ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition']*60) : time() - EDITION_LOCK_PERIOD
+        ($SETTINGS['delay_item_edition'] > 0) ? time() - ($SETTINGS['delay_item_edition'] * 60) : time() - EDITION_LOCK_PERIOD
     );
 }

Braces +15 added lines, -6 removed lines

@@ -83,7 +83,9 @@ 
 
 if (DB::count() > 0) {
     // handle tasks inside this process
-    if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']);
+    if (WIP === true) {
+        error_log("Process in progress: ".$process_to_perform['increment_id']);
+    }
     handleTask(
         $process_to_perform['increment_id'],
         json_decode($process_to_perform['arguments'], true),
@@ -100,7 +102,9 @@ 
     );
     
     if (DB::count() > 0) {
-        if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']);
+        if (WIP === true) {
+            error_log("New process ta start: ".$process_to_perform['increment_id']);
+        }
         // update DB - started_at
         DB::update(
             prefixTable('background_tasks'),
@@ -153,8 +157,9 @@ 
         );
 
         // No more tasks, exit
-        if ($process_to_perform !== 1)
-            break;
+        if ($process_to_perform !== 1) {
+                    break;
+        }
 
         // Run next task
         $process = new Symfony\Component\Process\Process([
@@ -331,7 +336,9 @@ 
     if ($args['step'] === 'create_users_files_key') {
         // Loop on all files for this item
         // and encrypt them for each user
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+        if (WIP === true) {
+            provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
+        }
         foreach($args['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_items'),
@@ -347,7 +354,9 @@ 
     } elseif ($args['step'] === 'create_users_fields_key') {
         // Loop on all encrypted fields for this item
         // and encrypt them for each user
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+        if (WIP === true) {
+            provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
+        }
         foreach($args['fields_keys'] as $field) {
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),

_things/delete_background_tasks___userKeysCreation.php

Spacing +14 added lines, -14 removed lines

@@ -67,7 +67,7 @@ 
 
 $processToPerform = DB::queryfirstrow(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE (finished_at IS NULL OR finished_at = "") AND process_type = %s
     ORDER BY increment_id ASC',
     'create_user_keys'
@@ -84,7 +84,7 @@ 
     // Check if subtasks are still running
     // This in order to prevent the script from running multiple times on same objects
     while (DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' 
+        'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' 
         WHERE is_in_progress = 1'
     ) > 0) {
         sleep(10); // Wait 10 seconds before continuing
@@ -117,7 +117,7 @@ 
             $subTaskParams = json_decode($subTask['task'], true);
 
             if (WIP === true) {
-                error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams,true));
+                error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - "./** @scrutinizer ignore-type */ print_r($subTaskParams, true));
             }
             
             // Build all subtasks if first one
@@ -126,7 +126,7 @@ 
                     // Get total number of items
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         '.(isset($taskArgumentsArray['only_personal_items']) === true && $taskArgumentsArray['only_personal_items'] === 1 ? 'WHERE perso = 1' : '')
                     );
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -135,7 +135,7 @@ 
                     // Get total number of items
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('log_items') . '
+                        FROM ' . prefixTable('log_items').'
                         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
                     );
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -144,7 +144,7 @@ 
                     // Get total number of items
                     DB::query(
                         'SELECT *
-                        FROM ' . prefixTable('categories_items') . '
+                        FROM ' . prefixTable('categories_items').'
                         WHERE encryption_type = "teampass_aes"'
                     );
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
@@ -161,9 +161,9 @@ 
                     // Get total number of items
                     DB::query(
                         'SELECT *
-                        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.'"'
                     );
                     createAllSubTasks($subTaskParams['step'], DB::count(), $subTaskParams['nb'], $taskId);
                 }
@@ -190,7 +190,7 @@ 
     // Check if subtasks have to be created
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i AND task LIKE %ss',
         $taskId,
         $action
@@ -218,7 +218,7 @@ 
 function countActiveSymfonyProcesses() {
     // Count the number of active processes
     return DB::queryFirstField(
-        'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . 
+        'SELECT COUNT(*) FROM '.prefixTable('background_subtasks'). 
         ' WHERE process_id IS NOT NULL AND finished_at IS NULL'
     );
 }
@@ -229,7 +229,7 @@ 
 function getSubTasks($taskId) {
     $task_to_perform = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE task_id = %i AND finished_at IS NULL
         ORDER BY increment_id ASC',
         $taskId
@@ -278,7 +278,7 @@ 
 function reloadSubTask($subTaskId) {
     // Retrieve subtask information from the database
     $subTask = DB::queryFirstRow(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE increment_id = %i', 
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE increment_id = %i', 
         $subTaskId
     );
 
@@ -323,7 +323,7 @@ 
     // Get all processes
     $subtasks = DB::query(
         'SELECT *
-        FROM ' . prefixTable('background_subtasks') . '
+        FROM ' . prefixTable('background_subtasks').'
         WHERE process_id IS NOT NULL AND finished_at IS NULL'
     );