capwelton / libapp

programs/Ui/AppCardFrame.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
         $displayable = $field->output($value);
 
-        switch(true) {
+        switch (true) {
             case ($field instanceof ORMTextField):
                 $displayable = $W->RichText($displayable)->setRenderingOptions(BAB_HTML_ALL ^ BAB_HTML_P);
                 break;

programs/Ui/AppTableModelView.php

Spacing +23 added lines, -23 removed lines

@@ -85,7 +85,7 @@ 
      */
     protected function initHeaderRow(ORMRecordSet $set)
     {
-        require_once $GLOBALS['babInstallPath'] . 'utilit/urlincl.php';
+        require_once $GLOBALS['babInstallPath'].'utilit/urlincl.php';
         
         \bab_functionality::includefile('Icons');
         
@@ -117,12 +117,12 @@ 
             $sizePolicy = 'widget-actions-target';
             
             if ($this->isMultiSelect() && $columnPath === '_select_') {
-                $this->toggleCheckAllBox  = $W->CheckBox();
+                $this->toggleCheckAllBox = $W->CheckBox();
                 $this->toggleCheckAllBox->setName('toggleCheckAllBox');
                 $this->toggleCheckAllBox->setTitle(widget_translate('Select all on page'));
                 $this->toggleCheckAllBox->setSizePolicy('condensed');
                 $this->toggleCheckAllBox->setCheckedValue(true);
-                if(isset($_SESSION['toggleCheckAllBox'][$this->getId()]) && !empty($_SESSION['toggleCheckAllBox'][$this->getId()]) && $_SESSION['toggleCheckAllBox'][$this->getId()] == 'on'){
+                if (isset($_SESSION['toggleCheckAllBox'][$this->getId()]) && !empty($_SESSION['toggleCheckAllBox'][$this->getId()]) && $_SESSION['toggleCheckAllBox'][$this->getId()] == 'on') {
                     $this->toggleCheckAllBox->setValue(true);
                 }
                 $isSearchable = false;
@@ -139,9 +139,9 @@ 
                     $direction = ':up';
                 }
                 
-                $url = \bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath . $direction);
+                $url = \bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath.$direction);
                 if ($anchor = $this->getAnchor()) {
-                    $url .= '#' . urlencode($anchor);
+                    $url .= '#'.urlencode($anchor);
                 }
                 
                 $columnItem = $W->Link(
@@ -153,7 +153,7 @@ 
                     )->addClass('widget-table-column-sorting-action');
                     if ($this->sortAjaxAction) {
                         $columnItem->setAjaxAction(
-                            $this->sortAjaxAction->setParameter('sort', $columnPath . $direction),
+                            $this->sortAjaxAction->setParameter('sort', $columnPath.$direction),
                             ''
                             );
                     }
@@ -174,10 +174,10 @@ 
                 $columnItem->addClass('icon', $columnIcon)->setSizePolicy(\Func_Icons::ICON_LEFT_16);
             }
             
-            if($isSortable){
+            if ($isSortable) {
                 $sizePolicy .= ' widget-table-column-sortable';
             }
-            if($isSearchable){
+            if ($isSearchable) {
                 if (!isset($this->filterBaseUrl)) {
                     $this->filterBaseUrl = $this->getRecordControllerProxy()->displayListFilter();
                 }
@@ -192,7 +192,7 @@ 
                     0
                     );
                 $sizePolicy .= ' widget-table-column-searchable';
-                if(isset($filterValues[$columnPath]) && !empty($filterValues[$columnPath])){
+                if (isset($filterValues[$columnPath]) && !empty($filterValues[$columnPath])) {
                     $sizePolicy .= ' widget-table-column-searched';
                 }
             }
@@ -207,12 +207,12 @@ 
         }
     }
     
-    protected function initRow($record, $row){
-        if($this->highlightRows == null){
+    protected function initRow($record, $row) {
+        if ($this->highlightRows == null) {
             $this->highlightRows = $this->getHighlightedRows();
         }
         
-        if(in_array($record->id,$this->highlightRows)){
+        if (in_array($record->id, $this->highlightRows)) {
             $this->addRowClass($row, "app_highlightRow");
         }
         $this->addRowClass($row, "app_highlightAvailable");
@@ -242,7 +242,7 @@ 
             // we try to select one according to the classname prefix.
             list($prefix) = explode('_', get_class($this));
             $functionalityName = ucwords($prefix);
-            $this->app = @\bab_functionality::get('App/' . $functionalityName);
+            $this->app = @\bab_functionality::get('App/'.$functionalityName);
             if (!$this->app) {
                 $this->app = @\bab_functionality::get('App');
             }
@@ -303,7 +303,7 @@ 
         $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
         
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }
@@ -408,7 +408,7 @@ 
             
             $values = $set->select();
             foreach ($values as $record) {
-                $widget->addOption($record->id, (string)$record->name);
+                $widget->addOption($record->id, (string) $record->name);
             }
             
             return $widget;
@@ -516,11 +516,11 @@ 
                 
                 foreach ($columns as $fieldName => $column) {
                     $field = $column->getField();
-                    if (! $column->isSearchable()) {
+                    if (!$column->isSearchable()) {
                         continue;
                     }
                     
-                    if (! ($field instanceof ORMField)) {
+                    if (!($field instanceof ORMField)) {
                         $field = null;
                     }
                     
@@ -537,7 +537,7 @@ 
                         $formItem = $this->handleFilterLabel($label, $input);
                         
                         //                 $formItem = $W->Section($label->getText(), $input, 7)->setFoldable(true, true);
-                        $formItem->addClass('compact', 'field_' . $fieldName);
+                        $formItem->addClass('compact', 'field_'.$fieldName);
                         
                         $mainSearch = (method_exists($column, 'isMainSearch') && $column->isMainSearch());
                         
@@ -561,7 +561,7 @@ 
                                     $W->Link('', $removeColumnsAction)
                                     ->setAjaxAction()
                                     ->addClass('icon', \Func_Icons::STATUS_DIALOG_ERROR)
-                                    ->addAttribute('data-removefor',  $column->getFieldPath())
+                                    ->addAttribute('data-removefor', $column->getFieldPath())
                                     )->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END)
                                 );
                         } else {
@@ -572,7 +572,7 @@ 
                 }
                 
                 
-                if (! $this->submit) {
+                if (!$this->submit) {
                     $this->submit = $W->SubmitButton();
                     $this->submit->setLabel(Widget_translate('Apply filter'));
                 }
@@ -611,7 +611,7 @@ 
                             
                             
                             foreach ($filterNames as $filterName) {
-                                $filter = $W->getUserConfiguration($controller->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+                                $filter = $W->getUserConfiguration($controller->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
                                 
                                 //                     $this->select->addItem(
                                 //                         $W->Link(
@@ -665,7 +665,7 @@ 
                 $form->setReadOnly(true);
                 $form->setName('filter');
                 $form->colon();
-                $form->checkUnsaved(false,null);
+                $form->checkUnsaved(false, null);
                 
                 $form->setLayout(
                     $W->FlowItems(
@@ -727,7 +727,7 @@ 
         //        $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
         
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }

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

Spacing +64 added lines, -64 removed lines

@@ -64,15 +64,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);
         }
         
@@ -87,7 +87,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -141,7 +141,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -157,11 +157,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;
         }
         
@@ -262,10 +262,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;
         }
@@ -278,7 +278,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');
@@ -356,10 +356,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';
@@ -374,25 +374,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;
@@ -401,14 +401,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;
@@ -453,7 +453,7 @@ 
     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),
@@ -488,10 +488,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';
@@ -502,14 +502,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());
@@ -517,13 +517,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'];
                     }
                     
@@ -535,9 +535,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();
@@ -546,13 +546,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'];
                     }
                     
