capwelton / libapp

programs/Set/AppRecordSet.php

Braces +9 added lines, -18 removed lines

@@ -179,8 +179,7 @@ 
                         
                         /*@var $customfield AppCustomField */
                     }
-                }
-                catch (ORMBackEndSelectException $e){
+                } catch (ORMBackEndSelectException $e){
                     // table does not exist, this error is thrown by the install program while creating the sets
                 }
             }
@@ -217,8 +216,7 @@ 
             if($ormField instanceof ORMFkField){
                 $this->hasOne($customField->fieldname, $ormField->getForeignSetName())
                     ->setDescription($description);
-            }
-            else{
+            } else{
                 $this->addFields($ormField);
             }
         }
@@ -275,8 +273,7 @@ 
         $linkSet = $this->App()->LinkSet();
         if(is_array($source) || ($source instanceof \Iterator)){
             return $linkSet->selectForSources($source, $this->getRecordClassName(), $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForSource($source, $this->getRecordClassName(), $linkType);
         }
     }
@@ -296,8 +293,7 @@ 
         $linkSet = $this->App()->LinkSet();
         if(is_array($target) || ($target instanceof \Iterator)){
             return $linkSet->selectForTargets($target, $this->getRecordClassName(), $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForTarget($target, $this->getRecordClassName(), $linkType);
         }
     }
@@ -324,8 +320,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -356,8 +351,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -400,8 +394,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -444,8 +437,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -562,8 +554,7 @@ 
         
         if(is_array($tagLabels)){
             $criteria = $criteria->_AND_($linkSet->targetId->label->in($tagLabels));
-        }
-        else{
+        } else{
             $criteria = $criteria->_AND_($linkSet->targetId->label->is($tagLabels));
         }
         if(isset($linkType)){

programs/Ui/AppHelpers.php

Indentation +260 added lines, -260 removed lines

@@ -57,50 +57,50 @@ 
 
 function app_genericSetEditor(ORMRecordSet $set)
 {
-	$O = \bab_functionality::get('LibOrm');
-	$O->init();
-	$W = \bab_Widgets();
-	$layout = $W->VBoxLayout();
-	$layout->setVerticalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORMDateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORMRecordSet) {
-				$widget = app_genericSetEditor($field);
-				$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = \bab_functionality::get('LibOrm');
+    $O->init();
+    $W = \bab_Widgets();
+    $layout = $W->VBoxLayout();
+    $layout->setVerticalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORMDateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORMRecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -113,50 +113,50 @@ 
  */
 function app_genericSetFilterForm(ORMRecordSet $set)
 {
-	$O = \bab_functionality::get('LibOrm');
-	$O->init();
-	$W = \bab_Widgets();
-	$layout = $W->FlowLayout();
-	$layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORMDateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORMRecordSet) {
-			$widget = app_genericSetFilterForm($field);
-			$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = \bab_functionality::get('LibOrm');
+    $O->init();
+    $W = \bab_Widgets();
+    $layout = $W->FlowLayout();
+    $layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORMDateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORMRecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -169,47 +169,47 @@ 
  */
 function app_LabelledWidget($labelText, WidgetDisplayableInterface $widget)
 {
-	$W = \bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof WidgetInputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof WidgetCheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
-			$label
-		)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
-	} else {
-		$layout = $W->VBoxItems(
-			$label,
-			$widget
-		)->setVerticalSpacing(0.5, 'em');
-	}
-
-	return $layout;
+    $W = \bab_Widgets();
+
+    $label = $W->Label($labelText);
+    if ($widget instanceof WidgetInputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof WidgetCheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
+            $label
+        )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    } else {
+        $layout = $W->VBoxItems(
+            $label,
+            $widget
+        )->setVerticalSpacing(0.5, 'em');
+    }
+
+    return $layout;
 }
 
 
 
 function app_LabelledCheckbox($labelText, $checkboxName, $options = null)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
