capwelton / libapp

programs/functions.php

Braces +2 added lines, -2 removed lines

@@ -280,7 +280,7 @@ 
         foreach($input as $k=>$v){
             $return[utf8_decode($k)] = app_utf8Decode($v);
         }
-    }else{
+    } else{
         return utf8_decode($input);
     }
     return $return;
@@ -292,7 +292,7 @@ 
         foreach($input as $k=>$v){
             $return[app_utf8Encode($k)] = app_utf8Encode($v);
         }
-    }else{
+    } else{
         return utf8_encode($input);
     }
     return $return;

programs/Set/AppRecordSet.php

Braces +10 added lines, -19 removed lines

@@ -180,8 +180,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
                 }
             }
@@ -218,8 +217,7 @@ 
             if($ormField instanceof ORMFkField){
                 $this->hasOne($customField->fieldname, $ormField->getForeignSetName())
                     ->setDescription($description);
-            }
-            else{
+            } else{
                 $this->addFields($ormField);
             }
         }
@@ -282,8 +280,7 @@ 
         
         if(is_array($source) || ($source instanceof \Iterator)){
             return $linkSet->selectForSources($source, $targetClass, $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForSource($source, $targetClass, $linkType);
         }
     }
@@ -309,8 +306,7 @@ 
         
         if(is_array($target) || ($target instanceof \Iterator)){
             return $linkSet->selectForTargets($target, $sourceClass, $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForTarget($target, $sourceClass, $linkType);
         }
     }
@@ -345,8 +341,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -389,8 +384,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -443,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));
             }
         }
@@ -497,8 +490,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -615,8 +607,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)){
@@ -652,7 +643,7 @@ 
     public function getDisplayNameField(){
         if($this->fieldExist("name")){
             return $this->name;
-        }else{
+        } else{
             return $this->id;
         }
     }

programs/Set/AppTraceableRecordSet.php

Braces +1 added lines, -1 removed lines

@@ -352,7 +352,7 @@
     public function getDisplayNameField(){
         if($this->fieldExist("name")){
             return $this->name;
-        }else{
+        } else{
             return $this->uuid;
         }
     }

programs/Traits/LocaleApp.php

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
                 return null;
             }
             return \bab_functionality::get($composerjson['appFunctionality']);
-        }
-        catch (\Exception $e){
+        } catch (\Exception $e){
             return null;
         }
     }

programs/Ctrl/AppCtrlRecord.php

Indentation +2 added lines, -2 removed lines

@@ -2141,7 +2141,7 @@
         }
     
         header("Content-type: application/json; charset=utf-8");
-	    echo $collection->output();
-	    die();
+        echo $collection->output();
+        die();
     }
 }

programs/Ui/AppHelpers.php

Indentation +208 added lines, -208 removed lines

@@ -59,50 +59,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;
 }
 
 
@@ -115,50 +115,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;
 }
 
 
@@ -171,47 +171,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;
 }
 
 
@@ -219,42 +219,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);
 }
 
 
@@ -302,36 +302,36 @@ 
             ->setMaxSize($field->getMaxLength());
     } else if ($field instanceof ORMTextField) {
         $widget = $W->TextEdit()
-          ->addClass('widget-autoresize');
+            ->addClass('widget-autoresize');
     } else if ($field instanceof ORMPkField) {
         $widget = $W->Hidden();
     } else if ($field instanceof ORMFkField) {
 
         $fieldName = $field->getName();
         /** @var AppRecordSet $parentSet */
-		$parentSet = clone $field->getParentSet();
+        $parentSet = clone $field->getParentSet();
         $parentSet->join($fieldName);
         $set = $parentSet->$fieldName;
         $records = $set->select();
-		$pkName = $set->getPrimaryKey();
-		if($set->fieldExist("name")){
-			$displayField = $set->name->getName();
-		}else if(method_exists($set,"getDisplayNameField")){
-			$displayField = $set->getDisplayNameField()->getName();
-		}else{
-			$displayField = $pkName;
-		}
-		$records->orderAsc($set->$displayField);
-		if($records->count() > 50){
-			$widget = bab_Widgets()->select2();
-			$widget->setDataSource($set->getController()->search());
-		}else{
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($records as $record) {
-				$widget->addOption($record->$pkName, $record->$displayField);
-			}
-		}
+        $pkName = $set->getPrimaryKey();
+        if($set->fieldExist("name")){
+            $displayField = $set->name->getName();
+        }else if(method_exists($set,"getDisplayNameField")){
+            $displayField = $set->getDisplayNameField()->getName();
+        }else{
+            $displayField = $pkName;
+        }
+        $records->orderAsc($set->$displayField);
+        if($records->count() > 50){
+            $widget = bab_Widgets()->select2();
+            $widget->setDataSource($set->getController()->search());
+        }else{
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($records as $record) {
+                $widget->addOption($record->$pkName, $record->$displayField);
+            }
+        }
     } else if ($field instanceof ORMRecordSet) {
         $widget = $W->Select();
 ////        $widget = $W->MultiSelect()->setSingleSelect();
@@ -357,21 +357,21 @@ 
 
 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);
 }
 
 
