Passed
Branchdevelop (be7e3f)
by Robin
11:00 queued 14s
created
programs/sse.class.php 1 patch
Braces   +4 added lines, -8 removed lines patch added patch discarded remove patch
@@ -127,12 +127,10 @@  discard block
 block discarded – undo
127 127
         $users = array();
128 128
         if(!isset($for)){
129 129
             $users[] = $App->getCurrentUser();
130
-        }
131
-        else if(!is_array($for)){
130
+        } else if(!is_array($for)){
132 131
             if($for === 'all'){
133 132
                 $users = $App->getLoggedUsers();
134
-            }
135
-            else{
133
+            } else{
136 134
                 $users[] = $for;
137 135
             }
138 136
         }
@@ -166,12 +164,10 @@  discard block
 block discarded – undo
166 164
         $users = array();
167 165
         if(!isset($for)){
168 166
             $users[] = $App->getCurrentUser();
169
-        }
170
-        else if(!is_array($for)){
167
+        } else if(!is_array($for)){
171 168
             if($for === 'all'){
172 169
                 $users = $App->getLoggedUsers();
173
-            }
174
-            else{
170
+            } else{
175 171
                 $users[] = $for;
176 172
             }
177 173
         }
Please login to merge, or discard this patch.
programs/notification.ctrl.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -178,8 +178,7 @@
 block discarded – undo
178 178
             );
179 179
             
180 180
             $box->addItem($notificationBox);
181
-        }
182
-        else{
181
+        } else{
183 182
             $notifIcon .= 'webapp-bell-o';
184 183
         }
185 184
 
Please login to merge, or discard this patch.
programs/app.php 1 patch
Braces   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     {
145 145
         if(isset($this->components[$componentName])){
146 146
             return $this->components[$componentName];
147
-        }else{
147
+        } else{
148 148
             return null;
149 149
         }
150 150
     }
@@ -412,8 +412,7 @@  discard block
 block discarded – undo
412 412
                 if(empty($component->getPackageName())){
413 413
                     $noPackageNames[] = $component->getName();
414 414
                 }
415
-            }
416
-            catch (Exception $e){
415
+            } catch (Exception $e){
417 416
                 
418 417
             }
419 418
         }
Please login to merge, or discard this patch.
programs/ui/base.ui.php 1 patch
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -750,8 +750,7 @@  discard block
 block discarded – undo
750 750
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
751 751
                         $widget = $this->$displayFieldMethod($customSection, $label);
752 752
                         $item = $widget;
