Passed
Pull Request — master (#4498)
by
unknown
06:49
created
scripts/background_tasks___items_handler.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -83,7 +83,9 @@  discard block
 block discarded – undo
83 83
 
84 84
 if (DB::count() > 0) {
85 85
     // handle tasks inside this process
86
-    if (WIP === true) error_log("Process in progress: ".$process_to_perform['increment_id']);
86
+    if (WIP === true) {
87
+        error_log("Process in progress: ".$process_to_perform['increment_id']);
88
+    }
87 89
     handleTask(
88 90
         $process_to_perform['increment_id'],
89 91
         json_decode($process_to_perform['arguments'], true),
@@ -100,7 +102,9 @@  discard block
 block discarded – undo
100 102
     );
101 103
     
102 104
     if (DB::count() > 0) {
103
-        if (WIP === true) error_log("New process ta start: ".$process_to_perform['increment_id']);
105
+        if (WIP === true) {
106
+            error_log("New process ta start: ".$process_to_perform['increment_id']);
107
+        }
104 108
         // update DB - started_at
105 109
         DB::update(
106 110
             prefixTable('background_tasks'),
@@ -153,8 +157,9 @@  discard block
 block discarded – undo
153 157
         );
154 158
 
155 159
         // No more tasks, exit
156
-        if ($process_to_perform !== 1)
157
-            break;
160
+        if ($process_to_perform !== 1) {
161
+                    break;
162
+        }
158 163
 
159 164
         // Run next task
160 165
         $process = new Symfony\Component\Process\Process([
@@ -331,7 +336,9 @@  discard block
 block discarded – undo
331 336
     if ($args['step'] === 'create_users_files_key') {
332 337
         // Loop on all files for this item
333 338
         // and encrypt them for each user
334
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
339
+        if (WIP === true) {
340
+            provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
341
+        }
335 342
         foreach($args['files_keys'] as $file) {
336 343
             storeUsersShareKey(
337 344
                 prefixTable('sharekeys_items'),
@@ -347,7 +354,9 @@  discard block
 block discarded – undo
347 354
     } elseif ($args['step'] === 'create_users_fields_key') {
348 355
         // Loop on all encrypted fields for this item
349 356
         // and encrypt them for each user
350
-        if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
357
+        if (WIP === true) {
358
+            provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
359
+        }
351 360
         foreach($args['fields_keys'] as $field) {
352 361
             storeUsersShareKey(
353 362
                 prefixTable('sharekeys_fields'),
Please login to merge, or discard this patch.
sources/main.functions.php 1 patch
Braces   +24 added lines, -11 removed lines patch added patch discarded remove patch
@@ -2366,7 +2366,9 @@  discard block
 block discarded – undo
2366 2366
 function encryptUserObjectKey(string $key, string $publicKey): string
2367 2367
 {
2368 2368
     // Empty password
2369
-    if (empty($key)) return '';
2369
+    if (empty($key)) {
2370
+        return '';
2371
+    }
2370 2372
 
2371 2373
     // Sanitize
2372 2374
     $antiXss = new AntiXSS();
@@ -2515,7 +2517,9 @@  discard block
 block discarded – undo
2515 2517
         ];
2516 2518
     }
2517 2519
 
2518
-    if (WIP) error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
2520
+    if (WIP) {
2521
+        error_log('DEBUG: File image url -> '.filter_var($safeFilePath, FILTER_SANITIZE_URL));
2522
+    }
2519 2523
 
2520 2524
     // Decrypt file content and return
2521 2525
     return base64_encode($cipher->decrypt($ciphertext));
@@ -2650,7 +2654,9 @@  discard block
 block discarded – undo
2650 2654
         foreach ($users as $user) {
2651 2655
             // Insert in DB the new object key for this item by user
2652 2656
             if (count($objectKeyArray) === 0) {
2653
-                if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey);
2657
+                if (WIP === true) {
2658
+                    error_log('TEAMPASS Debug - storeUsersShareKey case1 - ' . $object_name . ' - ' . $post_object_id . ' - ' . $user['id'] . ' - ' . $objectKey);
2659
+                }
2654 2660
                 DB::insert(
2655 2661
                     $object_name,
2656 2662
                     [
@@ -2664,7 +2670,9 @@  discard block
 block discarded – undo
2664 2670
                 );
2665 2671
             } else {
2666 2672
                 foreach ($objectKeyArray as $object) {
2667
-                    if (WIP === true) error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
2673
+                    if (WIP === true) {
2674
+                        error_log('TEAMPASS Debug - storeUsersShareKey case2 - ' . $object_name . ' - ' . $object['objectId'] . ' - ' . $user['id'] . ' - ' . $object['objectKey']);
2675
+                    }
2668 2676
                     DB::insert(
2669 2677
                         $object_name,
2670 2678
                         [
@@ -3990,7 +3998,9 @@  discard block
 block discarded – undo
3990 3998
         $taskName = [$taskName];
3991 3999
     }
3992 4000
     foreach($taskName as $task) {
3993
-        if (WIP === true) error_log('createTaskForItem - task: '.$task);
4001
+        if (WIP === true) {
4002
+            error_log('createTaskForItem - task: '.$task);
4003
+        }
3994 4004
         switch ($task) {
3995 4005
             case 'item_password':
3996 4006
                 
@@ -4421,19 +4431,22 @@  discard block
 block discarded – undo
4421 4431
 
4422 4432
             // Organisation name (removed username@ and .tld)
4423 4433
             $domain = explode('.', $emailParts[1]);
4424
-            if (count($domain) > 1)
4425
-                $forbiddenWords[] = $domain[0];
4434
+            if (count($domain) > 1) {
4435
+                            $forbiddenWords[] = $domain[0];
4436
+            }
4426 4437
         }
4427 4438
     }
4428 4439
 
4429 4440
     // Search forbidden words in password
4430 4441
     foreach ($forbiddenWords as $word) {
4431
-        if (empty($word))
4432
-            continue;
4442
+        if (empty($word)) {
4443
+                    continue;
4444
+        }
4433 4445
 
4434 4446
         // Stop if forbidden word found in password
4435
-        if (stripos($password, $word) !== false)
4436
-            return false;
4447
+        if (stripos($password, $word) !== false) {
4448
+                    return false;
4449
+        }
4437 4450
     }
4438 4451
 
4439 4452
     // Get password complexity
Please login to merge, or discard this patch.