@@ -387,16 +387,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
+    );
 
 }
 
@@ -410,24 +410,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;
 }
 
 

Braces +3 added lines, -3 removed lines

@@ -316,16 +316,16 @@
 		$pkName = $set->getPrimaryKey();
 		if($set->fieldExist("name")){
 			$displayField = $set->name->getName();
-		}else if(method_exists($set,"getDisplayNameField")){
+		} else if(method_exists($set,"getDisplayNameField")){
 			$displayField = $set->getDisplayNameField()->getName();
-		}else{
+		} else{
 			$displayField = $pkName;
 		}
 		$records->orderAsc($set->$displayField);
 		if($records->count() > 50){
 			$widget = bab_Widgets()->select2();
 			$widget->setDataSource($set->getController()->search());
-		}else{
+		} else{
 			$widget = $W->Select();
 			$widget->addOption('', '');
 			foreach ($records as $record) {

programs/Ui/AppTableModelView.php

Braces +14 added lines, -27 removed lines

@@ -140,16 +140,14 @@ 
                 $isSearchable = false;
                 $isSortable = false;
                 $columnItem = $W->FlexItems($this->toggleCheckAllBox);
-            }
-            elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){
+            } elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){
                 if(! isset($this->sortBaseUrl)){
                     $this->sortBaseUrl = \bab_url::request_gp();
                 }
                 
                 if($this->sortField === $columnPath && $this->sortAscending){
                     $direction = ':down';
-                }
-                else{
+                } else{
                     $direction = ':up';
                 }
                 
@@ -166,8 +164,7 @@ 
                     $columnItem->setAjaxAction($this->sortAjaxAction->setParameter('sort', $columnPath . $direction), '');
                 }
                 $columnItem = $W->FlexItems($columnItem);
-            }
-            else{
+            } else{
                 $columnItem = $W->FlexItems($W->Label($columnLabel), $W->Label(''));
             }
             
@@ -299,20 +296,17 @@ 
         
         if(isset($name)){
             $this->sortParameterName = $name . '[filter][sort]';
-        }
-        else{
+        } else{
             $this->sortParameterName = 'filter[sort]';
         }
         
         if(isset($filter['sort'])){
             $this->setSortField($filter['sort']);
-        }
-        elseif(! isset($this->sortField)){
+        } elseif(! isset($this->sortField)){
             
             if(method_exists($this, 'getDefaultSortField')){
                 $this->setSortField($this->getDefaultSortField());
-            }
-            else{
+            } else{
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -327,8 +321,7 @@ 
                     $name,
                     'filter'
                 );
-            }
-            else{
+            } else{
                 $path = array(
                     'filter'
                 );
@@ -389,8 +382,7 @@ 
             $pos = strrpos($setName, '\\');
             if($pos === false){
                 list (, $appSetName) = explode('_', $setName);
-            }
-            else{
+            } else{
                 list (, $appSetName) = array(
                     substr($setName, 0, $pos),
                     substr($setName, $pos + 1)
@@ -409,7 +401,7 @@ 
             if($values->count()>15){
                 $widget = bab_Widgets()->select2();
                 $widget->setDataSource($set->getController()->search());
-            }else{
+            } else{
                 $widget = $W->Select();
                 $widget->addOption('', '');
                 foreach ($values as $record){
@@ -549,8 +541,7 @@ 
                         ->addClass('icon', \Func_Icons::STATUS_DIALOG_ERROR)
                         ->addAttribute('data-removefor', $column->getFieldPath()))
                         ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END));
-                }
-                elseif($displayAdvancedForm){
+                } elseif($displayAdvancedForm){
                     $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12');
                     $filterBox->addItem($formItem);
                 }
@@ -683,20 +674,17 @@ 
         
         if(isset($name)){
             $this->sortParameterName = $name . '[filter][sort]';
-        }
-        else{
+        } else{
             $this->sortParameterName = 'filter[sort]';
         }
         
         if(isset($filter['sort'])){
             $this->setSortField($filter['sort']);
-        }
-        elseif(! isset($this->sortField)){
+        } elseif(! isset($this->sortField)){
             
             if(method_exists($this, 'getDefaultSortField')){
                 $this->setSortField($this->getDefaultSortField());
-            }
-            else{
+            } else{
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -711,8 +699,7 @@ 
                     $name,
                     'filter'
                 );
-            }
-            else{
+            } else{
                 $path = array(
                     'filter'
                 );