-	$label = $W->Label($labelText)->colon(false);
-	$checkbox = $W->Checkbox()->setName($checkboxName);
-	$label->setAssociatedWidget($checkbox);
-	if (isset($options)) {
-		$label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -217,42 +217,42 @@ 
 
 function app_LabelledOrmSelect(ORMMySqlIterator $iterator, $fieldName, $selectName, $label, $hidden = false, $groupFieldName = null)
 {
-	$W = \bab_Widgets();
-
-	if (isset($groupFieldName)) {
-		$groupPathElements = explode('/', $groupFieldName);
-	}
-
-	$select = $W->Select()->setName($selectName);
-
-	$select->addOption('', '');
-
-	$nbOptions = 0;
-	foreach ($iterator as $record) {
-		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
-		} else {
-			$optionText = $record->$fieldName;
-		}
-		if (isset($groupFieldName)) {
-			$group = $record;
-			foreach ($groupPathElements as $groupPathElement) {
-				$group = $group->$groupPathElement;
-			}
-			$select->addOption($record->id, $optionText, $group);
-		} else {
-			$select->addOption($record->id, $optionText);
-		}
-		$nbOptions++;
-		$lastId = $record->id;
-	}
-
-	if ($nbOptions == 1) {
-		$select->setValue($lastId);
-	}
-
-
-	return app_LabelledWidget($label, $select);
+    $W = \bab_Widgets();
+
+    if (isset($groupFieldName)) {
+        $groupPathElements = explode('/', $groupFieldName);
+    }
+
+    $select = $W->Select()->setName($selectName);
+
+    $select->addOption('', '');
+
+    $nbOptions = 0;
+    foreach ($iterator as $record) {
+        if (isset($record->code)) {
+            $optionText = $record->code . ' - ' . $record->$fieldName;
+        } else {
+            $optionText = $record->$fieldName;
+        }
+        if (isset($groupFieldName)) {
+            $group = $record;
+            foreach ($groupPathElements as $groupPathElement) {
+                $group = $group->$groupPathElement;
+            }
+            $select->addOption($record->id, $optionText, $group);
+        } else {
+            $select->addOption($record->id, $optionText);
+        }
+        $nbOptions++;
+        $lastId = $record->id;
+    }
+
+    if ($nbOptions == 1) {
+        $select->setValue($lastId);
+    }
+
+
+    return app_LabelledWidget($label, $select);
 }
 
 
@@ -260,108 +260,108 @@ 
 
 function app_OrmWidget(ORMField $field)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
 