753
-                    } 
754
-                    else {
753
+                    } else {
755 754
                         if($isGroupField){
756 755
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
757 756
                             if (method_exists($this, '__fieldsGroup')) {
@@ -760,8 +759,7 @@  discard block
 block discarded – undo
760 759
                                 $customSection->fieldsLayout = $originalFieldsLayout;
761 760
                             }
762 761
                             $sizePolicy .= ' customsection-fieldsgroup-box';
763
-                        }
764
-                        else{
762
+                        } else{
765 763
                             try{
766 764
                                 $field = $recordSet->getField($displayFieldName);
767 765
                                 if ($label === '' || $label === '__') {
@@ -829,8 +827,7 @@  discard block
 block discarded – undo
829 827
             $sizePolicy .= isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
830 828
             if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
831 829
                 $item = $this->$displayFieldMethod($customSection, $label);
832
-            }
833
-            else{
830
+            } else{
834 831
                 if($isGroupField){
835 832
                     list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
836 833
                     if (method_exists($this, '__fieldsGroup')) {
@@ -839,8 +836,7 @@  discard block
 block discarded – undo
839 836
                         $customSection->fieldsLayout = $wantedFieldsLayout;
840 837
                     }
841 838
                     $sizePolicy .= ' customsection-fieldsgroup-box';
842
-                }
843
-                else{
839
+                } else{
844 840
                     try {
845 841
                         $field = $this->recordSet->getField($displayFieldName);
846 842
                         if (!isset($label) || empty($label)) {
@@ -892,8 +888,7 @@  discard block
 block discarded – undo
892 888
                 $displayFieldMethod = '_' . $displayFieldName;
893 889
                 if (method_exists($this, $displayFieldMethod)) {
894 890
                     $item = $this->$displayFieldMethod($customSection, $labelField);
895
-                }
896
-                else if ($recordSet->fieldExist($displayFieldName)) {
891
+                } else if ($recordSet->fieldExist($displayFieldName)) {
897 892
                     $field = $recordSet->getField($displayFieldName);
898 893
                     if ($labelField === '') {
899 894
                         $labelField = $field->getDescription();
@@ -2416,16 +2411,14 @@  discard block
 block discarded – undo
2416 2411
                     $displayFieldMethod = '_' . $displayFieldName;
2417 2412
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
2418 2413
                         $item = $this->$displayFieldMethod($customSection, $label);
2419
-                    } 
2420
-                    else {
2414
+                    } else {
2421 2415
                         if($isGroupField){
2422 2416
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
2423 2417
                             if (method_exists($this, '__fieldsGroup')) {
2424 2418
                                 $item = $this->__fieldsGroup($customSection, $groupId, $label);
2425 2419
                             } 
2426 2420
                             $sizePolicy .= ' customsection-fieldsgroup-box';
2427
-                        }
2428
-                        else{
2421
+                        } else{
2429 2422
                             try {
2430 2423
                                 $field = $this->recordSet->getField($displayFieldName);
2431 2424
                                 $value = $this->fieldOutput($field, $this->record, $displayFieldName);
@@ -2499,8 +2492,7 @@  discard block
 block discarded – undo
2499 2492
                 $displayFieldMethod = '_' . $displayFieldName;
2500 2493
                 if (method_exists($this, $displayFieldMethod)) {
2501 2494
                     $item = $this->$displayFieldMethod($customSection, $labelField);
2502
-                } 
2503
-                else{
2495
+                } else{
2504 2496
                     try {
2505 2497
                         $field = $this->recordSet->getField($displayFieldName);
2506 2498
                         $value = $this->fieldOutput($field, $this->record, $displayFieldName);
Please login to merge, or discard this patch.
programs/ui/ui.class.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
                 if(isset($componentUi) && method_exists($componentUi, $name)){
64 64
                     return call_user_func_array(array($componentUi, $name), $arguments);
65 65
                 }
66
-            }catch(Exception $e){}
66
+            } catch(Exception $e){}
67 67
         }
68 68
         
69 69
         $rc = new ReflectionClass($this);
Please login to merge, or discard this patch.
programs/ui/criteria.ui.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -153,8 +153,7 @@  discard block
 block discarded – undo
153 153
                     }
154 154
                 }
155 155
                 
156
-            }
157
-            elseif($recordSetField instanceof ORM_FkField){
156
+            } elseif($recordSetField instanceof ORM_FkField){
158 157
                 /* @var $recordSetField ORM_FkField */
159 158
                 $fieldDescription = $fieldName;
160 159
                 $path = $fieldName;
@@ -181,8 +180,7 @@  discard block
 block discarded – undo
181 180
                         $defaultFieldPathes[] = $foreignPath;
182 181
                     }
183 182
                 }
184
-            }
185
-            else{
183
+            } else{
186 184
                 /* @var $recordSetField ORM_Field */
187 185
                 $fieldName = $recordSetField->getName();
188 186
                 $fieldDescription = $recordSetField->getDescription();
Please login to merge, or discard this patch.
programs/customsection.class.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -448,15 +448,13 @@  discard block
 block discarded – undo
448 448
             if(strpos($fieldName, '/') !== false){
449 449
                 list($oneField, $foreignField) = explode('/', $fieldName);
450 450
                 $field = $recordSet->$oneField()->$foreignField;
451
-            }
452
-            else{
451
+            } else{
453 452
                 $field = $recordSet->$fieldName;
454 453
             }
455 454
             foreach ($condition as $op => $value) {
456 455
                 if(!is_array($value)){
457 456
                     $criteria = $field->$op($value);
458
-                }
459
-                else{
457
+                } else{
460 458
                     foreach ($value as $foreignClassName => $foreignValues){
461 459
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
462 460
                         $foreignSet = $App->$foreignClassName();
@@ -465,8 +463,7 @@  discard block
 block discarded – undo
465 463
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
466 464
                             if($foreignFieldName === '_foreignField'){
467 465
                                 $foreignField = $foreignConditions;
468
-                            }
469
-                            else{
466
+                            } else{
470 467
                                 foreach ($foreignConditions as $key => $val){
471 468
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
472 469
                                 }
Please login to merge, or discard this patch.
programs/controller.class.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -446,8 +446,7 @@  discard block
 block discarded – undo
446 446
             if($component){
447 447
                 $this->app->setCurrentComponent($component);
448 448
                 $objectController = $component->controller(false);
449
-            }
450
-            else{
449
+            } else{
451 450
                 header('HTTP/1.0 400 Bad Request');
452 451
                 throw new app_UnknownActionException($action);
453 452
             }
@@ -776,8 +775,7 @@  discard block
 block discarded – undo
776 775
                     $W->Label($trace)
777 776
                 );
778 777
             }
779
-        }
780
-        else{
778
+        } else{
781 779
             $section->addItem(
782 780
                 $W->Label($App->translate('Please contact the administrator'))
783 781
             );
@@ -854,8 +852,7 @@  discard block
 block discarded – undo
854 852
                     $W->Label($trace)
855 853
                 );
856 854
             }
857
-        }
858
-        else{
855
+        } else{
859 856
             $section->addItem(
860 857
                 $W->Label($App->translate('Please contact the administrator'))
861 858
             );
Please login to merge, or discard this patch.
programs/customcontainer.class.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -182,15 +182,13 @@  discard block
 block discarded – undo
182 182
             if(strpos($fieldName, '/') !== false){
183 183
                 list($oneField, $foreignField) = explode('/', $fieldName);
184 184
                 $field = $recordSet->$oneField()->$foreignField;
185
-            }
186
-            else{
185
+            } else{
187 186
                 $field = $recordSet->$fieldName;
188 187
             }
189 188
             foreach ($condition as $op => $value) {
190 189
                 if(!is_array($value)){
191 190
                     $criteria = $field->$op($value);
192
-                }
193
-                else{
191
+                } else{
194 192
                     foreach ($value as $foreignClassName => $foreignValues){
195 193
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
196 194
                         $foreignSet = $App->$foreignClassName();
@@ -199,8 +197,7 @@  discard block
 block discarded – undo
199 197
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
200 198
                             if($foreignFieldName === '_foreignField'){
201 199
                                 $foreignField = $foreignConditions;
202
-                            }
203
-                            else{
200
+                            } else{
204 201
                                 foreach ($foreignConditions as $key => $val){
205 202
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
206 203
                                 }
Please login to merge, or discard this patch.