Passed
Pull Request — master (#4682)
by Nils
06:11
created
api/Model/Operation.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
                 "error" => '',
39 39
             );
40 40
     
41
-        }catch (Exception $e) {    
41
+        } catch (Exception $e) {    
42 42
             return false;
43 43
         }
44 44
     }
Please login to merge, or discard this patch.
sources/users.queries.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2603,7 +2603,9 @@
 block discarded – undo
2603 2603
             }
2604 2604
             
2605 2605
             foreach ($results as $adUser) {
2606
-                if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue;
2606
+                if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) {
2607
+                    continue;
2608
+                }
2607 2609
                 // Build the list of all groups in AD
2608 2610
                 if (isset($adUser['memberof']) === true) {
2609 2611
                     foreach($adUser['memberof'] as $j => $adUserGroup) {
Please login to merge, or discard this patch.
scripts/background_tasks___items_handler_subtask.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,9 @@  discard block
 block discarded – undo
74 74
 if ($args['step'] === 'create_users_files_key') {
75 75
     // Loop on all files for this item
76 76
     // and encrypt them for each user
77
-    if (WIP === true) provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
77
+    if (WIP === true) {
78
+        provideLog('[DEBUG] '.print_r($args['files_keys'], true), $SETTINGS);
79
+    }
78 80
     foreach($args['files_keys'] as $file) {
79 81
         storeUsersShareKey(
80 82
             prefixTable('sharekeys_items'),
@@ -91,7 +93,9 @@  discard block
 block discarded – undo
91 93
 } elseif ($args['step'] === 'create_users_fields_key') {
92 94
     // Loop on all encrypted fields for this item
93 95
     // and encrypt them for each user
94
-    if (WIP === true) provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
96
+    if (WIP === true) {
97
+        provideLog('[DEBUG] '.print_r($args, true), $SETTINGS);
98
+    }
95 99
     foreach($args['fields_keys'] as $field) {
96 100
         storeUsersShareKey(
97 101
             prefixTable('sharekeys_fields'),
Please login to merge, or discard this patch.
sources/downloadFile.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,9 @@
 block discarded – undo
149 149
     }
150 150
     $filePath = realpath($filePath);
151 151
 
152
-    if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - ");
152
+    if (WIP === true) {
153
+        error_log('downloadFile.php: filePath: ' . $filePath." - ");
154
+    }
153 155
 
154 156
     if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) {
155 157
         header('Content-Description: File Transfer');
Please login to merge, or discard this patch.
includes/core/login.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,9 @@
 block discarded – undo
58 58
     $get['state'] = filter_var($_GET['state'], FILTER_SANITIZE_SPECIAL_CHARS);
59 59
     $get['session_state'] = filter_var($_GET['session_state'], FILTER_SANITIZE_SPECIAL_CHARS);
60 60
 
61
-    if (WIP === true) error_log('---- OAUTH2 START ----');
61
+    if (WIP === true) {
62
+        error_log('---- OAUTH2 START ----');
63
+    }
62 64
 
63 65
     // Création d'une instance du contrôleur
64 66
     $OAuth2 = new OAuth2Controller($SETTINGS);
Please login to merge, or discard this patch.
pages/profile.php 1 patch
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -401,12 +401,13 @@
 block discarded – undo
401 401
                                             <select class="form-control" id="profile-user-timezone">
402 402
                                                 <?php foreach ($zones as $key => $zone): ?>
403 403
                                                     <option value="<?php echo $key; ?>"<?php 
404
-                                                        if ($session->has('user-timezone'))
405
-                                                            if($session->get('user-timezone') === $key)
404
+                                                        if ($session->has('user-timezone')) {
405
+                                                                                                                    if($session->get('user-timezone') === $key)
406 406
                                                                 echo ' selected';
407
-                                                            elseif ($session->get('user-timezone') === 'not_defined')
408
-                                                                if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
407
+                                                        } elseif ($session->get('user-timezone') === 'not_defined') {
408
+                                                                                                                            if (isset($SETTINGS['timezone']) && $SETTINGS['timezone'] === $key)
409 409
                                                                     echo ' selected';
410
+                                                            }
410 411
                                                     ?>><?php echo $zone; ?></option>
411 412
                                                 <?php endforeach; ?>
412 413
                                             </select>
Please login to merge, or discard this patch.
pages/tasks.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -149,8 +149,7 @@
 block discarded – undo
149 149
                                             </div>
150 150
         <?php
151 151
     }
152
-}
153
-catch (Exception $e) {
152
+} catch (Exception $e) {
154 153
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
155 154
         error_log('TEAMPASS Error - tasks page - '.$e->getMessage());
156 155
     }
Please login to merge, or discard this patch.
pages/admin.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -222,8 +222,7 @@
 block discarded – undo
222 222
                             </div>
223 223
         <?php
224 224
     }
225
-}
226
-catch (Exception $e) {
225
+} catch (Exception $e) {
227 226
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
228 227
         error_log('TEAMPASS Error - admin page - '.$e->getMessage());
229 228
     }
Please login to merge, or discard this patch.
scripts/background_tasks___user_task.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,8 +77,9 @@
 block discarded – undo
77 77
     );
78 78
 
79 79
     // No more pending user_build_cache_tree tasks
80
-    if (DB::count() === 0)
81
-        exit;
80
+    if (DB::count() === 0) {
81
+            exit;
82
+    }
82 83
 
83 84
     // get email properties
84 85
     $arguments = json_decode($record['arguments'], true);
Please login to merge, or discard this patch.