-	if ($field instanceof ORMDateField) {
-		$widget = $W->DatePicker();
-	} else if ($field instanceof ORMTimeField) {
-		$widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORMDatetimeField) {
-	    $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORMEnumField) {
-		$widget = $W->Select();
+    if ($field instanceof ORMDateField) {
+        $widget = $W->DatePicker();
+    } else if ($field instanceof ORMTimeField) {
+        $widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORMDatetimeField) {
+        $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORMEnumField) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
-		$widget->addOption('', '');
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORMSetField) {
-		$widget = $W->MultiSelect()->setSelectedList(2);
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORMUserField) {
-	    $widget = $W->SuggestUser()
-    	    ->setMinChars(0)
-    	    ->setSizePolicy(\Func_Icons::ICON_LEFT_16);
-	} else if ($field instanceof ORMCurrencyField) {
-		$widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
-	} else if ($field instanceof ORMBoolField) {
-		$widget = $W->CheckBox()->setCheckedValue('1');
-	} else if ($field instanceof ORMIntField) {
-		$widget = $W->LineEdit()
-						->setSize(6)->addClass('widget-input-numeric');
-	} else if ($field instanceof ORMEmailField) {
-		$widget = $W->EmailLineEdit()
-						->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORMFileField) {
-	    $widget = $W->FilePicker();
-	} else if ($field instanceof ORMStringField) {
-		$widget = $W->LineEdit()
-			->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORMTextField) {
-		$widget = $W->TextEdit()
-		  ->addClass('widget-autoresize');
-	} else if ($field instanceof ORMPkField) {
-	    $widget = $W->Hidden();
-	} else if ($field instanceof ORMFkField) {
-		$widget = $W->Select();
-		$fieldName = $field->getName();
-		$parentSet = clone $field->getParentSet();
-		$parentSet->join($fieldName);
-		$set = $parentSet->$fieldName;
-		$records = $set->select();
-		$records->orderAsc($set->name);
-		$pkName = $set->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else if ($field instanceof ORMRecordSet) {
-		$widget = $W->Select();
+        $widget->addOption('', '');
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORMSetField) {
+        $widget = $W->MultiSelect()->setSelectedList(2);
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORMUserField) {
+        $widget = $W->SuggestUser()
+            ->setMinChars(0)
+            ->setSizePolicy(\Func_Icons::ICON_LEFT_16);
+    } else if ($field instanceof ORMCurrencyField) {
+        $widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
+    } else if ($field instanceof ORMBoolField) {
+        $widget = $W->CheckBox()->setCheckedValue('1');
+    } else if ($field instanceof ORMIntField) {
+        $widget = $W->LineEdit()
+                        ->setSize(6)->addClass('widget-input-numeric');
+    } else if ($field instanceof ORMEmailField) {
+        $widget = $W->EmailLineEdit()
+                        ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORMFileField) {
+        $widget = $W->FilePicker();
+    } else if ($field instanceof ORMStringField) {
+        $widget = $W->LineEdit()
+            ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORMTextField) {
+        $widget = $W->TextEdit()
+            ->addClass('widget-autoresize');
+    } else if ($field instanceof ORMPkField) {
+        $widget = $W->Hidden();
+    } else if ($field instanceof ORMFkField) {
+        $widget = $W->Select();
+        $fieldName = $field->getName();
+        $parentSet = clone $field->getParentSet();
+        $parentSet->join($fieldName);
+        $set = $parentSet->$fieldName;
+        $records = $set->select();
+        $records->orderAsc($set->name);
+        $pkName = $set->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else if ($field instanceof ORMRecordSet) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
 //		$fieldName = $field->getName();
 //		$parentSet = $field->getParentSet();
 //		$parentSet->join($fieldName);
 //		$set = $parentSet->$fieldName;
-		$records = $field->select();
-		$records->orderAsc($field->name);
-		$pkName = $field->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else {
-		$widget = $W->LineEdit();
-	}
-
-	$widget->setName($field->getName());
-
-	return $widget;
+        $records = $field->select();
+        $records->orderAsc($field->name);
+        $pkName = $field->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else {
+        $widget = $W->LineEdit();
+    }
+
+    $widget->setName($field->getName());
+
+    return $widget;
 }
 
 
 
 function app_LabelledOrmWidget(ORMField $field, $label = null, $hidden = false)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
-	if ($hidden) {
-		$widget = $W->Hidden();
-		$widget->setName($field->getName());
-		return $widget;
-	}
+    if ($hidden) {
+        $widget = $W->Hidden();
+        $widget->setName($field->getName());
+        return $widget;
+    }
 
-	if (is_null($label)) {
-		$label = $field->getDescription();
-	}
+    if (is_null($label)) {
+        $label = $field->getDescription();
+    }
 
-	$widget = app_OrmWidget($field);
+    $widget = app_OrmWidget($field);
 
-	return app_LabelledWidget($label, $widget);
+    return app_LabelledWidget($label, $widget);
 }
 
 
@@ -377,16 +377,16 @@ 
  */
 function app_dateTime(ORMField $field, $value) {
 
-	$W = \bab_functionality::get('Widgets');
-	$name = $field->getName();
-	$label = $W->Label($field->getDescription());
+    $W = \bab_functionality::get('Widgets');
+    $name = $field->getName();
+    $label = $W->Label($field->getDescription());
 
-	$frame = app_dateTimeField($name, $label, $value);
+    $frame = app_dateTimeField($name, $label, $value);
 
-	return $W->VBoxItems(
-		$label,
-		$frame
-	);
+    return $W->VBoxItems(
+        $label,
+        $frame
+    );
 
 }
 
