nilsteampassnet / TeamPass

scripts/background_tasks___userKeysCreation.php

Spacing +13 added lines, -13 removed lines

@@ -69,7 +69,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'
@@ -115,7 +115,7 @@ 
             // Extract the subtask parameters
             $subTaskParams = json_decode($subTask['task'], true);
 
-            error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - ".print_r($subTaskParams,true));
+            error_log('Subtask in progress: '.$subTask['increment_id']." (".$taskId.") - ".print_r($subTaskParams, true));
 /*
             $fichier = fopen(__DIR__.'/log.txt', 'a');
             fwrite($fichier, 'Step : '.$subTaskParams['step']." - index : ".$subTaskParams['index']."\n");
@@ -128,7 +128,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);
@@ -137,7 +137,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);
@@ -146,7 +146,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);
@@ -163,9 +163,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);
                 }
@@ -192,7 +192,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
@@ -224,7 +224,7 @@ 
 function countActiveSymfonyProcesses() {
     // Compter le nombre de processus actifs
     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'
     );
 }
@@ -235,7 +235,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
@@ -286,7 +286,7 @@ 
 function reloadSubTask($subTaskId) {
     // Récupérer les informations de la sous-tâche de la base de données
     $subTask = DB::queryFirstRow(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE increment_id = %i', 
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE increment_id = %i', 
         $subTaskId
     );
 
@@ -332,7 +332,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'
     );
 

api/inc/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -24,21 +24,21 @@ 
  */
 
 
-define("API_ROOT_PATH", __DIR__ . "/..");
+define("API_ROOT_PATH", __DIR__."/..");
 
 // include main configuration file
-require API_ROOT_PATH . '/../sources/main.functions.php';
+require API_ROOT_PATH.'/../sources/main.functions.php';
 
 // init
 loadClasses('DB');
 
 // include the base controller file
-require API_ROOT_PATH . "/Controller/Api/BaseController.php";
+require API_ROOT_PATH."/Controller/Api/BaseController.php";
 
 // include the use model file
-require API_ROOT_PATH . "/Model/UserModel.php";
-require API_ROOT_PATH . "/Model/ItemModel.php";
-require API_ROOT_PATH . "/Model/FolderModel.php";
+require API_ROOT_PATH."/Model/UserModel.php";
+require API_ROOT_PATH."/Model/ItemModel.php";
+require API_ROOT_PATH."/Model/FolderModel.php";
 
 /**
  * Launch expected action for ITEM
@@ -57,9 +57,9 @@ 
         );
     }
     // Perform the action
-    require API_ROOT_PATH . "/Controller/Api/ItemController.php";    
+    require API_ROOT_PATH."/Controller/Api/ItemController.php";    
     $objFeedController = new ItemController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -80,9 +80,9 @@ 
         );
     }
     // Perform the action
-    require API_ROOT_PATH . "/Controller/Api/FolderController.php";
+    require API_ROOT_PATH."/Controller/Api/FolderController.php";
     $objFeedController = new FolderController();
-    $strMethodName = $actions[0] . 'Action';
+    $strMethodName = $actions[0].'Action';
     $objFeedController->{$strMethodName}($userData);
 }
 
@@ -108,7 +108,7 @@ 
  */
 function apiIsEnabled(): string
 {
-    include API_ROOT_PATH . '/../includes/config/tp.config.php';
+    include API_ROOT_PATH.'/../includes/config/tp.config.php';
 
     if (isset($SETTINGS) === true && isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
         return json_encode(
@@ -137,7 +137,7 @@ 
  */
 function verifyAuth(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false && is_jwt_valid($bearer_token) === true) {
@@ -167,7 +167,7 @@ 
  */
 function getDataFromToken(): string
 {
-    include_once API_ROOT_PATH . '/inc/jwt_utils.php';
+    include_once API_ROOT_PATH.'/inc/jwt_utils.php';
     $bearer_token = get_bearer_token();
 
     if (empty($bearer_token) === false) {