@@ -562,20 +562,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();
             }
@@ -610,7 +610,7 @@ 
         
         $containerBoxes = $W->Items();
         
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             
             $menu = $W->HBoxItems($W->Link('', $customSectionCtrl->edit($customContainer->id))
                 ->addClass('icon', \Func_Icons::ACTIONS_LIST_ADD)
@@ -625,7 +625,7 @@ 
             $menu->setSizePolicy(\Func_Icons::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'));
             }
@@ -636,7 +636,7 @@ 
                 ->addClass($customContainer->classname));
         }
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $containerBoxes->setId($itemId);
         }
         
@@ -662,7 +662,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         
         $containersValues = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $values = $customContainer->getValues();
             unset($values['id']);
             unset($values['uuid']);
@@ -675,7 +675,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']);
@@ -694,7 +694,7 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"' . "\n");
+        header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n");
         
         $json = bab_json_encode($containersValues);
         $json = bab_convertStringFromDatabase($json, \bab_charset::UTF_8);
@@ -752,12 +752,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;
         }
@@ -773,13 +773,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);
@@ -913,9 +913,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));
@@ -924,7 +924,7 @@ 
                 $containersRawFields[$currentContainerId] = $customContainer->getRawFields();
                 
                 $customContainer->rank = $rank;
-                $rank ++;
+                $rank++;
                 $customContainer->save();
                 continue;
             }
@@ -932,18 +932,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];
             }

Braces +5 added lines, -10 removed lines

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

programs/Ctrl/AppCtrlConfiguration.php

Spacing +12 added lines, -12 removed lines