@@ -400,24 +400,24 @@ 
  */
 function app_dateTimeField($fieldName, WidgetLabel $label, $value = null)
 {
-	$W = \bab_functionality::get('Widgets');
+    $W = \bab_functionality::get('Widgets');
 
-	$datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
-	$timepart = $W->TimePicker()->setName('time');
+    $datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
+    $timepart = $W->TimePicker()->setName('time');
 
-	if (isset($value)) {
+    if (isset($value)) {
 
-		$value = explode(' ', $value);
+        $value = explode(' ', $value);
 
-		$datepart->setValue($value[0]);
-		$timepart->setValue($value[1]);
-	}
+        $datepart->setValue($value[0]);
+        $timepart->setValue($value[1]);
+    }
 
-	$datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
-			->addItem($datepart)
-			->addItem($timepart);
+    $datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
+            ->addItem($datepart)
+            ->addItem($timepart);
 
-	return $datetime;
+    return $datetime;
 }
 
 

programs/Ui/AppCriteriaEditor.php

Braces +5 added lines, -10 removed lines

@@ -159,13 +159,11 @@ 
                     
                     if($foreignRecordSetField instanceof ORMBoolInterface){
                         $booleanFieldPathes[] = $foreignPath;
-                    }
-                    else{
+                    } else{
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
-            }
-            elseif($recordSetField instanceof ORMFkField){
+            } elseif($recordSetField instanceof ORMFkField){
                 /* @var $recordSetField ORMFkField */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -182,13 +180,11 @@ 
                     
                     if($foreignRecordSetField instanceof ORMBoolInterface){
                         $booleanFieldPathes[] = $foreignPath;
-                    }
-                    else{
+                    } else{
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
-            }
-            else{
+            } else{
                 /* @var $recordSetField ORMField */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();
@@ -204,8 +200,7 @@ 
                 
                 if($recordSetField instanceof ORMBoolInterface){
                     $booleanFieldPathes[] = $path;
-                }
-                else{
+                } else{
                     $defaultFieldPathes[] = $path;
                 }
             }

programs/Ctrl/AppCtrlCustomContainer.php

Braces +5 added lines, -10 removed lines

@@ -264,8 +264,7 @@ 
         $customSectionSet = $App->CustomContainerSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->object = $object;
         }
