capwelton / libapp

programs/Ui/AppCriteriaEditor.php

Spacing +21 added lines, -21 removed lines

@@ -71,17 +71,17 @@ 
      */
     public function getRecordSet()
     {
-        if(isset($this->recordSet)){
+        if (isset($this->recordSet)) {
             return $this->recordSet;
         }
         
         $parentField = $this->criteria->getField();
         
-        if(! isset($parentField)){
+        if (!isset($parentField)) {
             return null;
         }
         
-        do{
+        do {
             $field = $parentField;
             $parentField = $field->getParentSet();
         }
@@ -134,8 +134,8 @@ 
         
         $classPrefix = $App->classPrefix;
         
-        foreach ($recordSetFields as $fieldName => $recordSetField){
-            if($recordSetField instanceof ORMManyRelation){
+        foreach ($recordSetFields as $fieldName => $recordSetField) {
+            if ($recordSetField instanceof ORMManyRelation) {
                 /* @var $recordSetField ORMManyRelation */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -144,28 +144,28 @@ 
                 $foreignRecordSet = $App->$foreignSetName();
                 $foreignRecordSetFields = $foreignRecordSet->getVisibilityCriteriaFields();
                 
-                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField){
+                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField) {
                     $foreignFieldName = $foreignRecordSetField->getName();
                     $foreignFieldDescription = $foreignRecordSetField->getDescription();
-                    if(substr($foreignFieldName, 0, 1) !== '_'){
+                    if (substr($foreignFieldName, 0, 1) !== '_') {
                         $foreignFieldDescription = $App->translate($foreignFieldDescription);
                     }
-                    if(empty($foreignFieldDescription)){
+                    if (empty($foreignFieldDescription)) {
                         $foreignFieldDescription = $foreignFieldName;
                     }
-                    $foreignPath = $path . '/' . $foreignRecordSetField->getPath();
+                    $foreignPath = $path.'/'.$foreignRecordSetField->getPath();
                     
                     $recordSetFieldSelect->addOption($foreignPath, $foreignFieldDescription, $fieldName);
                     
-                    if($foreignRecordSetField instanceof ORMBoolInterface){
+                    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;
@@ -174,38 +174,38 @@ 
                 $foreignRecordSet = $App->$foreignSetName();
                 $foreignRecordSetFields = $foreignRecordSet->getVisibilityCriteriaFields();
                 
-                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField){
+                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField) {
                     $foreignFieldDescription = $foreignFieldName;
-                    $foreignPath = $path . '/' . $foreignFieldName;
+                    $foreignPath = $path.'/'.$foreignFieldName;
                     
                     $recordSetFieldSelect->addOption($foreignPath, $foreignFieldDescription, $fieldName);
                     
-                    if($foreignRecordSetField instanceof ORMBoolInterface){
+                    if ($foreignRecordSetField instanceof ORMBoolInterface) {
                         $booleanFieldPathes[] = $foreignPath;
                     }
-                    else{
+                    else {
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
             }
-            else{
+            else {
                 /* @var $recordSetField ORMField */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();
-                if(substr($fieldName, 0, 1) !== '_'){
+                if (substr($fieldName, 0, 1) !== '_') {
                     $fieldDescription = $App->translate($fieldDescription);
                 }
-                if(empty($fieldDescription)){
+                if (empty($fieldDescription)) {
                     $fieldDescription = $fieldName;
                 }
                 $path = $recordSetField->getPath();
                 
                 $recordSetFieldSelect->addOption($path, $fieldDescription);
                 
-                if($recordSetField instanceof ORMBoolInterface){
+                if ($recordSetField instanceof ORMBoolInterface) {
                     $booleanFieldPathes[] = $path;
                 }
-                else{
+                else {
                     $defaultFieldPathes[] = $path;
                 }
             }

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'];
             }
             

Spacing +66 added lines, -66 removed lines

@@ -73,15 +73,15 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -96,7 +96,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -150,7 +150,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -166,11 +166,11 @@ 
         
         $field = $availableFields[$fieldName];
         $fieldDescription = $field['description'];
-        if(substr($fieldName, 0, 1) !== '_'){
+        if (substr($fieldName, 0, 1) !== '_') {
             $fieldDescription = $App->translate($fieldDescription);
         }
         
-        if(empty($field)){
+        if (empty($field)) {
             // continue;
         }
         
@@ -271,10 +271,10 @@ 
         $W = bab_Widgets();
         
         $customSectionSet = $App->CustomContainerSet();
-        if(isset($id)){
+        if (isset($id)) {
             $record = $customSectionSet->request($id);
         }
-        else{
+        else {
             $record = $customSectionSet->newRecord();
             $record->object = $object;
         }
@@ -287,7 +287,7 @@ 
         $editor = new AppEditor($App);
         $editor->setHiddenValue('tg', $App->controllerTg);
         $editor->setHiddenValue('data[view]', $view);
-        if($record->id){
+        if ($record->id) {
             $editor->setHiddenValue('data[id]', $record->id);
         }
         $editor->setName('data');
@@ -365,10 +365,10 @@ 
         $record = $recordSet->request($id);
         
         $object = $record->object;
-        if(empty($object)){
+        if (empty($object)) {
             $object = $record->container()->object;
         }
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             $object = str_replace($App->classPrefix, '', $object);
         }
         $object .= 'Set';
@@ -383,25 +383,25 @@ 
         $manySets = $objectRecordSet->getHasManyRelations();
         $oneSets = $objectRecordSet->getHasOneRelations();
         
-        if(! empty($record->visibilityCriteria)){
+        if (!empty($record->visibilityCriteria)) {
             $arrCriteria = json_decode($record->visibilityCriteria, true);
             
             $data = array();
-            foreach ($arrCriteria as $fieldName => $operation){
+            foreach ($arrCriteria as $fieldName => $operation) {
                 $data['field'] = $fieldName;
-                foreach ($operation as $condition => $value){
+                foreach ($operation as $condition => $value) {
                     $data['condition']['default'] = $condition;
                     $data['condition']['bool'] = $condition;
-                    if(is_array($value)){
-                        foreach ($value as $key => $subValue){
-                            foreach ($manySets as $manyFieldName => $manyRelation){
-                                if($key . 'Set' == $manyRelation->getForeignSetClassName()){
-                                    foreach ($subValue as $subFieldName => $subConditions){
-                                        if($subFieldName === '_foreignField'){
+                    if (is_array($value)) {
+                        foreach ($value as $key => $subValue) {
+                            foreach ($manySets as $manyFieldName => $manyRelation) {
+                                if ($key.'Set' == $manyRelation->getForeignSetClassName()) {
+                                    foreach ($subValue as $subFieldName => $subConditions) {
+                                        if ($subFieldName === '_foreignField') {
                                             continue;
                                         }
                                         $data['field'] = "{$manyFieldName}/{$subFieldName}";
-                                        foreach ($subConditions as $subCondition => $subConditionValue){
+                                        foreach ($subConditions as $subCondition => $subConditionValue) {
                                             $data['condition']['default'] = $subCondition;
                                             $data['condition']['bool'] = $subCondition;
                                             $value = $subConditionValue;
@@ -410,14 +410,14 @@ 
                                     break;
                                 }
                             }
-                            foreach ($oneSets as $oneFieldName => $oneRelation){
-                                if($key . 'Set' == $oneRelation->getForeignSetClassName()){
-                                    foreach ($subValue as $subFieldName => $subConditions){
-                                        if($subFieldName === '_foreignField'){
+                            foreach ($oneSets as $oneFieldName => $oneRelation) {
+                                if ($key.'Set' == $oneRelation->getForeignSetClassName()) {
+                                    foreach ($subValue as $subFieldName => $subConditions) {
+                                        if ($subFieldName === '_foreignField') {
                                             continue;
                                         }
                                         $data['field'] = "{$oneFieldName}/{$subFieldName}";
-                                        foreach ($subConditions as $subCondition => $subConditionValue){
+                                        foreach ($subConditions as $subCondition => $subConditionValue) {
                                             $data['condition']['default'] = $subCondition;
                                             $data['condition']['bool'] = $subCondition;
                                             $value = $subConditionValue;
@@ -459,10 +459,10 @@ 
         return true;
     }
     
-    protected function preSave(ORMRecord  &$record, $data)
+    protected function preSave(ORMRecord & $record, $data)
     {
         parent::preSave($record, $data);
-        if(! isset($record->id) || empty($record->id)){
+        if (!isset($record->id) || empty($record->id)) {
             $set = $record->getParentSet();
             $nbContainers = $set->select($set->all(array(
                 $set->object->is($record->object),
@@ -497,10 +497,10 @@ 
         $record = $recordSet->request($data['id']);
         
         $object = $record->object;
-        if(empty($object)){
+        if (empty($object)) {
             $object = $record->container()->object;
         }
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             $object = str_replace($App->classPrefix, '', $object);
         }
         $object .= 'Set';
@@ -511,14 +511,14 @@ 
         $field = $data['field'];
         $condition = $data['condition'];
         
-        if(strpos($field, '/') !== false){
+        if (strpos($field, '/') !== false) {
             // The selected field is a hasMany or a hasOne relation
             list ($selectedRelation, $selectedField) = explode('/', $field);
             $classPrefix = $App->classPrefix;
             
             $manyRelations = $objectRecordSet->getHasManyRelations();
-            foreach ($manyRelations as $manyRelation){
-                if($selectedRelation != $manyRelation->getOwnerSetFieldName()){
+            foreach ($manyRelations as $manyRelation) {
+                if ($selectedRelation != $manyRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetName = str_replace($classPrefix, '', $manyRelation->getForeignSetClassName());
@@ -526,13 +526,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedManyField = $foreignSet->$selectedField;
                     
-                    if($selectedManyField instanceof ORMBoolInterface){
+                    if ($selectedManyField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -544,9 +544,9 @@ 
             }
             
             $oneRelations = $objectRecordSet->getHasOneRelations();
-            foreach ($oneRelations as $oneRelation){
+            foreach ($oneRelations as $oneRelation) {
                 /* @var $oneRelation ORMOneRelation*/
-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){
+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetClassName = $oneRelation->getForeignSetClassName();
@@ -555,13 +555,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedOneField = $foreignSet->$selectedField;
                     
-                    if($selectedOneField instanceof ORMBoolInterface){
+                    if ($selectedOneField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -571,20 +571,20 @@ 
                 break;
             }
         }
-        else{
+        else {
             
             $field = $objectRecordSet->$field;
             
-            if($field instanceof ORMBoolInterface){
+            if ($field instanceof ORMBoolInterface) {
                 $condition = $condition['bool'];
             }
-            else{
+            else {
                 $condition = $condition['default'];
             }
             
             $visibilityCriteria = '';
             
-            if(! empty($condition)){
+            if (!empty($condition)) {
                 $criteria = $field->{$condition}($data['value']);
                 $visibilityCriteria = $criteria->toJson();
             }
@@ -619,7 +619,7 @@ 
         
         $containerBoxes = $W->Items();
         
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             
             $menu = $W->HBoxItems($W->Link('', $customSectionCtrl->edit($customContainer->id))
                 ->addClass('icon', FuncIcons::ACTIONS_LIST_ADD)
@@ -634,7 +634,7 @@ 
             $menu->setSizePolicy(FuncIcons::ICON_LEFT_16);
             
             $hasVisibilityBox = $W->FlowItems()->addClass('widget-100');
-            if(! empty($customContainer->visibilityCriteria)){
+            if (!empty($customContainer->visibilityCriteria)) {
                 $hasVisibilityBox->addItem($W->HBoxItems($W->Label($App->translate('This container has a visibility condition')))
                     ->setSizePolicy('alert alert-warning widget-100pc'));
             }
@@ -645,7 +645,7 @@ 
                 ->addClass($customContainer->classname));
         }
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $containerBoxes->setId($itemId);
         }
         
@@ -671,7 +671,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         
         $containersValues = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $values = $customContainer->getValues();
             unset($values['id']);
             unset($values['uuid']);
@@ -684,7 +684,7 @@ 
             unset($values['deleted']);
             $values['customSections'] = array();
             $customSections = $customSectionSet->select($customSectionSet->container->is($customContainer->id));
-            foreach ($customSections as $customSection){
+            foreach ($customSections as $customSection) {
                 $customSectionValues = $customSection->getValues();
                 unset($customSectionValues['id']);
                 unset($customSectionValues['uuid']);
@@ -703,8 +703,8 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"' . "\n");
-        if(BabCharset::getIso() != BabCharset::UTF_8){
+        header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n");
+        if (BabCharset::getIso() != BabCharset::UTF_8) {
             $containersValues = app_utf8Encode($containersValues);
         }
         $json = bab_json_encode($containersValues);
@@ -763,12 +763,12 @@ 
         $files->push($containersfile['uid']);
         
         $data = null;
-        foreach ($files as $f){
+        foreach ($files as $f) {
             $data = file_get_contents($f->toString());
             break;
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             $this->addError($App->translate('Unable to get file content'));
             return true;
         }
@@ -784,13 +784,13 @@ 
         $customContainerSet->delete($customContainerSet->view->is($view)
             ->_AND_($customContainerSet->object->is($object)));
         
-        foreach ($containersValues as $containerValues){
+        foreach ($containersValues as $containerValues) {
             $customContainer = $customContainerSet->newRecord();
             $customContainer->setValues($containerValues);
             $customContainer->object = $object;
             $customContainer->view = $view;
             $customContainer->save();
-            foreach ($containerValues['customSections'] as $sectionValues){
+            foreach ($containerValues['customSections'] as $sectionValues) {
                 $customSection = $customSectionSet->newRecord();
                 $sectionValues['fields'] = json_encode($sectionValues['fields']);
                 $customSection->setValues($sectionValues);
@@ -924,9 +924,9 @@ 
         
         $rank = 0;
         $currentContainerId = 0;
-        foreach (array_keys($containers) as $containerFieldId){
+        foreach (array_keys($containers) as $containerFieldId) {
             
-            if(substr($containerFieldId, 0, 1) === '#'){
+            if (substr($containerFieldId, 0, 1) === '#') {
                 $currentContainerId = substr($containerFieldId, 1);
                 
                 $customContainer = $customContainerSet->request($customContainerSet->id->is($currentContainerId));
@@ -935,7 +935,7 @@ 
                 $containersRawFields[$currentContainerId] = $customContainer->getRawFields();
                 
                 $customContainer->rank = $rank;
-                $rank ++;
+                $rank++;
                 $customContainer->save();
                 continue;
             }
@@ -943,18 +943,18 @@ 
             $containersFields[$currentContainerId][] = $containerFieldId;
         }
         
-        foreach ($containersFields as $containerId => $containerFieldIds){
-            foreach ($containerFieldIds as $containerFieldId){
+        foreach ($containersFields as $containerId => $containerFieldIds) {
+            foreach ($containerFieldIds as $containerFieldId) {
                 list ($srcContainerId, $srcfieldId) = explode('.', $containerFieldId);
-                if(! isset($containersRawFields[$srcContainerId][$srcfieldId])){
+                if (!isset($containersRawFields[$srcContainerId][$srcfieldId])) {
                     return true;
                 }
             }
         }
         
-        foreach ($containersFields as $containerId => $containerFieldIds){
+        foreach ($containersFields as $containerId => $containerFieldIds) {
             $newRawFields = array();
-            foreach ($containerFieldIds as $containerFieldId){
+            foreach ($containerFieldIds as $containerFieldId) {
                 list ($srcContainerId, $srcfieldId) = explode('.', $containerFieldId);
                 $newRawFields[] = $containersRawFields[$srcContainerId][$srcfieldId];
             }

programs/AppAccessManager.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
     public function hasNoAccess(AppRecordSet $recordSet, $accessType, $user = null)
     {
         $criterion = $this->getAccessCriterion($recordSet, $accessType, $user);
-        if(! $criterion instanceof ORMFalseCriterion){
+        if (!$criterion instanceof ORMFalseCriterion) {
             return false;
         }
         return true;

programs/Ctrl/AppCtrlSSE.php

Spacing +6 added lines, -6 removed lines

@@ -47,15 +47,15 @@ 
         
         $refreshFrequency = $this->getRefreshFrequency();
         
-        while (1){
-            if(connection_aborted()){
+        while (1) {
+            if (connection_aborted()) {
                 exit();
             }
             $data = $this->getSSEData();
-            if($data != '{}'){
+            if ($data != '{}') {
                 echo "event: ping\n";
                 echo "\n\n";
-                echo 'data: ' . $this->getSSEData() . "\n\n";
+                echo 'data: '.$this->getSSEData()."\n\n";
             }
             ob_end_flush();
             flush();
@@ -79,7 +79,7 @@ 
     
     private function getRefreshFrequency()
     {
-        if(! isset($this->refreshFrequency)){
+        if (!isset($this->refreshFrequency)) {
             $registry = app_getRegistry();
             $registry->changeDirectory('configuration');
             $registry->changeDirectory('SSE');
@@ -98,7 +98,7 @@ 
     
     private function getCurrentUser()
     {
-        if(isset($this->currentUser)){
+        if (isset($this->currentUser)) {
             return $this->currentUser;
         }
         

programs/functions.php

Spacing +12 added lines, -12 removed lines

@@ -110,7 +110,7 @@ 
     if (null === $url) {
         $script = '<script type="text/javascript">';
         if (isset($message)) {
-            $script .= 'alert("' . bab_toHtml($message, BAB_HTML_JS) . '");';
+            $script .= 'alert("'.bab_toHtml($message, BAB_HTML_JS).'");';
         }
         $script .= 'history.back();';
         $script .= '</script>';
@@ -122,7 +122,7 @@ 
         $url = $url->url();
     }
     if (!empty($babBody->msgerror)) {
-        $url .=  '&msgerror=' . urlencode($babBody->msgerror);
+        $url .= '&msgerror='.urlencode($babBody->msgerror);
     }
     if (isset($message)) {
         $lines = explode("\n", $message);
@@ -131,7 +131,7 @@ 
         }
     }
 
-    header('Location: ' . $url);
+    header('Location: '.$url);
     die;
 }
 
@@ -163,7 +163,7 @@ 
  */
 function app_fileUploadError($error)
 {
-    switch($error) {
+    switch ($error) {
         case UPLOAD_ERR_OK:
             return null;
 
@@ -274,25 +274,25 @@ 
     return $imageUrl;
 }
 
-function app_utf8Decode($input){
-    if(is_array($input)){
+function app_utf8Decode($input) {
+    if (is_array($input)) {
         $return = array();
-        foreach($input as $k=>$v){
+        foreach ($input as $k=>$v) {
             $return[utf8_decode($k)] = app_utf8Decode($v);
         }
-    }else{
+    } else {
         return utf8_decode($input);
     }
     return $return;
 }
 
-function app_utf8Encode($input){
-    if(is_array($input)){
+function app_utf8Encode($input) {
+    if (is_array($input)) {
         $return = array();
-        foreach($input as $k=>$v){
+        foreach ($input as $k=>$v) {
             $return[app_utf8Encode($k)] = app_utf8Encode($v);
         }
-    }else{
+    } else {
         return utf8_encode($input);
     }
     return $return;

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

Spacing +59 added lines, -59 removed lines

@@ -103,11 +103,11 @@ 
      */
     protected function trimSetName($setName)
     {
-        if(strpos($setName, '_') === false){
+        if (strpos($setName, '_') === false) {
             return $setName;
         }
         $pos = strrpos($setName, '\\');
-        if($pos === false){
+        if ($pos === false) {
             return explode('_', $setName)[1];
         }
         return substr($setName, $pos + 1);
@@ -122,13 +122,13 @@ 
     public function join($fkFieldName)
     {
         $fkField = $this->getField($fkFieldName);
-        if(! ($fkField instanceof ORMFkField)){
+        if (!($fkField instanceof ORMFkField)) {
             return $this;
         }
         $setName = $fkField->getForeignSetName();
         
-        if(! $setName || 'Set' === $setName){
-            throw new \Exception('The set name is missing on foreign key field ' . $fkFieldName);
+        if (!$setName || 'Set' === $setName) {
+            throw new \Exception('The set name is missing on foreign key field '.$fkFieldName);
         }
         
         $appSetName = $this->trimSetName($setName);
@@ -166,22 +166,22 @@ 
     {
         $App = $this->App();
         
-        if(null === $this->customFields){
+        if (null === $this->customFields) {
             $this->customFields = array();
             
-            if(isset($App->CustomField)){
+            if (isset($App->CustomField)) {
                 $customFieldSet = $App->CustomFieldSet();
                 $object = mb_substr(get_class($this), mb_strlen($App->classPrefix), - mb_strlen('Set'));
-                try{
+                try {
                     $customFields = $customFieldSet->select($customFieldSet->object->is($object));
                     
-                    foreach ($customFields as $customfield){
+                    foreach ($customFields as $customfield) {
                         $this->customFields[] = $customfield;
                         
                         /*@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
                 }
             }
@@ -211,15 +211,15 @@ 
     public function addCustomFields()
     {
         $customFields = $this->selectCustomFields();
-        foreach ($customFields as $customField){
+        foreach ($customFields as $customField) {
             /*@var $customField AppCustomField */
             $description = $customField->name;
             $ormField = $customField->getORMField()->setDescription($description);
-            if($ormField instanceof ORMFkField){
+            if ($ormField instanceof ORMFkField) {
                 $this->hasOne($customField->fieldname, $ormField->getForeignSetName())
                     ->setDescription($description);
             }
-            else{
+            else {
                 $this->addFields($ormField);
             }
         }
@@ -248,12 +248,12 @@ 
     public function request($mixedParam = null, $sPropertyName = null)
     {
         $record = $this->get($mixedParam, $sPropertyName);
-        if(! isset($record)){
+        if (!isset($record)) {
             // This will remove the default criteria for TraceableRecords and
             // fetch even 'deleted' ones.
             $this->setDefaultCriteria(null);
             $record = $this->get($mixedParam, $sPropertyName);
-            if(isset($record)){
+            if (isset($record)) {
                 throw new AppDeletedRecordException($record, $mixedParam);
             }
             throw new AppNotFoundException($this, $mixedParam);
@@ -276,14 +276,14 @@ 
         $linkSet = $this->App()->LinkSet();
         
         $targetClass = $this->getRecordClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         
-        if(is_array($source) || ($source instanceof \Iterator)){
+        if (is_array($source) || ($source instanceof \Iterator)) {
             return $linkSet->selectForSources($source, $targetClass, $linkType);
         }
-        else{
+        else {
             return $linkSet->selectForSource($source, $targetClass, $linkType);
         }
     }
@@ -303,14 +303,14 @@ 
         $linkSet = $this->App()->LinkSet();
         
         $sourceClass = $this->getRecordClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         
-        if(is_array($target) || ($target instanceof \Iterator)){
+        if (is_array($target) || ($target instanceof \Iterator)) {
             return $linkSet->selectForTargets($target, $sourceClass, $linkType);
         }
-        else{
+        else {
             return $linkSet->selectForTarget($target, $sourceClass, $linkType);
         }
     }
@@ -328,13 +328,13 @@ 
         $linkSet = $App->LinkSet();
         
         $recordClassName = $this->getRecordClassName();
-        if(strpos($recordClassName, '\\')){
+        if (strpos($recordClassName, '\\')) {
             $recordClassName = (new \ReflectionClass($recordClassName))->getShortName();
         }
         $linkSet->hasOne('sourceId', $recordClassName);
         
         $targetClass = $target->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         
@@ -342,11 +342,11 @@ 
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is($this->newRecord()
             ->getClassName()));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -368,29 +368,29 @@ 
         $linkSet = $App->LinkSet();
         
         $recordClassName = $this->getRecordClassName();
-        if(strpos($recordClassName, '\\')){
+        if (strpos($recordClassName, '\\')) {
             $recordClassName = (new \ReflectionClass($recordClassName))->getShortName();
         }
         $linkSet->hasOne('targetId', $recordClassName);
         
         $sourceClass = $source->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = new \ReflectionClass($sourceClass);
         }
         
         $targetClass = $this->newRecord()->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = new \ReflectionClass($targetClass);
         }
         
         $criteria = $linkSet->sourceClass->is($sourceClass)
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($targetClass));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -412,39 +412,39 @@ 
         $App = $this->App();
         $linkSet = $App->LinkSet();
         $recordClassName = $linkSet->getRecordClassName();
-        if(strpos($recordClassName, '\\')){
+        if (strpos($recordClassName, '\\')) {
             $recordClassName = (new \ReflectionClass($recordClassName))->getShortName();
         }
         $linkSet->hasOne('targetId', $recordClassName);
         
         $sourceIdsByClasses = array();
-        foreach ($sources as $source){
+        foreach ($sources as $source) {
             $sourceClass = $source->getClassName();
-            if(strpos($sourceClass, '\\')){
+            if (strpos($sourceClass, '\\')) {
                 $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
             }
-            if(! isset($sourceIdsByClasses[$sourceClass])){
+            if (!isset($sourceIdsByClasses[$sourceClass])) {
                 $sourceIdsByClasses[$sourceClass] = array();
             }
             $sourceIdsByClasses[$sourceClass][] = $source->id;
         }
         
         $sourcesCriteria = array();
-        foreach ($sourceIdsByClasses as $sourceClass => $sourceIds){
+        foreach ($sourceIdsByClasses as $sourceClass => $sourceIds) {
             $sourcesCriteria[] = $linkSet->sourceClass->is($sourceClass)->_AND_($linkSet->sourceId->in($sourceIds));
         }
         
         $targetClass = $this->newRecord()->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         
         $criteria = $linkSet->all($linkSet->targetClass->is($targetClass), $linkSet->any($sourcesCriteria));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -466,39 +466,39 @@ 
         $App = $this->App();
         $linkSet = $App->LinkSet();
         $recordClassName = $this->getRecordClassName();
-        if(strpos($recordClassName, '\\')){
+        if (strpos($recordClassName, '\\')) {
             $recordClassName = (new \ReflectionClass($recordClassName))->getShortName();
         }
         $linkSet->hasOne('sourceId', $recordClassName);
         
         $targetIdsByClasses = array();
-        foreach ($targets as $target){
+        foreach ($targets as $target) {
             $targetClass = $target->getClassName();
-            if(strpos($targetClass, '\\')){
+            if (strpos($targetClass, '\\')) {
                 $targetClass = (new \ReflectionClass($targetClass))->getShortName();
             }
-            if(! isset($targetIdsByClasses[$targetClass])){
+            if (!isset($targetIdsByClasses[$targetClass])) {
                 $targetIdsByClasses[$targetClass] = array();
             }
             $targetIdsByClasses[$targetClass][] = $target->id;
         }
         
         $targetsCriteria = array();
-        foreach ($targetIdsByClasses as $targetClass => $targetIds){
+        foreach ($targetIdsByClasses as $targetClass => $targetIds) {
             $targetsCriteria[] = $linkSet->targetClass->is($targetClass)->_AND_($linkSet->targetId->in($targetIds));
         }
         
         $sourceClass = $this->newRecord()->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         
         $criteria = $linkSet->all($linkSet->sourceClass->is($sourceClass), $linkSet->any($targetsCriteria));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -613,19 +613,19 @@ 
         $criteria = $linkSet->sourceClass->is((new \ReflectionClass($this->getRecordClassName()))->getShortName())
             ->_AND_($linkSet->targetClass->is($tagClassName));
         
-        if(is_array($tagLabels)){
+        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)){
+        if (isset($linkType)) {
             $criteria = $criteria->_AND_($linkSet->type->is($linkType));
         }
         $links = $linkSet->select($criteria);
         
         $ids = array();
-        foreach ($links as $link){
+        foreach ($links as $link) {
             $ids[$link->sourceId] = $link->sourceId;
         }
         
@@ -636,23 +636,23 @@ 
     {
         $fields = $this->getFields();
         $manyRelations = $this->getHasManyRelations();
-        foreach ($manyRelations as $fieldName => $manyRelation){
+        foreach ($manyRelations as $fieldName => $manyRelation) {
             $fields[$fieldName] = $manyRelation;
         }
         return $fields;
     }
 
-    public function getController($proxy = true){
+    public function getController($proxy = true) {
         $name = $this->getRecordClassName();
         $reflection = new ReflectionClass($name);
         $name = $reflection->getShortName();
         return $this->App()->Controller()->$name($proxy);
     }
 
-    public function getDisplayNameField(){
-        if($this->fieldExist("name")){
+    public function getDisplayNameField() {
+        if ($this->fieldExist("name")) {
             return $this->name;
-        }else{
+        } else {
             return $this->id;
         }
     }

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;
         }
     }

Spacing +20 added lines, -20 removed lines

@@ -136,7 +136,7 @@ 
      */
     protected function logSave(AppTraceableRecord $record, $noTrace)
     {
-        if(! $this->isLoggable()){
+        if (!$this->isLoggable()) {
             return;
         }
         $App = $this->App();
@@ -159,14 +159,14 @@ 
      */
     protected function logDelete(ORMCriteria $criteria, $noTrace)
     {
-        if(! $this->isLoggable()){
+        if (!$this->isLoggable()) {
             return;
         }
         $App = $this->App();
         $userId = bab_getUserId();
         $logSet = $App->LogSet();
         $deletedRecords = $this->select($criteria);
-        foreach ($deletedRecords as $record){
+        foreach ($deletedRecords as $record) {
             $log = $logSet->newRecord();
             $log->noTrace = $noTrace;
             $log->objectClass = get_class($record);
@@ -192,7 +192,7 @@ 
      */
     public function select(ORMCriteria $criteria = null, $includeDeleted = false)
     {
-        if($includeDeleted){
+        if ($includeDeleted) {
             $this->setDefaultCriteria(null);
         }
         return parent::select($criteria);
@@ -235,9 +235,9 @@ 
      */
     public function delete(ORMCriteria $criteria = null, $deletedStatus = AppTraceableRecord::DELETED_STATUS_DELETED)
     {
-        $definitive = ($deletedStatus === true) || ! $this->isTraceable();
+        $definitive = ($deletedStatus === true) || !$this->isTraceable();
         $this->logDelete($criteria, $definitive);
-        if($definitive){
+        if ($definitive) {
             return parent::delete($criteria);
         }
         
@@ -245,14 +245,14 @@ 
         
         $records = $this->select($criteria);
         
-        foreach ($records as $record){
+        foreach ($records as $record) {
             /* @var $record AppTraceableRecord */
             // Could be optimized at ORM level
             $record->deleted = $deletedStatus;
             $record->deletedOn = $now;
             $record->deletedBy = bab_getUserId();
             
-            if(! parent::save($record)){
+            if (!parent::save($record)) {
                 return false;
             }
         }
@@ -270,9 +270,9 @@ 
      */
     public function save(ORMRecord $record, $noTrace = false)
     {
-        $noTrace = $noTrace || ! $this->isTraceable();
+        $noTrace = $noTrace || !$this->isTraceable();
         $this->logSave($record, $noTrace);
-        if($noTrace){
+        if ($noTrace) {
             return parent::save($record);
         }
         
@@ -282,7 +282,7 @@ 
         $set = $record->getParentSet();
         $primaryKey = $set->getPrimaryKey();
         
-        if(empty($record->{$primaryKey})){
+        if (empty($record->{$primaryKey})) {
             $record->initValue('createdBy', bab_getUserId());
             $record->initValue('createdOn', $now);
             $record->initValue('uuid', $this->uuid());
@@ -313,21 +313,21 @@ 
      */
     public function getRecordByUuid($uuid)
     {
-        if('' === (string) $uuid){
+        if ('' === (string) $uuid) {
             return null;
         }
         
         $record = $this->get($this->uuid->is($uuid));
         
-        if(! isset($record)){
+        if (!isset($record)) {
             return null;
         }
         
-        if(! ($record instanceof AppTraceableRecord)){
+        if (!($record instanceof AppTraceableRecord)) {
             return null;
         }
         
-        if($record->deleted){
+        if ($record->deleted) {
             return null;
         }
         
@@ -343,21 +343,21 @@ 
      */
     public function isOwn($userId = null)
     {
-        if(! isset($userId)){
+        if (!isset($userId)) {
             $userId = bab_getUserId();
         }
         return $this->createdBy->is($userId);
     }
 
-    public function getDisplayNameField(){
-        if($this->fieldExist("name")){
+    public function getDisplayNameField() {
+        if ($this->fieldExist("name")) {
             return $this->name;
-        }else{
+        } else {
             return $this->uuid;
         }
     }
 
-    public function allowDraftCreation(){
+    public function allowDraftCreation() {
         return false;
     }
 }

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();
     }
 }

Spacing +194 added lines, -194 removed lines

@@ -68,15 +68,15 @@ 
     protected function getRecordClassName()
     {
         $class = $this->getClass();
-        if(strpos($class, 'Controller') !== false){
+        if (strpos($class, 'Controller') !== false) {
             $App = $this->App();
             $componentName = strtoupper(str_replace('Controller', '', $class));
             $component = $App->getComponentByName($componentName);
-            if($component){
+            if ($component) {
                 return $component->getRecordClassName();
             }
         }
-        if(strpos($class, '_Ctrl')){
+        if (strpos($class, '_Ctrl')) {
             list (, $recordClassname) = explode('_Ctrl', $class);
             return $recordClassname;
         }
@@ -97,7 +97,7 @@ 
         
         
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
         
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -140,29 +140,29 @@ 
     {
         $canvas = bab_Widgets()->HtmlCanvas();
         $html = '';
-        if($actions instanceof WidgetAction){
+        if ($actions instanceof WidgetAction) {
             $text = '';
-            if($showLabel){
+            if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() . '" href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon '.$actions->getIcon().'" href="'.$actions->url().'">'.$text.'</a></li>';
         }
-        elseif($actions instanceof WidgetDisplayableInterface){
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+        elseif ($actions instanceof WidgetDisplayableInterface) {
+            $html = '<li>'.$actions->display($canvas).'</li>';
         }
-        elseif(is_array($actions)){
-            if(isset($actions['items'])){
+        elseif (is_array($actions)) {
+            if (isset($actions['items'])) {
                 $items = $actions['items'];
             }
-            else{
+            else {
                 $items = $actions;
             }
-            foreach ($items as $action){
+            foreach ($items as $action) {
                 $html .= $this->createMenu($action, true, true);
             }
-            if(isset($actions['icon'])){
+            if (isset($actions['icon'])) {
                 
-                $html = '<li class="dropdown">' . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' . ($actions['icon'] === 'actions-context-menu'/*FuncIcons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>') . '</a>' . '<ul class="dropdown-menu dropdown-menu-right ' . FuncIcons::ICON_LEFT_SYMBOLIC . '">' . $html . '</ul>';
+                $html = '<li class="dropdown">'.'<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.($actions['icon'] === 'actions-context-menu'/*FuncIcons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>').'</a>'.'<ul class="dropdown-menu dropdown-menu-right '.FuncIcons::ICON_LEFT_SYMBOLIC.'">'.$html.'</ul>';
             }
         }
         
@@ -208,10 +208,10 @@ 
             'label' => $App->translate('Statistics')
         );
         
-        foreach ($methods as $index => $method){
-            try{
-                $methodName = $recordClassname . $method['method'];
-                if($Ui->$methodName()){
+        foreach ($methods as $index => $method) {
+            try {
+                $methodName = $recordClassname.$method['method'];
+                if ($Ui->$methodName()) {
                     $types[$index] = array(
                         'classname' => $methodName,
                         'icon' => $method['icon'],
@@ -219,7 +219,7 @@ 
                     );
                 }
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 unset($types[$index]);
                 continue;
             }
@@ -240,13 +240,13 @@ 
         
         $availableFields = array();
         
-        foreach ($recordSet->getFields() as $name => $field){
+        foreach ($recordSet->getFields() as $name => $field) {
             $fieldName = $field->getName();
             $fieldDescription = $field->getDescription();
-            if(substr($fieldName, 0, 1) !== '_'){
+            if (substr($fieldName, 0, 1) !== '_') {
                 $fieldDescription = $App->translate($fieldDescription);
             }
-            if(empty($fieldDescription)){
+            if (empty($fieldDescription)) {
                 $fieldDescription = $fieldName;
             }
             $availableFields[$name] = array(
@@ -295,14 +295,14 @@ 
         
         $recordSet = $this->getEditRecordSet();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -330,12 +330,12 @@ 
         $W = bab_Widgets();
         
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         
         /* @var $editor AppRecordEditor */
         $editor = $Ui->$editorClassname($record);
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setController($this);
@@ -364,8 +364,8 @@ 
      */
     public function getModelViewDefaultId($itemId = null)
     {
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_modelView';
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_modelView';
         }
         
         return $itemId;
@@ -393,7 +393,7 @@ 
         
         $itemId = $this->getModelViewDefaultId($itemId);
         
-        if(! isset($type)){
+        if (!isset($type)) {
             $type = $this->getFilteredViewType($itemId);
         }
         
@@ -401,24 +401,24 @@ 
         
         switch ($type) {
             case 'cards':
-                $tableviewClassname = $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname.'CardsView';
                 break;
             
             case 'map':
-                $tableviewClassname = $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname.'MapView';
                 break;
             
             case 'calendar':
-                $tableviewClassname = $recordClassname . 'CalendarView';
+                $tableviewClassname = $recordClassname.'CalendarView';
                 break;
             
             case 'statistics':
-                $tableviewClassname = $recordClassname . 'StatisticsView';
+                $tableviewClassname = $recordClassname.'StatisticsView';
                 break;
             
             case 'table':
             default:
-                $tableviewClassname = $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
         
@@ -431,12 +431,12 @@ 
         
         $tableview->setRecordSet($recordSet);
         $tableview->addDefaultColumns($recordSet);
-        if(isset($filter)){
+        if (isset($filter)) {
             $tableview->setFilterValues($filter);
         }
         $filter = $tableview->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $tableview->displaySubTotalRow(true);
         }
         
@@ -450,13 +450,13 @@ 
         
         $tableview->setDataSource($records);
         
-        if(isset($columns)){
+        if (isset($columns)) {
             $availableColumns = $tableview->getVisibleColumns();
             
             $remainingColumns = array();
-            foreach ($availableColumns as $availableColumn){
+            foreach ($availableColumns as $availableColumn) {
                 $colPath = $availableColumn->getFieldPath();
-                if(isset($columns[$colPath]) && $columns[$colPath] == '1'){
+                if (isset($columns[$colPath]) && $columns[$colPath] == '1') {
                     $remainingColumns[] = $availableColumn;
                 }
             }
@@ -476,11 +476,11 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -523,7 +523,7 @@ 
         
         $viewTypes = $this->getAvailableModelViewTypes();
         
-        if(count($viewTypes) > 1){
+        if (count($viewTypes) > 1) {
             $viewsBox = $W->Items();
             $viewsBox->setSizePolicy('pull-right');
             // $viewsBox->addClass('btn-group', FuncIcons::ICON_LEFT_16);
@@ -531,9 +531,9 @@ 
             
             $filteredViewType = $this->getFilteredViewType($tableView->getId());
             
-            foreach ($viewTypes as $viewTypeId => $viewType){
+            foreach ($viewTypes as $viewTypeId => $viewType) {
                 $viewsBox->addItem($W->Link('', $proxy->setFilteredViewType($tableView->getId(), $viewTypeId))
-                    ->addClass('icon', $viewType['icon'] . ($filteredViewType === $viewTypeId ? ' active' : ''))
+                    ->addClass('icon', $viewType['icon'].($filteredViewType === $viewTypeId ? ' active' : ''))
                     ->
                 // ->setSizePolicy('btn btn-xs btn-default ' . ($filteredViewType === $viewTypeId ? 'active' : ''))
                 setTitle($viewType['label'])
@@ -541,14 +541,14 @@ 
             }
         }
         
-        if(method_exists($proxy, 'exportSelect')){
+        if (method_exists($proxy, 'exportSelect')) {
             $toolbar->addItem($W->Link($App->translate('Export'), $proxy->exportSelect($filter))
                 ->addClass('icon', FuncIcons::ACTIONS_DOCUMENT_DOWNLOAD)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box gradient blue halfSizeDialog'));
         }
         
-        if(method_exists($proxy, 'printList')){
+        if (method_exists($proxy, 'printList')) {
             $toolbar->addItem($W->Link($App->translate('Print'), $proxy->printList($filter))
                 ->addClass('icon', FuncIcons::ACTIONS_DOCUMENT_PRINT)
                 ->setOpenMode(WidgetLink::OPEN_POPUP));
@@ -566,8 +566,8 @@ 
         $W = bab_Widgets();
         
         $filterVisibility = $this->getFilterVisibility($itemId);
-        $filterVisibility = ! $filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $filterVisibility = !$filterVisibility;
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         
         return true;
     }
@@ -579,10 +579,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
-        if(! isset($filterVisibility)){
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
+        if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -597,8 +597,8 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
-        if(! isset($type)){
+        $type = $W->getUserConfiguration($itemId.'/viewType');
+        if (!isset($type)) {
             $type = 'table';
         }
         return $type;
@@ -615,7 +615,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
         
         return true;
     }
@@ -636,17 +636,17 @@ 
         
         $filterPanel = $view->advancedFilterPanel($filter);
         
-        if($this->getFilterVisibility($itemId)){
+        if ($this->getFilterVisibility($itemId)) {
             $filterPanel->addClass('show-filter');
         }
-        else{
+        else {
             $filterPanel->addClass('hide-filter');
         }
         
         $toolbar = $this->toolbar($view);
         $listToolbar = $this->listToolbar($view);
         
-        if($view->isColumnSelectionAllowed()){
+        if ($view->isColumnSelectionAllowed()) {
             $App = $this->App();
             $columnSelectionMenu = $W->Link($App->translate('Table configuration'), $this->proxy()
                 ->modelViewColumnSettings($type, $itemId))
@@ -698,14 +698,14 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        if(isset($data['pageLength'])){
-            $W->setUserConfiguration($tableModelViewId . '/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
+        if (isset($data['pageLength'])) {
+            $W->setUserConfiguration($tableModelViewId.'/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
         }
-        if(isset($data['displaySubTotalRow'])){
-            $W->setUserConfiguration($tableModelViewId . '/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
+        if (isset($data['displaySubTotalRow'])) {
+            $W->setUserConfiguration($tableModelViewId.'/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
         }
-        if(isset($data['columns'])){
-            $W->setUserConfiguration($tableModelViewId . '/columns', $data['columns'], 'widgets', $sessionOnly);
+        if (isset($data['columns'])) {
+            $W->setUserConfiguration($tableModelViewId.'/columns', $data['columns'], 'widgets', $sessionOnly);
         }
         
         $this->addReloadSelector("#{$tableModelViewId}");
@@ -720,7 +720,7 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        $W->deleteUserConfiguration($data['tableModelViewId'] . '/columns', 'widgets', $sessionOnly);
+        $W->deleteUserConfiguration($data['tableModelViewId'].'/columns', 'widgets', $sessionOnly);
         
         $this->addReloadSelector("#{$tableModelViewId}");
         return true;
@@ -773,7 +773,7 @@ 
 
         $itemMenus = $this->getListItemMenus();
         
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         
@@ -812,7 +812,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $column = isset($columns[$col]) ? $columns[$col] : null;
         
-        if(! isset($column)){
+        if (!isset($column)) {
             return true;
         }
         
@@ -826,8 +826,8 @@ 
             $col
         )));
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($filter[$col])){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($filter[$col])) {
             $widget->setValue($filter[$col]);
         }
         
@@ -843,24 +843,24 @@ 
         
         $key = $data['key'];
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($data['moreCriteria']) && $data['moreCriteria']){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($data['moreCriteria']) && $data['moreCriteria']) {
             $filter = array();
         }
-        foreach ($data['filter'] as $filterName => $filterValue){
+        foreach ($data['filter'] as $filterName => $filterValue) {
             $filter[$filterName] = $filterValue;
         }
-        $W->setUserConfiguration($key . '/filter', $filter, 'widgets', false);
+        $W->setUserConfiguration($key.'/filter', $filter, 'widgets', false);
         
         
-        if(session_status() == PHP_SESSION_NONE){
+        if (session_status() == PHP_SESSION_NONE) {
             session_start();
         }
         $_SESSION['modelViewMoreCriterias'][$key] = array();
         unset($_SESSION['modelViewMoreCriterias'][$key]);
         session_write_close();
         
-        $this->addReloadSelector('.depends-' . $key);
+        $this->addReloadSelector('.depends-'.$key);
         
         return true;
     }
@@ -871,7 +871,7 @@ 
         $Ui = $App->Ui();
         
         $page = $Ui->Page();
-        $page->addClass('depends-modelViewMoreCriterias-' . $key);
+        $page->addClass('depends-modelViewMoreCriterias-'.$key);
         
         $page->setTitle($App->translate('Search'));
         
@@ -891,7 +891,7 @@ 
         $editor = $Ui->BasicEditor($itemId, $W->VBoxLayout());
         $editor->setReloadAction($this->proxy()
             ->getDisplayListMoreCriteriaEditor($key, $editor->getId()));
-        $editor->addClass('depends-modelViewMoreCriterias-' . $key);
+        $editor->addClass('depends-modelViewMoreCriterias-'.$key);
         $editor->addClass('widget-no-close');
         $editor->setIconFormat();
         $editor->isAjax = true;
@@ -906,37 +906,37 @@ 
         $columns = $tableview->getVisibleColumns();
         $filter = $tableview->getFilterValues();
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $editor->setSaveAction($this->proxy()
                 ->saveDisplayListFilter(), $App->translate('Search'));
             $editor->setCancelAction($this->proxy()
                 ->cancel());
             
             $fields = array();
-            foreach ($filter as $fieldName => $value){
-                if(empty($value)){
+            foreach ($filter as $fieldName => $value) {
+                if (empty($value)) {
                     continue;
                 }
-                if(! isset($columns[$fieldName])){
+                if (!isset($columns[$fieldName])) {
                     continue;
                 }
                 
                 $column = $columns[$fieldName];
                 
-                if(! $column->isSearchable()){
+                if (!$column->isSearchable()) {
                     continue;
                 }
                 
                 $fields[$fieldName] = $value;
             }
             
-            if(session_status() == PHP_SESSION_NONE){
+            if (session_status() == PHP_SESSION_NONE) {
                 session_start();
             }
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
         }
-        else{
+        else {
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -944,24 +944,24 @@ 
         
         $nbAlreadyAdded = 0;
         
-        foreach ($fields as $fieldName => $fieldValue){
-            if(! isset($columns[$fieldName])){
+        foreach ($fields as $fieldName => $fieldValue) {
+            if (!isset($columns[$fieldName])) {
                 continue;
             }
             $column = $columns[$fieldName];
             
-            if(! $column->isSearchable()){
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if($nbAlreadyAdded >= 2){
+            if ($nbAlreadyAdded >= 2) {
                 $nbAlreadyAdded = 0;
                 $alreadyFilteredBox = null;
             }
             
-            if(! isset($alreadyFilteredBox)){
+            if (!isset($alreadyFilteredBox)) {
                 $editor->addItem($alreadyFilteredBox = $W->FlexItems()
                     ->setSizePolicy('customsection-field-box customsection-fieldsgroup-box'));
             }
@@ -981,7 +981,7 @@ 
                 ->setJustifyContent(WidgetFlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN)
                 ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_CONTENT_CENTER))
                 ->addClass('app-customsection-groupedfield app-displaylist-morecriteria-groupedfield'));
-            $nbAlreadyAdded ++;
+            $nbAlreadyAdded++;
             
             $alreadyAddedFilters[$fieldName] = $fieldName;
         }
@@ -991,26 +991,26 @@ 
             ''
         );
         
-        foreach ($columns as $fieldName => $column){
-            if(! $column->isSearchable()){
+        foreach ($columns as $fieldName => $column) {
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if(isset($alreadyAddedFilters[$fieldName])){
+            if (isset($alreadyAddedFilters[$fieldName])) {
                 continue;
             }
             
             $label = $tableview->getFilterLabelWidget($fieldName, $field);
             $label = trim($label->getText());
-            if(empty($label)){
+            if (empty($label)) {
                 continue;
             }
             $options[$fieldName] = $label;
         }
         
-        if(count($options) > 1){
+        if (count($options) > 1) {
             $editor->addItem($W->Html('<hr/>'));
             $editor->addItem($W->FlexItems($W->LabelledWidget($App->translate('Add a new criteria'), $W->Select2()
                 ->setOptions($options), 'newField')
@@ -1025,16 +1025,16 @@ 
     
     public function addMoreCriteriaField($key, $data = null)
     {
-        if(session_status() == PHP_SESSION_NONE){
+        if (session_status() == PHP_SESSION_NONE) {
             session_start();
         }
         $fields = isset($data['filter']) ? $data['filter'] : array();
-        if(isset($data['newField']) && ! empty($data['newField'])){
+        if (isset($data['newField']) && !empty($data['newField'])) {
             $newField = $data['newField'];
             unset($data['key']);
             unset($data['moreCriteria']);
             $fields[$newField] = '';
-            $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+            $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         }
         $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         return true;
@@ -1043,14 +1043,14 @@ 
     public function removeMoreCriteriaField($key, $field)
     {
         $fields = $_SESSION['modelViewMoreCriterias'][$key];
-        if(isset($fields[$field])){
+        if (isset($fields[$field])) {
             unset($fields[$field]);
-            if(session_status() == PHP_SESSION_NONE){
+            if (session_status() == PHP_SESSION_NONE) {
                 session_start();
             }
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         }
-        $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+        $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         return true;
     }
     
@@ -1106,17 +1106,17 @@ 
         
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
                 break;
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
                 break;
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
                 break;
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, BabCharset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, BabCharset::getIso());
                 break;
         }
     }
@@ -1182,7 +1182,7 @@ 
         $recordSet = $this->getRecordSet();
         
         $record = $recordSet->request($id);
-        if(! $record->isReadable()){
+        if (!$record->isReadable()) {
             throw new AppAccessException($App->translate('You do not have access to this page'));
         }
         
@@ -1190,7 +1190,7 @@ 
         
         $recordClassname = $this->getRecordClassName();
         
-        $viewClassname = $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
         
         $fullFrame = $Ui->$viewClassname($record);
         $fullFrame->setView($view);
@@ -1202,17 +1202,17 @@ 
         $mainMenu->setSizePolicy(FuncIcons::ICON_LEFT_24);
         
         $page = $Ui->Page();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $page->setId($itemId);
         }
-        $page->addClass('depends-' . $this->getRecordClassName());
+        $page->addClass('depends-'.$this->getRecordClassName());
         
         $page->addToolbar($mainMenu);
         
         $page->addItem($fullFrame);
         
         $page->setReloadAction($this->proxy()
-            ->display($id, $view,$page->getId()));
+            ->display($id, $view, $page->getId()));
         
         return $page;
     }
@@ -1244,14 +1244,14 @@ 
         
         $editor = $this->recordEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1286,15 +1286,15 @@ 
         
         $editor = $Ui->TagsEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $editor->setRecord($record);
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1345,7 +1345,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"');
+        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"');
         return $message;
     }
     
@@ -1376,7 +1376,7 @@ 
      *
      * @param AppRecord $record
      */
-    protected function preSave(ORMRecord &$record, $data)
+    protected function preSave(ORMRecord & $record, $data)
     {
     }
     
@@ -1385,7 +1385,7 @@ 
      *
      * @param AppRecord $record
      */
-    protected function postSave(ORMRecord &$record, $data)
+    protected function postSave(ORMRecord & $record, $data)
     {
     }
     
@@ -1401,52 +1401,52 @@ 
         $this->requireSaveMethod();
         $App = $this->App();
         $recordSet = $this->getSaveRecordSet();
-        if(method_exists($recordSet, 'allowDraftCreation') && $recordSet->allowDraftCreation()){
+        if (method_exists($recordSet, 'allowDraftCreation') && $recordSet->allowDraftCreation()) {
             $recordSet->setDefaultCriteria();
         }
         $pk = $recordSet->getPrimaryKey();
         $message = null;
         
-        if(! empty($data[$pk])){
+        if (!empty($data[$pk])) {
             $record = $recordSet->request($data[$pk]);
             $record->deleted = AppTraceableRecord::DELETED_STATUS_EXISTING;
             unset($data[$pk]);
             
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getModifedMessage($record);
         }
-        else{
+        else {
             
             $record = $recordSet->newRecord();
             
-            if(! $recordSet->isCreatable()){
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getCreatedMessage();
         }
         
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppSaveException($App->translate('The record does not exists'));
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             throw new AppSaveException($App->translate('Nothing to save'));
         }
         
         $record->setFormInputValues($data);
         
         $this->preSave($record, $data);
-        if($record->save()){
+        if ($record->save()) {
             $this->postSave($record, $data);
-            if(is_string($message)){
+            if (is_string($message)) {
                 $this->addToast($message);
             }
             
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
         
@@ -1469,16 +1469,16 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isDeletable()){
+        if (!$record->isDeletable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         $deletedMessage = $this->getDeletedMessage($record);
         
-        if($record->delete()){
+        if ($record->delete()) {
             $this->addToast($deletedMessage);
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1502,7 +1502,7 @@ 
         $page->addClass('app-page-editor');
         $page->setTitle($App->translate('Deletion'));
         
-        if(! isset($record)){
+        if (!isset($record)) {
             $page->addItem($W->Label($App->translate('This element does not exists.')));
             $page->addClass('alert', 'alert-warning');
             return $page;
@@ -1515,7 +1515,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));
@@ -1524,7 +1524,7 @@ 
         
         $confirmedAction = $this->proxy()->delete($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1554,20 +1554,20 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isRemovable()){
+        if (!$record->isRemovable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
         $App = $this->App();
         $deletedMessage = $App->translate('The element has been moved to the trash');
         
-        if($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)){
-            if(is_string($deletedMessage)){
+        if ($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)) {
+            if (is_string($deletedMessage)) {
                 $this->addToast($deletedMessage);
             }
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1595,7 +1595,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));
@@ -1604,7 +1604,7 @@ 
         
         $confirmedAction = $this->proxy()->remove($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1635,12 +1635,12 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
-        if(! $record->isRestorable()){
+        if (!$record->isRestorable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1651,7 +1651,7 @@ 
         $record->save();
         $this->addToast($deletedMessage);
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1671,9 +1671,9 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1686,12 +1686,12 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $confirmedAction = $this->proxy()->restore($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1717,12 +1717,12 @@ 
         $view = $this->modelView($filter, $type, null, $itemId);
         $view->setAjaxAction();
         
-        if(isset($filter)){
+        if (isset($filter)) {
             $view->setFilterValues($filter);
         }
         $filter = $view->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $view->displaySubTotalRow(true);
         }
         
@@ -1768,7 +1768,7 @@ 
         $page->addItem($trashView);
         
         $itemMenus = $this->getListItemMenus();
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         $page->setCurrentItemMenu('displayTrash');
@@ -1794,16 +1794,16 @@ 
         $registry = bab_getRegistryInstance();
         
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
         $userId = bab_getUserId();
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
@@ -1820,15 +1820,15 @@ 
     {
         $W = bab_Widgets();
         $tableview = $this->modelView(null, 'table');
-        $W->setUserConfiguration($tableview->getId() . '/currentFilterName', $filterName, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/currentFilterName', $filterName, 'widgets', false);
         
         $registry = bab_getRegistryInstance();
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $tableview->getId() . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$tableview->getId().'/filters');
         $filterValues = $registry->getValue($filterName);
         
-        if(! $filterValues){
-            $filterValues = $W->getUserConfiguration($tableview->getId() . '/filters/' . $filterName, 'widgets', false);
+        if (!$filterValues) {
+            $filterValues = $W->getUserConfiguration($tableview->getId().'/filters/'.$filterName, 'widgets', false);
         }
         
         $tableview = $this->modelView($filterValues, 'table');
@@ -1844,7 +1844,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id . '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
         
         return $filter;
     }
@@ -1854,12 +1854,12 @@ 
      */
     public function resetFilters($name = null)
     {
-        if(isset($name)){
+        if (isset($name)) {
             $W = bab_Widgets();
-            $filter = $W->getUserConfiguration($tableview->getId() . '/filters/' . $name, 'widgets', false);
+            $filter = $W->getUserConfiguration($tableview->getId().'/filters/'.$name, 'widgets', false);
             $filterValues = $filter['values'];
         }
-        else{
+        else {
             $filterValues = null;
         }
         
@@ -1886,7 +1886,7 @@ 
             'values' => $filterValues
         );
         
-        $W->setUserConfiguration($tableview->getId() . '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
         
         return true;
     }
@@ -1903,7 +1903,7 @@ 
         $Ui = $App->Ui();
         
         $currentFilterName = $this->getCurrentFilterName();
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $currentFilterName, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$currentFilterName, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1940,7 +1940,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1978,8 +1978,8 @@ 
         $page->addItem($filtersBox);
         
         $filterNames = $this->getFilterNames();
-        foreach ($filterNames as $filterName){
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+        foreach ($filterNames as $filterName) {
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
             
             $filterBox = $W->HBoxItems()
                 ->setVerticalAlign('middle')
@@ -2018,7 +2018,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -2049,7 +2049,7 @@ 
         $this->requireDeleteMethod();
         
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         return true;
     }
@@ -2059,7 +2059,7 @@ 
         $modelView = $this->modelView();
         $modelView->setHighlightedRows($ids);
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2069,7 +2069,7 @@ 
         $modelView = $this->modelView();
         $modelView->clearHighlightedRows();
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2088,34 +2088,34 @@ 
         $box = $W->VBoxItems();
         
         $isComponent = false;
-        if($component = $App->getCurrentComponent()){
+        if ($component = $App->getCurrentComponent()) {
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
         }
-        else{
+        else {
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
-            $viewClassname = $recordClassname . 'FullFrame';
+            $viewClassname = $recordClassname.'FullFrame';
         }
         
-        if($records->count() > 0){
+        if ($records->count() > 0) {
             $box->addItem($W->Link('', $this->proxy()
                 ->clearHighlightedRecords())
                 ->setAjaxAction(null, false)
                 ->addClass('icon', FuncIcons::ACTIONS_ARROW_RIGHT_DOUBLE, "app_closeHighlightButton")
-                ->setSizePolicy(FuncIcons::ICON_LEFT_32 . ' pull-right'));
+                ->setSizePolicy(FuncIcons::ICON_LEFT_32.' pull-right'));
             
-            foreach ($records as $record){
+            foreach ($records as $record) {
                 
-                if($isComponent){
+                if ($isComponent) {
                     $fullFrame = $Ui->$viewClassname($record);
-                    if(method_exists($record, "getBlueprint")){
+                    if (method_exists($record, "getBlueprint")) {
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
                 }
-                else{
+                else {
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 
@@ -2124,23 +2124,23 @@ 
             $box->addClass('box', 'shadow');
         }
         
-        $box->addClass('depends-' . $modelView->getId() . '-HighlightedRecords');
+        $box->addClass('depends-'.$modelView->getId().'-HighlightedRecords');
         $box->setReloadAction($this->proxy()
             ->previewHighlightedRecords($view));
         return $box;
     }
 
-    protected function getActions(AppRecord $record,$currentView = ''){
+    protected function getActions(AppRecord $record, $currentView = '') {
         return array();
     }
     
-    public function search($q = null){
+    public function search($q = null) {
         session_write_close();
         $set = $this->getRecordSet();
         $collection = new WidgetSelect2OptionsCollection();
-        if($q == null || strlen($q) <= 1){
+        if ($q == null || strlen($q) <= 1) {
             $collection->addOption(
-                new WidgetSelect2Option(0,$this->App()->translate("Keyword too small"))
+                new WidgetSelect2Option(0, $this->App()->translate("Keyword too small"))
             );
             header("Content-type: application/json; charset=utf-8");
             echo $collection->output();
@@ -2153,7 +2153,7 @@ 
                 $set->$field->contains($q)
             )
         );
-        foreach($records as $r){
+        foreach ($records as $r) {
             $collection->addOption(
                 new WidgetSelect2Option($r->id, $r->$field)
             );

Braces +13 added lines, -26 removed lines

@@ -146,15 +146,12 @@ 
                 $text = $actions->getTitle();
             }
             $html = '<li><a class="icon ' . $actions->getIcon() . '" href="' . $actions->url() . '">' . $text . '</a></li>';
-        }
-        elseif($actions instanceof WidgetDisplayableInterface){
+        } elseif($actions instanceof WidgetDisplayableInterface){
             $html = '<li>' . $actions->display($canvas) . '</li>';
-        }
-        elseif(is_array($actions)){
+        } elseif(is_array($actions)){
             if(isset($actions['items'])){
                 $items = $actions['items'];
-            }
-            else{
+            } else{
                 $items = $actions;
             }
             foreach ($items as $action){
@@ -218,8 +215,7 @@ 
                         'label' => $method['label']
                     );
                 }
-            }
-            catch (\Exception $e){
+            } catch (\Exception $e){
                 unset($types[$index]);
                 continue;
             }
@@ -300,8 +296,7 @@ 
             if(! $record->isUpdatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -638,8 +633,7 @@ 
         
         if($this->getFilterVisibility($itemId)){
             $filterPanel->addClass('show-filter');
-        }
-        else{
+        } else{
             $filterPanel->addClass('hide-filter');
         }
         
@@ -935,8 +929,7 @@ 
             }
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
-        }
-        else{
+        } else{
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -1249,8 +1242,7 @@ 
             if(! $record->isUpdatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -1292,8 +1284,7 @@ 
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $editor->setRecord($record);
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -1417,8 +1408,7 @@ 
             }
             
             $message = $this->getModifedMessage($record);
-        }
-        else{
+        } else{
             
             $record = $recordSet->newRecord();
             
@@ -1858,8 +1848,7 @@ 
             $W = bab_Widgets();
             $filter = $W->getUserConfiguration($tableview->getId() . '/filters/' . $name, 'widgets', false);
             $filterValues = $filter['values'];
-        }
-        else{
+        } else{
             $filterValues = null;
         }
         
@@ -2092,8 +2081,7 @@ 
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
-        }
-        else{
+        } else{
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
             $viewClassname = $recordClassname . 'FullFrame';
@@ -2114,8 +2102,7 @@ 
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
-                }
-                else{
+                } else{
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 

programs/Ui/AppHelpers.php

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->DatePicker();
@@ -129,7 +129,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->PeriodPicker();
@@ -232,7 +232,7 @@ 
 	$nbOptions = 0;
 	foreach ($iterator as $record) {
 		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
+			$optionText = $record->code.' - '.$record->$fieldName;
 		} else {
 			$optionText = $record->$fieldName;
 		}
@@ -314,18 +314,18 @@ 
         $set = $parentSet->$fieldName;
         $records = $set->select();
 		$pkName = $set->getPrimaryKey();
-		if($set->fieldExist("name")){
+		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){
+		if ($records->count() > 50) {
 			$widget = bab_Widgets()->select2();
 			$widget->setDataSource($set->getController()->search());
-		}else{
+		} else {
 			$widget = $W->Select();
 			$widget->addOption('', '');
 			foreach ($records as $record) {

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) {

Indentation +208 added lines, -208 removed lines

@@ -63,50 +63,50 @@ 
 
 function app_genericSetEditor(ORMRecordSet $set)
 {
-	$O = BabFunctionality::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 = BabFunctionality::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;
 }
 
 
@@ -119,50 +119,50 @@ 
  */
 function app_genericSetFilterForm(ORMRecordSet $set)
 {
-	$O = BabFunctionality::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 = BabFunctionality::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;
 }
 
 
@@ -175,47 +175,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;
 }
 
 
@@ -223,42 +223,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);
 }
 
 
@@ -307,36 +307,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();
@@ -362,21 +362,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);
 }
 
 
@@ -392,16 +392,16 @@ 
  */
 function app_dateTime(ORMField $field, $value) {
 
-	$W = bab_Widgets();
-	$name = $field->getName();
-	$label = $W->Label($field->getDescription());
+    $W = bab_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
+    );
 
 }
 
@@ -415,24 +415,24 @@ 
  */
 function app_dateTimeField($fieldName, WidgetLabel $label, $value = null)
 {
-	$W = bab_Widgets();
+    $W = bab_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;
 }