@@ -40,10 +40,10 @@ 
     public function __construct(Func_App $app = null)
     {
         parent::__construct($app);
-        if(! bab_isUserAdministrator()){
+        if (!bab_isUserAdministrator()) {
             $action = WidgetAction::fromRequest();
             list (, $method) = explode('.', $action->getMethod());
-            if($method !== 'denied'){
+            if ($method !== 'denied') {
                 /**
                  * @var WidgetAction
                  */
@@ -113,7 +113,7 @@ 
         $box->addClass('reload-configuration-page');
         $box->addClass('widget-100pc');
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $this->resetCurrentTab();
         }
         
@@ -123,16 +123,16 @@ 
         $navBoxHtml = '<ul class="nav nav-tabs">';
         $htmlCanvas = $W->HtmlCanvas();
         
-        foreach ($configurationItems as $tabId => $tab){
+        foreach ($configurationItems as $tabId => $tab) {
             $tabLink = $W->Link($tab['tabTitle'], $this->proxy()
                 ->setDisplayTab($tabId))
                 ->setOpenMode(WidgetLink::OPEN_DIALOG);
             $tabLinkHtml = '<li role="configuration"';
-            if($tabId == $currentTab){
+            if ($tabId == $currentTab) {
                 $tabLinkHtml .= ' class="active"';
             }
             $tabLinkHtml .= '>';
-            $tabLinkHtml .= $tabLink->display($htmlCanvas) . '</li>';
+            $tabLinkHtml .= $tabLink->display($htmlCanvas).'</li>';
             $navBoxHtml .= $tabLinkHtml;
         }
         
@@ -161,19 +161,19 @@ 
             ->addClass('icon-left icon-48x48 icon-left-48');
         $box->addItem($configBox);
         
-        if(! isset($configurationItems[$currentTab])){
+        if (!isset($configurationItems[$currentTab])) {
             return $box;
         }
         
         $tab = $configurationItems[$currentTab];
         
-        foreach ($tab['tabContent'] as $tabSection){
-            if(! isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])){
+        foreach ($tab['tabContent'] as $tabSection) {
+            if (!isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])) {
                 continue;
             }
             $configBox->addItem($W->Section($tabSection['sectionName'], $sectionContentBox = $W->HBoxItems())
                 ->setFoldable(true));
-            foreach ($tabSection['sectionContent'] as $tabSection){
+            foreach ($tabSection['sectionContent'] as $tabSection) {
                 $sectionContentBox->addItem($tabSection);
             }
         }
@@ -198,9 +198,9 @@ 
         );
         
         $definitions = $App->getComponentDefinitions();
-        foreach ($definitions as $packageName => $definition){
+        foreach ($definitions as $packageName => $definition) {
             /* @var $definition AppComponentDefinition */
-            if(! method_exists($definition, 'getConfiguration')){
+            if (!method_exists($definition, 'getConfiguration')) {
                 continue;
             }
             $configurationItems[$packageName] = array(

programs/Ctrl/AppCtrlCustomSection.php

Spacing +111 added lines, -111 removed lines

@@ -60,7 +60,7 @@ 
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         $objectCtrl = $App->Controller()->$object(false);
@@ -69,18 +69,18 @@ 
             ->_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 ($field['fields'] as $subField){
-                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                foreach ($field['fields'] as $subField) {
+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -95,7 +95,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::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;
         }
         
@@ -167,11 +167,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;
         }
         
@@ -241,12 +241,12 @@ 
         
         $groupField = $customSection->getField($fieldGroupName);
         
-        if(! isset($groupField)){
+        if (!isset($groupField)) {
             return null;
         }
         
         $field = $groupField['fields'][$fieldName];
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -262,11 +262,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;
         }
         
@@ -349,12 +349,12 @@ 
         
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         $fields = $customSection->getFields();
-        if(! isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             throw new AppException($App->translate('This fields group does not seem to exist'));
         }
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -364,18 +364,18 @@ 
             ->_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 ($field['fields'] as $subField){
-                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                foreach ($field['fields'] as $subField) {
+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -392,7 +392,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -504,10 +504,10 @@ 
         $container = $customContainerSet->request($customContainerSet->id->is($container));
         
         $customSectionSet = $App->CustomSectionSet();
-        if(isset($id)){
+        if (isset($id)) {
             $record = $customSectionSet->request($id);
         }
-        else{
+        else {
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -519,7 +519,7 @@ 
         
         $editor = new AppEditor($App);
         $editor->setHiddenValue('tg', $App->controllerTg);
-        if($record->id){
+        if ($record->id) {
             $editor->setHiddenValue('data[id]', $record->id);
         }
         $editor->setName('data');
@@ -535,16 +535,16 @@ 
         
         $options = array();
         $rank = 1;
-        foreach ($containers as $container){
+        foreach ($containers as $container) {
             $options[$container->id] = sprintf('%d (%s)', $rank, $container->name);
-            $rank ++;
+            $rank++;
         }
         
         $containerSections = $customSectionSet->select($customSectionSet->container->is($container->id))
             ->orderDesc($customSectionSet->rank);
         
         $nbSections = 0;
-        foreach ($containerSections as $containerSection){
+        foreach ($containerSections as $containerSection) {
             $nbSections = $containerSection->rank + 1;
             break;
         }
@@ -628,10 +628,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';
@@ -646,25 +646,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;
@@ -673,14 +673,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;
@@ -715,7 +715,7 @@ 
      */
     public function save($data = null)
     {
-        if(! isset($data['id']) && isset($data['container']) && $data['container'] != 0 && ! isset($data['rank'])){
+        if (!isset($data['id']) && isset($data['container']) && $data['container'] != 0 && !isset($data['rank'])) {
             $set = $this->getRecordSet();
             $data['rank'] = $set->select($set->container->is($data['container']))
                 ->count();
@@ -748,11 +748,11 @@ 
             $set->rank->greaterThanOrEqual($record->rank)
         )));
         
-        $position ++;
-        foreach ($afterSections as $afterSection){
+        $position++;
+        foreach ($afterSections as $afterSection) {
             $afterSection->rank = $position;
             $afterSection->save();
-            $position ++;
+            $position++;
         }
     }
     
@@ -780,10 +780,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';
@@ -793,14 +793,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());
@@ -808,13 +808,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'];
                     }
                     
@@ -826,9 +826,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();
@@ -837,13 +837,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'];
                     }
                     
@@ -853,20 +853,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();
             }
@@ -895,7 +895,7 @@ 
         $customContainer = $customContainerSet->request($container);
         
         $object = $customContainer->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -922,17 +922,17 @@ 
         
         $nbCol = 0;
         
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             
-            list (, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list (,, $nbCol) = explode('-', $customSection->sizePolicy);
             
             $currentColumn += $nbCol;
             
-            $sectionSection = $W->Section($customSection->name . ' (' . $customSection->rank . ')', $sectionBox = $W->VBoxItems($W->Hidden()
-                ->setName('#' . $customSection->id)));
+            $sectionSection = $W->Section($customSection->name.' ('.$customSection->rank.')', $sectionBox = $W->VBoxItems($W->Hidden()
+                ->setName('#'.$customSection->id)));
             $sectionSection->addClass('app-custom-section');
             $sectionSection->addClass($customSection->classname);
-            $sectionSection->setSizePolicy($customSection->sizePolicy . ' widget-sameheight');
+            $sectionSection->setSizePolicy($customSection->sizePolicy.' widget-sameheight');
             
             $row->addItem($sectionSection);
             
@@ -950,40 +950,40 @@ 
                 ->addClass('icon', \Func_Icons::ACTIONS_EDIT_DELETE)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box red')));
-            if(! empty($customSection->visibilityCriteria)){
+            if (!empty($customSection->visibilityCriteria)) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section has a visibility condition')))
                     ->setSizePolicy('alert alert-warning widget-100pc'));
             }
             $fields = $customSection->getFields();
-            if(count($fields) == 0){
+            if (count($fields) == 0) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section does not contain any field')))
                     ->setSizePolicy('alert alert-warning'));
             }
-            foreach ($fields as $fieldId => $field){
-                if(empty($field)){
+            foreach ($fields as $fieldId => $field) {
+                if (empty($field)) {
                     continue;
                 }
                 
                 $fieldName = $field['fieldname'];
                 
                 $isFieldsGroup = false;
-                if(strpos($fieldName, '_fieldsGroup') !== false){
+                if (strpos($fieldName, '_fieldsGroup') !== false) {
                     $fieldName = '_fieldsGroup';
                     $isFieldsGroup = true;
                 }
                 
                 $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;
                 }
                 
                 $fieldName = $field['name'];
-                if($isFieldsGroup){
+                if ($isFieldsGroup) {
                     $fieldName = $fieldId;
                 }
                 
@@ -994,20 +994,20 @@ 
                     ->setGrowable(true)
                     ->setWrap(WidgetFlexLayout::FLEX_WRAP_WRAP))
                     ->setSizePolicy('maximum'), $btnBox = $W->HBoxItems($W->Hidden()
-                    ->setName($customSection->id . '.' . $fieldId)
+                    ->setName($customSection->id.'.'.$fieldId)
                     ->setValue($fieldName))
                     ->addClass('widget-actions'))
                     ->setSizePolicy('widget-list-element widget-actions-target')
                     ->addClass(\Func_Icons::ICON_LEFT_16);
-                if(strpos($field['name'], '_fieldsGroup') !== false){
+                if (strpos($field['name'], '_fieldsGroup') !== false) {
                     $btnBox->addItem($W->Link('', $customSectionCtrl->addDisplayFieldToGroup($customSection->id, $fieldName))
                         ->addClass('icon', \Func_Icons::ACTIONS_LIST_ADD)
                         ->setOpenMode(WidgetLink::OPEN_DIALOG));
                     $groupedFields = $fields[$fieldName]['fields'];
-                    foreach ($groupedFields as $groupedField){
+                    foreach ($groupedFields as $groupedField) {
                         $groupedFieldDetails = $availableFields[$groupedField['fieldname']];
                         $fieldGroupBox->addItem($flexField = $W->FlowItems($W->Hidden(null, array(
-                            $customSection->id . '.fieldsGroups',
+                            $customSection->id.'.fieldsGroups',
                             $fieldName,
                             $groupedField['fieldname']
                         ), $groupedField['fieldname']), $W->Label($groupedFieldDetails['description']), $W->FlowItems($W->Link('', $customSectionCtrl->editGroupFieldDisplayField($customSection->id, $fieldName, $groupedField['fieldname']))
@@ -1035,23 +1035,23 @@ 
             $sectionsBoxes[] = $sectionBox;
         }
         
-        if($currentColumn + $nbCol > 0){
+        if ($currentColumn + $nbCol > 0) {
             $sectionsSection->addItem($row);
         }
         
-        foreach ($sectionsBoxes as $sectionsBox){
+        foreach ($sectionsBoxes as $sectionsBox) {
             $sectionsBox->sortable(true, $sectionsBoxes);
             $sectionsBox->setMetadata('samePlaceholderSize', true);
         }
         
-        foreach ($rows as $row){
+        foreach ($rows as $row) {
             $row->sortable(true, $rows);
             $row->setMetadata('samePlaceholderSize', true);
         }
         
         $form = $W->Form();
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $form->setId($itemId);
         }
         $form->setHiddenValue('tg', $App->controllerTg);
@@ -1078,7 +1078,7 @@ 
         $customSections = $customSectionSet->select($customSectionSet->container->is($container));
         
         $sectionsValues = array();
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             $values = $customSection->getValues();
             unset($values['id']);
             unset($values['createdBy']);
@@ -1092,7 +1092,7 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $container->object . '.' . ($container->view === '' ? 'default' : $container->view) . '.' . $container->name . '.json"' . "\n");
+        header('Content-Disposition: attachment; filename="'.$container->object.'.'.($container->view === '' ? 'default' : $container->view).'.'.$container->name.'.json"'."\n");
         
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, \bab_charset::UTF_8);
@@ -1144,12 +1144,12 @@ 
         $files->push($sectionsfile['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;
         }
@@ -1161,7 +1161,7 @@ 
         
         $customSectionSet->delete($customSectionSet->container->is($container));
         
-        foreach ($sectionsValues as $sectionValues){
+        foreach ($sectionsValues as $sectionValues) {
             $customSection = $customSectionSet->newRecord();
             $customSection->setValues($sectionValues);
             $customSection->container = $container;
@@ -1239,59 +1239,59 @@ 
         $ranks = array();
         $rank = 0;
         
-        foreach ($sections as $key => $value){
+        foreach ($sections as $key => $value) {
             // Sections ids start with #, while section fields start with their original section id
-            if(substr($key, 0, 1) === '#'){
+            if (substr($key, 0, 1) === '#') {
                 $currentSectionId = substr($key, 1);
                 $rawSectionData[$currentSectionId] = array();
-                if(! isset($oldSectionId)){
+                if (!isset($oldSectionId)) {
                     $oldSectionId = $currentSectionId;
                 }
-                if(isset($currentSection) && $oldSectionId != $currentSectionId){
+                if (isset($currentSection) && $oldSectionId != $currentSectionId) {
                     $oldSectionId = $currentSectionId;
                 }
                 $ranks[$currentSectionId] = $rank;
-                $rank ++;
+                $rank++;
                 $currentSection = $customSectionSet->get($customSectionSet->id->is($currentSectionId));
                 continue;
             }
-            if(! isset($currentSection)){
+            if (!isset($currentSection)) {
                 continue;
             }
             list ($fieldSectionId, $fieldName) = explode('.', $key);
-            if($fieldSectionId == $currentSectionId){
+            if ($fieldSectionId == $currentSectionId) {
                 $field = $currentSection->getField($fieldName);
-                if(strpos($fieldName, '_fieldsGroup') !== false){
+                if (strpos($fieldName, '_fieldsGroup') !== false) {
                     $rawSectionData[$currentSectionId][$fieldName]['block'] = $field['block'];
                     $rawSectionData[$currentSectionId][$fieldName]['fieldname'] = '_fieldsGroup';
                     $rawSectionData[$currentSectionId][$fieldName]['parameters'] = $field['parameters'];
-                    foreach ($sections[$currentSection->id . '.fieldsGroups'][$fieldName] as $subKey => $subValue){
+                    foreach ($sections[$currentSection->id.'.fieldsGroups'][$fieldName] as $subKey => $subValue) {
                         $rawSectionData[$currentSectionId][$fieldName]['fields'][$subKey] = $field['fields'][$subKey];
                     }
                 }
-                elseif($fieldName != 'fieldsGroups'){
+                elseif ($fieldName != 'fieldsGroups') {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
-            else{
+            else {
                 $field = null;
                 $tmpSection = $customSectionSet->get($customSectionSet->id->is($fieldSectionId));
-                if($tmpSection){
+                if ($tmpSection) {
                     $field = $tmpSection->getField($fieldName);
                 }
-                if(isset($field)){
+                if (isset($field)) {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
         }
         
-        foreach ($rawSectionData as $sectionId => $fields){
+        foreach ($rawSectionData as $sectionId => $fields) {
             $section = $customSectionSet->get($customSectionSet->id->is($sectionId));
-            if($section){
+            if ($section) {
                 $section->fields = json_encode($fields);
                 $section->rank = isset($ranks[$sectionId]) ? $ranks[$sectionId] : 0;
                 $section->save();
-                $rank ++;
+                $rank++;
             }
         }
         

Braces +7 added lines, -14 removed lines

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

programs/Ctrl/AppController.php

Spacing +111 added lines, -111 removed lines

@@ -39,10 +39,10 @@ 
 use Capwelton\LibApp\Func_App;
 use Capwelton\LibApp\AppComponent;
 use Capwelton\LibOrm\Exceptions\ORMException;
-require_once $GLOBALS['babInstallPath'] . 'utilit/controller.class.php';
-require_once $GLOBALS['babInstallPath'] . 'utilit/json.php';
+require_once $GLOBALS['babInstallPath'].'utilit/controller.class.php';
+require_once $GLOBALS['babInstallPath'].'utilit/json.php';
 
-require_once dirname(__FILE__) . '/../functions.php';
+require_once dirname(__FILE__).'/../functions.php';
 
 /**
  * @method self proxy()
@@ -74,7 +74,7 @@ 
     public function addReloadSelector($reloadSelector, $withSSE = false, $for = null)
     {
         $this->reloadSelectors[$reloadSelector] = $reloadSelector;
-        if($withSSE){
+        if ($withSSE) {
             $sseRecordSet = $this->getSSERecordSet();
             $sseRecordSet->newReloadSelector($reloadSelector, $for);
         }
@@ -91,7 +91,7 @@ 
     
     public function getSSERecordSet()
     {
-        if(isset($this->SSERecordSet)){
+        if (isset($this->SSERecordSet)) {
             return $this->SSERecordSet;
         }
         
@@ -130,7 +130,7 @@ 
     public function __call($name, $arguments = array())
     {
         $component = $this->App()->getComponentByName($name);
-        if($component){
+        if ($component) {
             return call_user_func_array(array(
                 $component,
                 'controller'
@@ -173,7 +173,7 @@ 
      */
     public function isAjaxRequest()
     {
-        if(! isset($this->isAjaxRequest)){
+        if (!isset($this->isAjaxRequest)) {
             $this->isAjaxRequest = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
         }
         return $this->isAjaxRequest;
@@ -185,14 +185,14 @@ 
      */
     public function requireCredential($message = null)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $authType = 'Basic';
         }
-        else{
+        else {
             $authType = '';
         }
         
-        if(! isset($message)){
+        if (!isset($message)) {
             $message = $this->App()->translate('You must be logged in to access this page.');
         }
         
@@ -216,10 +216,10 @@ 
         list ($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
         /** @var Func_App */
-        $App = @\bab_functionality::get('App/' . $functionalityName);
+        $App = @\bab_functionality::get('App/'.$functionalityName);
         
-        if(!$App){
-            throw new AppException('Faild to autodetect functionality App/' . $functionalityName . ', the getInstance method is deprecated, use $App->ControllerProxy() instead');
+        if (!$App) {
+            throw new AppException('Faild to autodetect functionality App/'.$functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
         }
         
         $controller = $App->ControllerProxy($classname, $proxy);
@@ -237,44 +237,44 @@ 
     static function getProxyInstance(Func_App $App, $classname)
     {
         $class = new \ReflectionClass($classname);
-        $proxyClassname = $class->getShortName() . self::PROXY_CLASS_SUFFIX;
+        $proxyClassname = $class->getShortName().self::PROXY_CLASS_SUFFIX;
         $finalProxyClassname = $class->getNamespaceName()."\\".$proxyClassname;
-        if(! class_exists($finalProxyClassname)){
+        if (!class_exists($finalProxyClassname)) {
             $classStr = "";
-            if($class->getNamespaceName() != ""){
+            if ($class->getNamespaceName() != "") {
                 $classStr .= " namespace ".$class->getNamespaceName()."; ";
             }
-            $classStr .= 'class ' . $proxyClassname . ' extends ' . $class->getShortName() . ' {' . "\n";
+            $classStr .= 'class '.$proxyClassname.' extends '.$class->getShortName().' {'."\n";
             $methods = $class->getMethods();
             
             $classStr .= '	public function __construct($App) {
                 $this->setApp($App);
             }' . "\n";
             
-            foreach ($methods as $method){
-                if($method->name === '__construct' || ! $method->isPublic() || $method->isStatic() || $method->isFinal() || $method->name === 'setApp' || $method->name === 'App' || $method->name === 'setCrm' || $method->name === 'Crm'){
+            foreach ($methods as $method) {
+                if ($method->name === '__construct' || !$method->isPublic() || $method->isStatic() || $method->isFinal() || $method->name === 'setApp' || $method->name === 'App' || $method->name === 'setCrm' || $method->name === 'Crm') {
                     continue;
                 }
                 
-                $classStr .= '	public function ' . $method->name . '(';
+                $classStr .= '	public function '.$method->name.'(';
                 $parameters = $method->getParameters();
                 $parametersStr = array();
-                foreach ($parameters as $parameter){
+                foreach ($parameters as $parameter) {
                     
-                    if($parameter->isDefaultValueAvailable()){
-                        $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                    if ($parameter->isDefaultValueAvailable()) {
+                        $parametersStr[] = '$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     }
-                    else{
-                        $parametersStr[] = '$' . $parameter->name;
+                    else {
+                        $parametersStr[] = '$'.$parameter->name;
                     }
                 }
                 $classStr .= implode(', ', $parametersStr);
-                $classStr .= ') {' . "\n";
-                $classStr .= '		$args = func_get_args();' . "\n";
-                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);' . "\n";
-                $classStr .= '	}' . "\n";
+                $classStr .= ') {'."\n";
+                $classStr .= '		$args = func_get_args();'."\n";
+                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);'."\n";
+                $classStr .= '	}'."\n";
             }
-            $classStr .= '}' . "\n";
+            $classStr .= '}'."\n";
             // We define the proxy class
             eval($classStr);
         }
@@ -312,7 +312,7 @@ 
     protected function getObjectName($classname)
     {
         list ($objectname) = explode('Controller', $classname);
-        if($this->App()->getComponentByName($objectname)){
+        if ($this->App()->getComponentByName($objectname)) {
             return strtolower($objectname);
         }
         list (, $objectname) = explode('Ctrl', $classname);
@@ -334,18 +334,18 @@ 
         
         $reflector = new \ReflectionClass(get_class($this));
         $parent = $reflector->getParentClass();
-        if($parent){
+        if ($parent) {
             $parentMethod = $parent->getMethod('__construct');
             $docComment = $parentMethod->getDocComment();
-            if(strpos($docComment, '@isComponentController') !== false){
+            if (strpos($docComment, '@isComponentController') !== false) {
                 $fullClassName = $parent->getName();
             }
         }
         
         $rc = new \ReflectionClass($fullClassName);
         
-        if(! $rc->hasMethod($methodName)){
-            throw new \bab_InvalidActionException($fullClassName . '::' . $methodName);
+        if (!$rc->hasMethod($methodName)) {
+            throw new \bab_InvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new \ReflectionMethod($fullClassName, $methodName);
         
@@ -354,32 +354,32 @@ 
         $parameters = $method->getParameters();
         $actionParams = array();
         $argNumber = 0;
-        foreach ($parameters as $parameter){
+        foreach ($parameters as $parameter) {
             $parameterName = $parameter->getName();
-            if(isset($args[$argNumber])){
+            if (isset($args[$argNumber])) {
                 $actionParams[$parameterName] = $args[$argNumber];
             }
-            elseif($parameter->isDefaultValueAvailable()){
+            elseif ($parameter->isDefaultValueAvailable()) {
                 $actionParams[$parameterName] = $parameter->getDefaultValue();
             }
-            else{
+            else {
                 $actionParams[$parameterName] = null;
             }
-            $argNumber ++;
+            $argNumber++;
         }
         
         $action = new WidgetAction();
         
-        $action->setMethod($this->getControllerTg(), $objectName . '.' . $methodName, $actionParams);
+        $action->setMethod($this->getControllerTg(), $objectName.'.'.$methodName, $actionParams);
         
         $docComment = $method->getDocComment();
-        if(strpos($docComment, '@ajax') !== false){
+        if (strpos($docComment, '@ajax') !== false) {
             $action->setAjax(true);
         }
-        if(strpos($docComment, '@requireSaveMethod') !== false && method_exists($action, 'setRequireSaveMethod')){
+        if (strpos($docComment, '@requireSaveMethod') !== false && method_exists($action, 'setRequireSaveMethod')) {
             $action->setRequireSaveMethod(true);
         }
-        if(strpos($docComment, '@requireDeleteMethod') !== false && method_exists($action, 'setRequireDeleteMethod')){
+        if (strpos($docComment, '@requireDeleteMethod') !== false && method_exists($action, 'setRequireDeleteMethod')) {
             $action->setRequireDeleteMethod(true);
         }
         
@@ -408,9 +408,9 @@ 
         
         $action->setParameters($actionParams);
         
-        list (, , $file) = explode('/', $App->controllerTg);
+        list (,, $file) = explode('/', $App->controllerTg);
         
-        $action->setParameter('addon', $App->getAddonName() . '.' . $file);
+        $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
         
         return $action;
@@ -428,44 +428,44 @@ 
         
         $method = $action->getMethod();
         
-        if(! isset($method) || '' === $method){
+        if (!isset($method) || '' === $method) {
             return false;
         }
         
         list ($objectName,) = explode('.', $method);
         
-        if(! method_exists($this, $objectName)){
+        if (!method_exists($this, $objectName)) {
             /* @var $component AppComponent */
             $component = $this->app->getComponentByName($objectName);
-            if($component){
+            if ($component) {
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
             }
-            else{
+            else {
                 header('HTTP/1.0 400 Bad Request');
                 throw new AppUnknownActionException($action);
             }
         }
         
-        if(! isset($component)){
+        if (!isset($component)) {
             $objectController = $this->{$objectName}(false);
-            if(! ($objectController instanceof AppController)){
+            if (!($objectController instanceof AppController)) {
                 return false;
             }
         }
         
-        try{
+        try {
             $returnedValue = $objectController->execAction($action);
         }
-        catch (AppAccessException $e){
+        catch (AppAccessException $e) {
             
-            if(! bab_isUserLogged() && $e->requireCredential){
+            if (!bab_isUserLogged() && $e->requireCredential) {
                 bab_requireCredential($e->getMessage());
             }
-            else{
-                if($this->isAjaxRequest()){
+            else {
+                if ($this->isAjaxRequest()) {
                     
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                    header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
                     
                     die(bab_json_encode(array(
                         'exception' => 'app_AccessException',
@@ -476,10 +476,10 @@ 
                 $this->accessPage($e);
             }
         }
-        catch (AppSaveException $e){
+        catch (AppSaveException $e) {
             
-            if($this->isAjaxRequest()){
-                header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+            if ($this->isAjaxRequest()) {
+                header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
                 header('Cache-Control: no-cache, must-revalidate');
                 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                 header('Content-type: application/json');
@@ -491,32 +491,32 @@ 
                 )));
             }
         }
-        catch (AppDeletedRecordException $e){
+        catch (AppDeletedRecordException $e) {
             $this->deletedItemPage($action, $e);
         }
-        catch (AppNotFoundException $e){
+        catch (AppNotFoundException $e) {
             $this->notFoundPage($action, $e);
         }
-        catch (ORMException $e){
+        catch (ORMException $e) {
             $this->errorPage($e);
         }
-        catch (\Exception $e){
+        catch (\Exception $e) {
             $this->unexpectedErrorPage($e);
         }
         
         $W = bab_Widgets();
         
-        if($returnedValue instanceof WidgetDisplayableInterface){
+        if ($returnedValue instanceof WidgetDisplayableInterface) {
             
-            if($returnedValue instanceof WidgetBabPage && ! $this->isAjaxRequest()){
+            if ($returnedValue instanceof WidgetBabPage && !$this->isAjaxRequest()) {
                 
                 // If the action returned a page, we display it.
                 $returnedValue->displayHtml();
             }
-            else{
+            else {
                 
                 $htmlCanvas = $W->HtmlCanvas();
-                if(self::$acceptJson){
+                if (self::$acceptJson) {
                     $itemId = $returnedValue->getId();
                     $returnArray = array(
                         $itemId => $returnedValue->display($htmlCanvas)
@@ -526,18 +526,18 @@ 
                     header('Content-type: application/json');
                     die(bab_json_encode($returnArray));
                 }
-                else{
+                else {
                     header('Cache-Control: no-cache, must-revalidate');
                     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                     header('Content-type: text/html');
-                    if($returnedValue instanceof WidgetPage && method_exists($returnedValue, 'getPageTitle')){
+                    if ($returnedValue instanceof WidgetPage && method_exists($returnedValue, 'getPageTitle')) {
                         $pageTitle = $returnedValue->getPageTitle();
                         
-                        if(method_exists($htmlCanvas, 'sendPageTitle')){
+                        if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         }
-                        else{
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                        else {
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -545,15 +545,15 @@ 
                 }
             }
         }
-        elseif(is_array($returnedValue)){
+        elseif (is_array($returnedValue)) {
             
             $htmlCanvas = $W->HtmlCanvas();
             $returnedArray = array();
-            foreach ($returnedValue as $key => &$item){
-                if($item instanceof WidgetDisplayableInterface){
+            foreach ($returnedValue as $key => &$item) {
+                if ($item instanceof WidgetDisplayableInterface) {
                     $returnedArray[$item->getId()] = $item->display($htmlCanvas);
                 }
-                else{
+                else {
                     $returnedArray[$key] = $item;
                 }
             }
@@ -562,9 +562,9 @@ 
             header('Content-type: application/json');
             die(bab_convertStringFromDatabase(bab_json_encode($returnedArray), \bab_charset::UTF_8));
         }
-        elseif(true === $returnedValue || is_string($returnedValue)){
+        elseif (true === $returnedValue || is_string($returnedValue)) {
             
-            if($this->isAjaxRequest()){
+            if ($this->isAjaxRequest()) {
                 $body = bab_getBody();
                 $json = array();
                 $json['messages'] = array();
@@ -572,21 +572,21 @@ 
                 unset($body->messages['toasts']);
                 $messages = $body->messages;
                 $errors = $body->errors;
-                foreach ($messages as $message){
+                foreach ($messages as $message) {
                     $json['messages'][] = array(
                         'level' => 'info',
                         'content' => $message,
                         'time' => 4000
                     );
                 }
-                foreach ($errors as $message){
+                foreach ($errors as $message) {
                     $json['messages'][] = array(
                         'level' => 'danger',
                         'content' => $message
                     );
                 }
                 $json['toasts'] = $toasts;
-                if($objectController->getReloadSelectors()){
+                if ($objectController->getReloadSelectors()) {
                     $json['reloadSelector'] = implode(',', $objectController->getReloadSelectors());
                 }
                 echo bab_json_encode($json);
@@ -599,8 +599,8 @@ 
     
     private function deletedItemPage(WidgetAction $action, AppDeletedRecordException $e)
     {
-        if($this->isAjaxRequest()){
-            header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+        if ($this->isAjaxRequest()) {
+            header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
             header('Cache-Control: no-cache, must-revalidate');
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Content-type: application/json');
@@ -612,7 +612,7 @@ 
                 'errorMessage' => bab_convertStringFromDatabase($e->getMessage(), 'UTF-8')
             )));
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         
         $App = app_App();
         $W = bab_Widgets();
@@ -634,7 +634,7 @@ 
             ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_CENTER));
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title(sprintf($App->translate('This %s has been deleted'), $e->getObjectTitle())));
         
-        if($e instanceof AppDeletedRecordException){
+        if ($e instanceof AppDeletedRecordException) {
             $section->addItems($e->getDeletedBy(), $e->getDeletedOn());
         }
         
@@ -643,8 +643,8 @@ 
     
     private function notFoundPage(WidgetAction $action, AppNotFoundException $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle() . ' (' . $e->getId() . ')');
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle().' ('.$e->getId().')');
             $json = array(
                 'messages' => array(
                     array(
@@ -656,7 +656,7 @@ 
             echo bab_json_encode($json);
             die();
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
         
@@ -685,8 +685,8 @@ 
     
     private function unexpectedErrorPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -698,7 +698,7 @@ 
             echo bab_json_encode($json);
             die();
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
         
@@ -722,25 +722,25 @@ 
             ->addClass('widget-50pc alert alert-danger')
             ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL));
         
-        $logCode = '#' . hrtime(true);
+        $logCode = '#'.hrtime(true);
         $message = addcslashes($e->getMessage(), "\000..\037\177..\377\\");
         $trace = addcslashes($e->getTraceAsString(), "\000..\037\177..\377\\");
         
-        error_log(sprintf('Error %s : %s', $logCode, $message) . PHP_EOL . $trace);
+        error_log(sprintf('Error %s : %s', $logCode, $message).PHP_EOL.$trace);
         
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title($App->translate('An unexpected error occured')), $W->Label(sprintf($App->translate('It has been logged with the following error code : %s'), $logCode)));
         
-        if(bab_isUserAdministrator()){
+        if (bab_isUserAdministrator()) {
             $contentBox->addItem($W->Section('Stack trace', $stackTraceBox = $W->FlexItems($W->Label($message)
                 ->addClass('widget-description'))
                 ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL))
                 ->setFoldable(true, true));
             $traces = explode("\n", $e->getTraceAsString());
-            foreach ($traces as $trace){
+            foreach ($traces as $trace) {
                 $stackTraceBox->addItem($W->Label($trace));
             }
         }
-        else{
+        else {
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         
@@ -749,8 +749,8 @@ 
     
     private function errorPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -762,7 +762,7 @@ 
             echo bab_json_encode($json);
             die();
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
         
@@ -786,25 +786,25 @@ 
             ->addClass('widget-50pc alert alert-danger')
             ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL));
         
-        $logCode = '#' . hrtime(true);
+        $logCode = '#'.hrtime(true);
         $message = addcslashes($e->getMessage(), "\000..\037\177..\377\\");
         $trace = addcslashes($e->getTraceAsString(), "\000..\037\177..\377\\");
         
-        error_log(sprintf('Error %s : %s', $logCode, $message) . PHP_EOL . $trace);
+        error_log(sprintf('Error %s : %s', $logCode, $message).PHP_EOL.$trace);
         
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title($App->translate('An unexpected error occured')), $W->Label(sprintf($App->translate('It has been logged with the following error code : %s'), $logCode)));
         
-        if(bab_isUserAdministrator()){
+        if (bab_isUserAdministrator()) {
             $contentBox->addItem($W->Section('Stack trace', $stackTraceBox = $W->FlexItems($W->Label($message)
                 ->addClass('widget-description'))
                 ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL))
                 ->setFoldable(true, true));
             $traces = explode("\n", $e->getTraceAsString());
-            foreach ($traces as $trace){
+            foreach ($traces as $trace) {
                 $stackTraceBox->addItem($W->Label($trace));
             }
         }
-        else{
+        else {
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         
@@ -813,7 +813,7 @@ 
     
     private function accessPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $message = $e->getMessage();
             $json = array(
                 'messages' => array(
@@ -826,7 +826,7 @@ 
             echo bab_json_encode($json);
             die();
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+        header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
         
@@ -863,7 +863,7 @@ 
      */
     public function requireSaveMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -878,7 +878,7 @@ 
      */
     public function requireDeleteMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -910,7 +910,7 @@ 
             'position' => $position
         );
         $babBody = bab_getBody();
-        if(! isset($babBody->messages['toasts'])){
+        if (!isset($babBody->messages['toasts'])) {
             $babBody->messages['toasts'] = array();
         }
         $babBody->messages['toasts'][] = $toast;

Braces +20 added lines, -40 removed lines

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

programs/Func_App.php

Spacing +74 added lines, -74 removed lines

@@ -38,13 +38,13 @@ 
 use Capwelton\LibOrm\ORMRecordSet;
 use Capwelton\LibOrm\MySql\ORMMySqlBackend;
 
-require_once dirname(__FILE__) . '/define.php';
-require_once dirname(__FILE__) . '/functions.php';
+require_once dirname(__FILE__).'/define.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $libappAddon = bab_getAddonInfosInstance('libapp');
 $libappPhpPath = $libappAddon->getPhpPath();
 
-require_once $libappPhpPath . '../vendor/autoload.php';
+require_once $libappPhpPath.'../vendor/autoload.php';
 
 /**
  * Provides extensible functionalities to manage an application.
@@ -80,13 +80,13 @@ 
         $this->addonPrefix = 'app';
 
         $this->classPrefix = 'App';
-        $this->controllerTg = 'addon/' . $this->addonName . '/main';
+        $this->controllerTg = 'addon/'.$this->addonName.'/main';
 
         $addon = bab_getAddonInfosInstance($this->addonName);
         $this->phpPath = $addon->getPhpPath();
         $this->recordSetPath = $this->phpPath;
         $this->ctrlPath = $this->phpPath;
-        $this->uiPath = $this->phpPath . 'ui/';
+        $this->uiPath = $this->phpPath.'ui/';
 
         $babDB = bab_getDB();
 
@@ -103,7 +103,7 @@ 
         if (class_exists($componentDefinitionObjectName)) {
             $componentDefinition = new $componentDefinitionObjectName;
             $components = $componentDefinition->getComponents($this);
-            foreach ($components as $singleName => $singleComponent){
+            foreach ($components as $singleName => $singleComponent) {
                 $this->addComponent($singleName, $singleComponent);
             }
         }
@@ -132,7 +132,7 @@ 
         $nbElem = count($componentName);
         $componentName = $componentName[$nbElem - 1];
         $componentName = strtoupper($componentName);
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
         }
         return null;
@@ -161,9 +161,9 @@ 
     
     public function __get($componentName)
     {
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
-        }else{
+        } else {
             return null;
         }
     }
@@ -182,12 +182,12 @@ 
         
         $messages = array();
         
-        foreach ($components as $componentName => $component){
+        foreach ($components as $componentName => $component) {
             $dependencies = $component->checkDependencies();
-            foreach($dependencies['requiredComponents'] as $requiredComponent){
+            foreach ($dependencies['requiredComponents'] as $requiredComponent) {
                 $messages['requiredComponents'][$componentName][] = $requiredComponent;
             }
-            foreach($dependencies['optionalComponents'] as $optionalComponent){
+            foreach ($dependencies['optionalComponents'] as $optionalComponent) {
                 $messages['optionalComponents'][$componentName][] = $optionalComponent;
             }
         }
@@ -199,9 +199,9 @@ 
     {
         $components = $this->getComponents();
         $componentDefinitions = array();
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $packageName = $component->getPackageName();
-            if(isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])){
+            if (isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])) {
                 continue;
             }
             $componentDefinitions[$packageName] = $component->getDefinition();
@@ -244,8 +244,8 @@ 
     public function getRecordSetPathname($class)
     {
         // $App->MyRecordSet() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -257,8 +257,8 @@ 
     public function getRecordPathname($class)
     {
         // $App->MyRecord() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -359,7 +359,7 @@ 
 
             if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
 
                 $classname = $this->$classNameMethod();
@@ -381,7 +381,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -408,9 +408,9 @@ 
             ';
 
         $noPackageNames = array();
-        foreach ($this->components as $component){
+        foreach ($this->components as $component) {
             /* @var $component AppComponent */
-            try{
+            try {
                 /* @var $set ORMRecordSet */
                 $set = $component->recordSet();
                 //Check if the component is not overriden by the addon
@@ -418,26 +418,26 @@ 
                 //In case the set has been overriden, we simply do nothing here, as it will be instanciated by the synchronizeSql method
                 $cmprc = new \ReflectionClass($set);
                 $componentSetClass = $cmprc->getShortName();
-                if(method_exists($this, $componentSetClass)){
+                if (method_exists($this, $componentSetClass)) {
                     continue;
                 }
-                if(method_exists($set, 'useLang')){
+                if (method_exists($set, 'useLang')) {
                     // This is necessary if the recordSet constructor uses a setLang().
                     // We need to revert to multilang fields before synchronizing.
                     $set->useLang(false);
                 }
-                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                $sql .= $mysqlbackend->setToSql($set)."\n";
                 
-                if(empty($component->getPackageName())){
+                if (empty($component->getPackageName())) {
                     $noPackageNames[] = $component->getName();
                 }
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 
             }
         }
         
-        if(!empty($noPackageNames)){
+        if (!empty($noPackageNames)) {
             $errorMessage = implode(', ', $noPackageNames);
             \bab_installWindow::message(
                 sprintf(
@@ -461,18 +461,18 @@ 
         $synchronize->fromSqlString($sql);
         
         $dependencies = $this->checkComponentsDependencies();
-        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents){
-            foreach ($requiredComponents as $requiredComponent){
+        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents) {
+            foreach ($requiredComponents as $requiredComponent) {
                 $hasComponent = $this->getComponentByName($requiredComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     \bab_installWindow::message(sprintf($this->translate('The component %s is required for the component %s to work. You will encounter fatal errors'), $requiredComponent, $componentName));
                 }
             }
         }
-        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents){
-            foreach ($optionalComponents as $optionalComponent){
+        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents) {
+            foreach ($optionalComponents as $optionalComponent) {
                 $hasComponent = $this->getComponentByName($optionalComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     \bab_installWindow::message(sprintf($this->translate('The optional component %s has not been added. The component %s may have reduced functionalities'), $optionalComponent, $componentName));
                 }
             }
@@ -485,7 +485,7 @@ 
     {
         $components = $this->getComponents();
         
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $component->onUpdate();
         }
         
@@ -506,7 +506,7 @@ 
 
             if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
                 $classname = $this->$classNameMethod();
 
@@ -520,7 +520,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -534,7 +534,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -580,7 +580,7 @@ 
     public function getRecordSetByRef($recordClassname)
     {
         $recordClassname = str_replace($this->classPrefix, '', $recordClassname);
-        $classSet = $recordClassname . 'Set';
+        $classSet = $recordClassname.'Set';
         $set = $this->$classSet();
         return $set;
     }
@@ -601,7 +601,7 @@ 
         list($recordClassname, $id) = $refParts;
         $set = $this->getRecordSetByRef($recordClassname);
         if (isset($set)) {
-            if($noDefaultCriteria){
+            if ($noDefaultCriteria) {
                 $set->setDefaultCriteria(null);
             }
             return $set->get($id);
@@ -620,7 +620,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -675,7 +675,7 @@ 
         
         //Then, check if current component has a translation
         if ($translation === $str) {
-            if($currentComponent = $this->getCurrentComponent()){
+            if ($currentComponent = $this->getCurrentComponent()) {
                 $translator->setAddonName($currentComponent->getPackageName());
                 $translator->setLangPath($currentComponent->getLangPath());
                 $translation = $translator->translate($str, $str_plurals, $number);
@@ -684,7 +684,7 @@ 
         }
         //Then, check if libapp has a translation
         if ($translation === $str) { 
-            $translator->setLangPath(null);//Reset lang path
+            $translator->setLangPath(null); //Reset lang path
             $translator->setAddonName('libapp');
             $translation = $translator->translate($str, $str_plurals, $number);
         }
@@ -732,16 +732,16 @@ 
      */
     public function mailTo($addr, $subject = null, $body = null)
     {
-        $mailTo = 'mailto:' . $addr;
+        $mailTo = 'mailto:'.$addr;
         $parameters = array();
         if (isset($subject)) {
-            $parameters[] = 'subject=' . $subject;
+            $parameters[] = 'subject='.$subject;
         }
         if (isset($body)) {
-            $parameters[] = 'body=' . $body;
+            $parameters[] = 'body='.$body;
         }
         if (!empty($parameters)) {
-            $mailTo .= '?' . implode('&', $parameters);
+            $mailTo .= '?'.implode('&', $parameters);
         }
 
         return $mailTo;
@@ -792,7 +792,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -812,7 +812,7 @@ 
         }
 
         if (!isset($format)) {
-            $format = \bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat());
+            $format = \bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat());
         }
         $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil();
 
@@ -890,10 +890,10 @@ 
      */
     public function Ui()
     {
-        if(get_class($this) == "Capwelton\LibApp\Func_App"){
+        if (get_class($this) == "Capwelton\LibApp\Func_App") {
             return bab_getInstance("Capwelton\LibApp\Ui\AppUi")->setApp($this);
-        }else{
-            return bab_getInstance($this->classPrefix . 'Ui')->setApp($this);
+        } else {
+            return bab_getInstance($this->classPrefix.'Ui')->setApp($this);
         }
     }
 
@@ -922,38 +922,38 @@ 
 
             case substr($name, -strlen('SetClassName')) === 'SetClassName':
                 $className = substr($name, 0, strlen($name) - strlen('SetClassName'));
-                if($component = $this->getComponentByName($className)){
+                if ($component = $this->getComponentByName($className)) {
                     return $component->getSetClassName();
                 }
                 $setName = $className.'Set';
-                return $this->classPrefix . $setName;
+                return $this->classPrefix.$setName;
 
             case substr($name, -strlen('ClassName')) === 'ClassName':
                 $recordName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                if($component = $this->getComponentByName($recordName)){
+                if ($component = $this->getComponentByName($recordName)) {
                     return $component->getRecordClassName();
                 }
-                return $this->classPrefix . $recordName;
+                return $this->classPrefix.$recordName;
 
             case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set':
                 $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include')));
-                if($this->getComponentByName($fileNameBase)){
+                if ($this->getComponentByName($fileNameBase)) {
                     return;
                 }
-                $path = APP_SET_PATH . $fileNameBase . '.class.php';
-                if(is_file($path)){
+                $path = APP_SET_PATH.$fileNameBase.'.class.php';
+                if (is_file($path)) {
                     require_once $path;
                 }
                 return;
 
             case substr($name, -strlen('Set')) === 'Set':
-                if($component = $this->getComponentByName(substr($name, 0, strlen($name) -strlen('Set')))){
+                if ($component = $this->getComponentByName(substr($name, 0, strlen($name) - strlen('Set')))) {
                     return $component->recordSet();
                 }
  
-                $includeMethod = 'include' . $name;
+                $includeMethod = 'include'.$name;
                 $this->$includeMethod();
-                $setClassNameMethod = $name . 'ClassName';
+                $setClassNameMethod = $name.'ClassName';
                 $className = $this->$setClassNameMethod();
                 $set = new $className($this);
                 return $set;
@@ -961,8 +961,8 @@ 
             case ($component = $this->getComponentByName($name)) != false:
                 return $component;
             default:
-                $setName = $name . 'Set';
-                $recordClassNameMethod = $name . 'ClassName';
+                $setName = $name.'Set';
+                $recordClassNameMethod = $name.'ClassName';
                 $recordClassName = $this->$recordClassNameMethod();
                 if (isset($arguments[0])) {
                     if ($arguments[0] instanceof $recordClassName) {
@@ -976,38 +976,38 @@ 
     }
     
 
-    public function LinkSet(){
+    public function LinkSet() {
         return $this->AppLinkSet();
     }
-    public function AppLinkSet(){
+    public function AppLinkSet() {
         return new AppLinkSet($this);
     }
 
-    public function CustomFieldSet(){
+    public function CustomFieldSet() {
         return $this->AppCustomFieldSet();
     }
-    public function AppCustomFieldSet(){
+    public function AppCustomFieldSet() {
         return new AppCustomFieldSet($this);
     }
 
-    public function CustomContainerSet(){
+    public function CustomContainerSet() {
         return $this->AppCustomContainerSet();
     }
-    public function AppCustomContainerSet(){
+    public function AppCustomContainerSet() {
         return new AppCustomContainerSet($this);
     }
 
-    public function CustomSectionSet(){
+    public function CustomSectionSet() {
         return $this->AppCustomSectionSet();
     }
-    public function AppCustomSectionSet(){
+    public function AppCustomSectionSet() {
         return new AppCustomSectionSet($this);
     }
 
-    public function LogSet(){
+    public function LogSet() {
         return $this->AppLogSet();
     }
-    public function AppLogSet(){
+    public function AppLogSet() {
         return new AppLogSet($this);
     }
 

Braces +3 added lines, -4 removed lines

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

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;