@@ -522,8 +521,7 @@ 
                     
                     if($selectedManyField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -551,8 +549,7 @@ 
                     
                     if($selectedOneField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -561,15 +558,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof ORMBoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             

programs/Ctrl/AppCtrlCustomSection.php

Braces +7 added lines, -14 removed lines

@@ -506,8 +506,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -813,8 +812,7 @@ 
                     
                     if($selectedManyField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -842,8 +840,7 @@ 
                     
                     if($selectedOneField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -852,15 +849,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof ORMBoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             
@@ -1268,12 +1263,10 @@ 
                     foreach ($sections[$currentSection->id . '.fieldsGroups'][$fieldName] as $subKey => $subValue){
                         $rawSectionData[$currentSectionId][$fieldName]['fields'][$subKey] = $field['fields'][$subKey];
                     }
-                }
-                elseif($fieldName != 'fieldsGroups'){
+                } elseif($fieldName != 'fieldsGroups'){
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
-            }
-            else{
+            } else{
                 $field = null;
                 $tmpSection = $customSectionSet->get($customSectionSet->id->is($fieldSectionId));
                 if($tmpSection){

programs/Ctrl/AppController.php

Braces +20 added lines, -40 removed lines

@@ -187,8 +187,7 @@ 
     {
         if($this->isAjaxRequest()){
             $authType = 'Basic';
-        }
-        else{
+        } else{
             $authType = '';
         }
         
@@ -263,8 +262,7 @@ 
                     
                     if($parameter->isDefaultValueAvailable()){
                         $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
-                    }
-                    else{
+                    } else{
                         $parametersStr[] = '$' . $parameter->name;
                     }
                 }
@@ -358,11 +356,9 @@ 
             $parameterName = $parameter->getName();
             if(isset($args[$argNumber])){
                 $actionParams[$parameterName] = $args[$argNumber];
-            }
-            elseif($parameter->isDefaultValueAvailable()){
+            } elseif($parameter->isDefaultValueAvailable()){
                 $actionParams[$parameterName] = $parameter->getDefaultValue();
-            }
-            else{
+            } else{
                 $actionParams[$parameterName] = null;
             }
             $argNumber ++;
@@ -440,8 +436,7 @@ 
             if($component){
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
-            }
-            else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 throw new AppUnknownActionException($action);
             }
@@ -456,13 +451,11 @@ 
         
         try{
             $returnedValue = $objectController->execAction($action);
-        }
-        catch (AppAccessException $e){
+        } catch (AppAccessException $e){
             
             if(! bab_isUserLogged() && $e->requireCredential){
                 bab_requireCredential($e->getMessage());
-            }
-            else{
+            } else{
                 if($this->isAjaxRequest()){
                     
                     header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
@@ -475,8 +468,7 @@ 
                 }
                 $this->accessPage($e);
             }
-        }
-        catch (AppSaveException $e){
+        } catch (AppSaveException $e){
             
             if($this->isAjaxRequest()){
                 header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
@@ -490,17 +482,13 @@ 
                     'errorMessage' => bab_convertStringFromDatabase($e->getMessage(), 'UTF-8')
                 )));
             }
-        }
-        catch (AppDeletedRecordException $e){
+        } catch (AppDeletedRecordException $e){
             $this->deletedItemPage($action, $e);
-        }
-        catch (AppNotFoundException $e){
+        } catch (AppNotFoundException $e){
             $this->notFoundPage($action, $e);
-        }
-        catch (ORMException $e){
+        } catch (ORMException $e){
             $this->errorPage($e);
-        }
-        catch (\Exception $e){
+        } catch (\Exception $e){
             $this->unexpectedErrorPage($e);
         }
         
@@ -512,8 +500,7 @@ 
                 
                 // If the action returned a page, we display it.
                 $returnedValue->displayHtml();
-            }
-            else{
+            } else{
                 
                 $htmlCanvas = $W->HtmlCanvas();
                 if(self::$acceptJson){
@@ -525,8 +512,7 @@ 
                     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                     header('Content-type: application/json');
                     die(bab_json_encode($returnArray));
-                }
-                else{
+                } else{
                     header('Cache-Control: no-cache, must-revalidate');
                     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                     header('Content-type: text/html');
@@ -535,8 +521,7 @@ 
                         
                         if(method_exists($htmlCanvas, 'sendPageTitle')){
                             $htmlCanvas->sendPageTitle($pageTitle);
-                        }
-                        else{
+                        } else{
                             header('X-Cto-PageTitle: ' . $pageTitle);
                         }
                     }
@@ -544,16 +529,14 @@ 
                     die($html);
                 }
             }
-        }
-        elseif(is_array($returnedValue)){
+        } elseif(is_array($returnedValue)){
             
             $htmlCanvas = $W->HtmlCanvas();
             $returnedArray = array();
             foreach ($returnedValue as $key => &$item){
                 if($item instanceof WidgetDisplayableInterface){
                     $returnedArray[$item->getId()] = $item->display($htmlCanvas);
-                }
-                else{
+                } else{
                     $returnedArray[$key] = $item;
                 }
             }
@@ -561,8 +544,7 @@ 
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Content-type: application/json');
             die(bab_convertStringFromDatabase(bab_json_encode($returnedArray), \bab_charset::UTF_8));
-        }
-        elseif(true === $returnedValue || is_string($returnedValue)){
+        } elseif(true === $returnedValue || is_string($returnedValue)){
             
             if($this->isAjaxRequest()){
                 $body = bab_getBody();
@@ -739,8 +721,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         
@@ -803,8 +784,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         

programs/Func_App.php

Braces +3 added lines, -4 removed lines

@@ -163,7 +163,7 @@ 
     {
         if(isset($this->components[$componentName])){
             return $this->components[$componentName];
-        }else{
+        } else{
             return null;
         }
     }
@@ -431,8 +431,7 @@ 
                 if(empty($component->getPackageName())){
                     $noPackageNames[] = $component->getName();
                 }
-            }
-            catch (\Exception $e){
+            } catch (\Exception $e){
                 
             }
         }
@@ -892,7 +891,7 @@ 
     {
         if(get_class($this) == "Capwelton\LibApp\Func_App"){
             return bab_getInstance("Capwelton\LibApp\Ui\AppUi")->setApp($this);
-        }else{
+        } else{
             return bab_getInstance($this->classPrefix . 'Ui')->setApp($this);
         }
     }