capwelton / libapp

programs/Ctrl/AppCtrlRecord.php

Spacing +180 added lines, -180 removed lines

@@ -53,11 +53,11 @@ 
     protected function getRecordClassName()
     {
         $class = $this->getClass();
-        if(strpos($class, 'Controller') !== false){
+        if (strpos($class, 'Controller') !== false) {
             $App = $this->App();
             $componentName = strtoupper(str_replace('Controller', '', $class));
             $component = $App->getComponentByName($componentName);
-            if($component){
+            if ($component) {
                 list (, $recordClassname) = explode($App->classPrefix, $component->getRecordClassName());
                 return $recordClassname;
             }
@@ -78,7 +78,7 @@ 
         $App = $this->App();
         
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
         
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -121,29 +121,29 @@ 
     {
         $canvas = bab_Widgets()->HtmlCanvas();
         $html = '';
-        if($actions instanceof WidgetAction){
+        if ($actions instanceof WidgetAction) {
             $text = '';
-            if($showLabel){
+            if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() . '" href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon '.$actions->getIcon().'" href="'.$actions->url().'">'.$text.'</a></li>';
         }
-        elseif($actions instanceof WidgetLink){
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+        elseif ($actions instanceof WidgetLink) {
+            $html = '<li>'.$actions->display($canvas).'</li>';
         }
-        elseif(is_array($actions)){
-            if(isset($actions['items'])){
+        elseif (is_array($actions)) {
+            if (isset($actions['items'])) {
                 $items = $actions['items'];
             }
-            else{
+            else {
                 $items = $actions;
             }
-            foreach ($items as $action){
+            foreach ($items as $action) {
                 $html .= $this->createMenu($action, true, true);
             }
-            if(isset($actions['icon'])){
+            if (isset($actions['icon'])) {
                 
-                $html = '<li class="dropdown">' . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' . ($actions['icon'] === 'actions-context-menu'/*\Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>') . '</a>' . '<ul class="dropdown-menu dropdown-menu-right ' . \Func_Icons::ICON_LEFT_SYMBOLIC . '">' . $html . '</ul>';
+                $html = '<li class="dropdown">'.'<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.($actions['icon'] === 'actions-context-menu'/*\Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>').'</a>'.'<ul class="dropdown-menu dropdown-menu-right '.\Func_Icons::ICON_LEFT_SYMBOLIC.'">'.$html.'</ul>';
             }
         }
         
@@ -189,10 +189,10 @@ 
             'label' => $App->translate('Statistics')
         );
         
-        foreach ($methods as $index => $method){
-            try{
-                $methodName = $recordClassname . $method['method'];
-                if($Ui->$methodName()){
+        foreach ($methods as $index => $method) {
+            try {
+                $methodName = $recordClassname.$method['method'];
+                if ($Ui->$methodName()) {
                     $types[$index] = array(
                         'classname' => $methodName,
                         'icon' => $method['icon'],
@@ -200,7 +200,7 @@ 
                     );
                 }
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 unset($types[$index]);
                 continue;
             }
@@ -221,13 +221,13 @@ 
         
         $availableFields = array();
         
-        foreach ($recordSet->getFields() as $name => $field){
+        foreach ($recordSet->getFields() as $name => $field) {
             $fieldName = $field->getName();
             $fieldDescription = $field->getDescription();
-            if(substr($fieldName, 0, 1) !== '_'){
+            if (substr($fieldName, 0, 1) !== '_') {
                 $fieldDescription = $App->translate($fieldDescription);
             }
-            if(empty($fieldDescription)){
+            if (empty($fieldDescription)) {
                 $fieldDescription = $fieldName;
             }
             $availableFields[$name] = array(
@@ -276,14 +276,14 @@ 
         
         $recordSet = $this->getEditRecordSet();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -311,12 +311,12 @@ 
         $W = bab_Widgets();
         
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         
         /* @var $editor AppRecordEditor */
         $editor = $Ui->$editorClassname($record);
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setController($this);
@@ -345,8 +345,8 @@ 
      */
     public function getModelViewDefaultId($itemId = null)
     {
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_modelView';
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_modelView';
         }
         
         return $itemId;
@@ -374,7 +374,7 @@ 
         
         $itemId = $this->getModelViewDefaultId($itemId);
         
-        if(! isset($type)){
+        if (!isset($type)) {
             $type = $this->getFilteredViewType($itemId);
         }
         
@@ -382,24 +382,24 @@ 
         
         switch ($type) {
             case 'cards':
-                $tableviewClassname = $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname.'CardsView';
                 break;
             
             case 'map':
-                $tableviewClassname = $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname.'MapView';
                 break;
             
             case 'calendar':
-                $tableviewClassname = $recordClassname . 'CalendarView';
+                $tableviewClassname = $recordClassname.'CalendarView';
                 break;
             
             case 'statistics':
-                $tableviewClassname = $recordClassname . 'StatisticsView';
+                $tableviewClassname = $recordClassname.'StatisticsView';
                 break;
             
             case 'table':
             default:
-                $tableviewClassname = $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
         
@@ -412,12 +412,12 @@ 
         
         $tableview->setRecordSet($recordSet);
         $tableview->addDefaultColumns($recordSet);
-        if(isset($filter)){
+        if (isset($filter)) {
             $tableview->setFilterValues($filter);
         }
         $filter = $tableview->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $tableview->displaySubTotalRow(true);
         }
         
@@ -431,13 +431,13 @@ 
         
         $tableview->setDataSource($records);
         
-        if(isset($columns)){
+        if (isset($columns)) {
             $availableColumns = $tableview->getVisibleColumns();
             
             $remainingColumns = array();
-            foreach ($availableColumns as $availableColumn){
+            foreach ($availableColumns as $availableColumn) {
                 $colPath = $availableColumn->getFieldPath();
-                if(isset($columns[$colPath]) && $columns[$colPath] == '1'){
+                if (isset($columns[$colPath]) && $columns[$colPath] == '1') {
                     $remainingColumns[] = $availableColumn;
                 }
             }
@@ -457,11 +457,11 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -504,7 +504,7 @@ 
         
         $viewTypes = $this->getAvailableModelViewTypes();
         
-        if(count($viewTypes) > 1){
+        if (count($viewTypes) > 1) {
             $viewsBox = $W->Items();
             $viewsBox->setSizePolicy('pull-right');
             // $viewsBox->addClass('btn-group', \Func_Icons::ICON_LEFT_16);
@@ -512,9 +512,9 @@ 
             
             $filteredViewType = $this->getFilteredViewType($tableView->getId());
             
-            foreach ($viewTypes as $viewTypeId => $viewType){
+            foreach ($viewTypes as $viewTypeId => $viewType) {
                 $viewsBox->addItem($W->Link('', $proxy->setFilteredViewType($tableView->getId(), $viewTypeId))
-                    ->addClass('icon', $viewType['icon'] . ($filteredViewType === $viewTypeId ? ' active' : ''))
+                    ->addClass('icon', $viewType['icon'].($filteredViewType === $viewTypeId ? ' active' : ''))
                     ->
                 // ->setSizePolicy('btn btn-xs btn-default ' . ($filteredViewType === $viewTypeId ? 'active' : ''))
                 setTitle($viewType['label'])
@@ -522,14 +522,14 @@ 
             }
         }
         
-        if(method_exists($proxy, 'exportSelect')){
+        if (method_exists($proxy, 'exportSelect')) {
             $toolbar->addItem($W->Link($App->translate('Export'), $proxy->exportSelect($filter))
                 ->addClass('icon', \Func_Icons::ACTIONS_DOCUMENT_DOWNLOAD)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box gradient blue halfSizeDialog'));
         }
         
-        if(method_exists($proxy, 'printList')){
+        if (method_exists($proxy, 'printList')) {
             $toolbar->addItem($W->Link($App->translate('Print'), $proxy->printList($filter))
                 ->addClass('icon', \Func_Icons::ACTIONS_DOCUMENT_PRINT)
                 ->setOpenMode(WidgetLink::OPEN_POPUP));
@@ -547,8 +547,8 @@ 
         $W = bab_Widgets();
         
         $filterVisibility = $this->getFilterVisibility($itemId);
-        $filterVisibility = ! $filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $filterVisibility = !$filterVisibility;
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         
         return true;
     }
@@ -560,10 +560,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
-        if(! isset($filterVisibility)){
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
+        if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -578,8 +578,8 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
-        if(! isset($type)){
+        $type = $W->getUserConfiguration($itemId.'/viewType');
+        if (!isset($type)) {
             $type = 'table';
         }
         return $type;
@@ -596,7 +596,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
         
         return true;
     }
@@ -617,17 +617,17 @@ 
         
         $filterPanel = $view->advancedFilterPanel($filter);
         
-        if($this->getFilterVisibility($itemId)){
+        if ($this->getFilterVisibility($itemId)) {
             $filterPanel->addClass('show-filter');
         }
-        else{
+        else {
             $filterPanel->addClass('hide-filter');
         }
         
         $toolbar = $this->toolbar($view);
         $listToolbar = $this->listToolbar($view);
         
-        if($view->isColumnSelectionAllowed()){
+        if ($view->isColumnSelectionAllowed()) {
             $App = $this->App();
             $columnSelectionMenu = $W->Link($App->translate('Table configuration'), $this->proxy()
                 ->modelViewColumnSettings($type, $itemId))
@@ -679,14 +679,14 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        if(isset($data['pageLength'])){
-            $W->setUserConfiguration($tableModelViewId . '/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
+        if (isset($data['pageLength'])) {
+            $W->setUserConfiguration($tableModelViewId.'/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
         }
-        if(isset($data['displaySubTotalRow'])){
-            $W->setUserConfiguration($tableModelViewId . '/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
+        if (isset($data['displaySubTotalRow'])) {
+            $W->setUserConfiguration($tableModelViewId.'/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
         }
-        if(isset($data['columns'])){
-            $W->setUserConfiguration($tableModelViewId . '/columns', $data['columns'], 'widgets', $sessionOnly);
+        if (isset($data['columns'])) {
+            $W->setUserConfiguration($tableModelViewId.'/columns', $data['columns'], 'widgets', $sessionOnly);
         }
         
         $this->addReloadSelector("#{$tableModelViewId}");
@@ -701,7 +701,7 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        $W->deleteUserConfiguration($data['tableModelViewId'] . '/columns', 'widgets', $sessionOnly);
+        $W->deleteUserConfiguration($data['tableModelViewId'].'/columns', 'widgets', $sessionOnly);
         
         $this->addReloadSelector("#{$tableModelViewId}");
         return true;
@@ -750,7 +750,7 @@ 
         
         $itemMenus = $this->getListItemMenus();
         
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         
@@ -790,7 +790,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $column = isset($columns[$col]) ? $columns[$col] : null;
         
-        if(! isset($column)){
+        if (!isset($column)) {
             return true;
         }
         
@@ -804,8 +804,8 @@ 
             $col
         )));
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($filter[$col])){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($filter[$col])) {
             $widget->setValue($filter[$col]);
         }
         
@@ -821,21 +821,21 @@ 
         
         $key = $data['key'];
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($data['moreCriteria']) && $data['moreCriteria']){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($data['moreCriteria']) && $data['moreCriteria']) {
             $filter = array();
         }
-        foreach ($data['filter'] as $filterName => $filterValue){
+        foreach ($data['filter'] as $filterName => $filterValue) {
             $filter[$filterName] = $filterValue;
         }
-        $W->setUserConfiguration($key . '/filter', $filter, 'widgets', false);
+        $W->setUserConfiguration($key.'/filter', $filter, 'widgets', false);
         
         session_start();
         $_SESSION['modelViewMoreCriterias'][$key] = array();
         unset($_SESSION['modelViewMoreCriterias'][$key]);
         session_write_close();
         
-        $this->addReloadSelector('.depends-' . $key);
+        $this->addReloadSelector('.depends-'.$key);
         
         return true;
     }
@@ -846,7 +846,7 @@ 
         $Ui = $App->Ui();
         
         $page = $Ui->Page();
-        $page->addClass('depends-modelViewMoreCriterias-' . $key);
+        $page->addClass('depends-modelViewMoreCriterias-'.$key);
         
         $page->setTitle($App->translate('Search'));
         
@@ -866,7 +866,7 @@ 
         $editor = $Ui->Editor($itemId, $W->VBoxLayout());
         $editor->setReloadAction($this->proxy()
             ->getDisplayListMoreCriteriaEditor($key, $editor->getId()));
-        $editor->addClass('depends-modelViewMoreCriterias-' . $key);
+        $editor->addClass('depends-modelViewMoreCriterias-'.$key);
         $editor->addClass('widget-no-close');
         $editor->setIconFormat();
         $editor->isAjax = true;
@@ -881,24 +881,24 @@ 
         $columns = $tableview->getVisibleColumns();
         $filter = $tableview->getFilterValues();
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $editor->setSaveAction($this->proxy()
                 ->saveDisplayListFilter(), $App->translate('Search'));
             $editor->setCancelAction($this->proxy()
                 ->cancel());
             
             $fields = array();
-            foreach ($filter as $fieldName => $value){
-                if(empty($value)){
+            foreach ($filter as $fieldName => $value) {
+                if (empty($value)) {
                     continue;
                 }
-                if(! isset($columns[$fieldName])){
+                if (!isset($columns[$fieldName])) {
                     continue;
                 }
                 
                 $column = $columns[$fieldName];
                 
-                if(! $column->isSearchable()){
+                if (!$column->isSearchable()) {
                     continue;
                 }
                 
@@ -908,7 +908,7 @@ 
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
         }
-        else{
+        else {
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -916,24 +916,24 @@ 
         
         $nbAlreadyAdded = 0;
         
-        foreach ($fields as $fieldName => $fieldValue){
-            if(! isset($columns[$fieldName])){
+        foreach ($fields as $fieldName => $fieldValue) {
+            if (!isset($columns[$fieldName])) {
                 continue;
             }
             $column = $columns[$fieldName];
             
-            if(! $column->isSearchable()){
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if($nbAlreadyAdded >= 2){
+            if ($nbAlreadyAdded >= 2) {
                 $nbAlreadyAdded = 0;
                 $alreadyFilteredBox = null;
             }
             
-            if(! isset($alreadyFilteredBox)){
+            if (!isset($alreadyFilteredBox)) {
                 $editor->addItem($alreadyFilteredBox = $W->FlexItems()
                     ->setSizePolicy('customsection-field-box customsection-fieldsgroup-box'));
             }
@@ -953,7 +953,7 @@ 
                 ->setJustifyContent(WidgetFlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN)
                 ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_CONTENT_CENTER))
                 ->addClass('app-customsection-groupedfield app-displaylist-morecriteria-groupedfield'));
-            $nbAlreadyAdded ++;
+            $nbAlreadyAdded++;
             
             $alreadyAddedFilters[$fieldName] = $fieldName;
         }
@@ -963,26 +963,26 @@ 
             ''
         );
         
-        foreach ($columns as $fieldName => $column){
-            if(! $column->isSearchable()){
+        foreach ($columns as $fieldName => $column) {
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if(isset($alreadyAddedFilters[$fieldName])){
+            if (isset($alreadyAddedFilters[$fieldName])) {
                 continue;
             }
             
             $label = $tableview->getFilterLabelWidget($fieldName, $field);
             $label = trim($label->getText());
-            if(empty($label)){
+            if (empty($label)) {
                 continue;
             }
             $options[$fieldName] = $label;
         }
         
-        if(count($options) > 1){
+        if (count($options) > 1) {
             $editor->addItem($W->Html('<hr/>'));
             $editor->addItem($W->FlexItems($W->LabelledWidget($App->translate('Add a new criteria'), $W->Select2()
                 ->setOptions($options), 'newField')
@@ -999,12 +999,12 @@ 
     {
         session_start();
         $fields = isset($data['filter']) ? $data['filter'] : array();
-        if(isset($data['newField']) && ! empty($data['newField'])){
+        if (isset($data['newField']) && !empty($data['newField'])) {
             $newField = $data['newField'];
             unset($data['key']);
             unset($data['moreCriteria']);
             $fields[$newField] = '';
-            $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+            $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         }
         $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         return true;
@@ -1013,12 +1013,12 @@ 
     public function removeMoreCriteriaField($key, $field)
     {
         $fields = $_SESSION['modelViewMoreCriterias'][$key];
-        if(isset($fields[$field])){
+        if (isset($fields[$field])) {
             unset($fields[$field]);
             session_start();
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         }
-        $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+        $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         return true;
     }
     
@@ -1074,17 +1074,17 @@ 
         
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
                 break;
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
                 break;
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
                 break;
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, \bab_charset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, \bab_charset::getIso());
                 break;
         }
     }
@@ -1150,7 +1150,7 @@ 
         $recordSet = $this->getRecordSet();
         
         $record = $recordSet->request($id);
-        if(! $record->isReadable()){
+        if (!$record->isReadable()) {
             throw new AppAccessException($App->translate('You do not have access to this page'));
         }
         
@@ -1158,7 +1158,7 @@ 
         
         $recordClassname = $this->getRecordClassName();
         
-        $viewClassname = $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
         
         $fullFrame = $Ui->$viewClassname($record);
         $fullFrame->setView($view);
@@ -1170,10 +1170,10 @@ 
         $mainMenu->setSizePolicy(\Func_Icons::ICON_LEFT_24);
         
         $page = $Ui->Page();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $page->setId($itemId);
         }
-        $page->addClass('depends-' . $this->getRecordClassName());
+        $page->addClass('depends-'.$this->getRecordClassName());
         
         $page->addToolbar($mainMenu);
         
@@ -1212,14 +1212,14 @@ 
         
         $editor = $this->recordEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1254,15 +1254,15 @@ 
         
         $editor = $Ui->TagsEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $editor->setRecord($record);
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1313,7 +1313,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"');
+        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"');
         return $message;
     }
     
@@ -1372,45 +1372,45 @@ 
         $pk = $recordSet->getPrimaryKey();
         $message = null;
         
-        if(! empty($data[$pk])){
+        if (!empty($data[$pk])) {
             $record = $recordSet->request($data[$pk]);
             unset($data[$pk]);
             
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getModifedMessage($record);
         }
-        else{
+        else {
             
             $record = $recordSet->newRecord();
             
-            if(! $recordSet->isCreatable()){
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getCreatedMessage();
         }
         
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppSaveException($App->translate('The record does not exists'));
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             throw new AppSaveException($App->translate('Nothing to save'));
         }
         
         $record->setFormInputValues($data);
         
         $this->preSave($record, $data);
-        if($record->save()){
+        if ($record->save()) {
             $this->postSave($record, $data);
-            if(is_string($message)){
+            if (is_string($message)) {
                 $this->addToast($message);
             }
             
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
         
@@ -1433,16 +1433,16 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isDeletable()){
+        if (!$record->isDeletable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         $deletedMessage = $this->getDeletedMessage($record);
         
-        if($record->delete()){
+        if ($record->delete()) {
             $this->addToast($deletedMessage);
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1466,7 +1466,7 @@ 
         $page->addClass('app-page-editor');
         $page->setTitle($App->translate('Deletion'));
         
-        if(! isset($record)){
+        if (!isset($record)) {
             $page->addItem($W->Label($App->translate('This element does not exists.')));
             $page->addClass('alert', 'alert-warning');
             return $page;
@@ -1479,7 +1479,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));
@@ -1488,7 +1488,7 @@ 
         
         $confirmedAction = $this->proxy()->delete($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1518,20 +1518,20 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isRemovable()){
+        if (!$record->isRemovable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
         $App = $this->App();
         $deletedMessage = $App->translate('The element has been moved to the trash');
         
-        if($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)){
-            if(is_string($deletedMessage)){
+        if ($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)) {
+            if (is_string($deletedMessage)) {
                 $this->addToast($deletedMessage);
             }
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1559,7 +1559,7 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));
@@ -1568,7 +1568,7 @@ 
         
         $confirmedAction = $this->proxy()->remove($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1599,12 +1599,12 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
-        if(! $record->isRestorable()){
+        if (!$record->isRestorable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1615,7 +1615,7 @@ 
         $record->save();
         $this->addToast($deletedMessage);
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1635,9 +1635,9 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1650,12 +1650,12 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $confirmedAction = $this->proxy()->restore($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1681,12 +1681,12 @@ 
         $view = $this->modelView($filter, $type, null, $itemId);
         $view->setAjaxAction();
         
-        if(isset($filter)){
+        if (isset($filter)) {
             $view->setFilterValues($filter);
         }
         $filter = $view->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $view->displaySubTotalRow(true);
         }
         
@@ -1732,7 +1732,7 @@ 
         $page->addItem($trashView);
         
         $itemMenus = $this->getListItemMenus();
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         $page->setCurrentItemMenu('displayTrash');
@@ -1758,16 +1758,16 @@ 
         $registry = bab_getRegistryInstance();
         
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
         $userId = bab_getUserId();
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
@@ -1784,15 +1784,15 @@ 
     {
         $W = bab_Widgets();
         $tableview = $this->modelView(null, 'table');
-        $W->setUserConfiguration($tableview->getId() . '/currentFilterName', $filterName, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/currentFilterName', $filterName, 'widgets', false);
         
         $registry = bab_getRegistryInstance();
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $tableview->getId() . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$tableview->getId().'/filters');
         $filterValues = $registry->getValue($filterName);
         
-        if(! $filterValues){
-            $filterValues = $W->getUserConfiguration($tableview->getId() . '/filters/' . $filterName, 'widgets', false);
+        if (!$filterValues) {
+            $filterValues = $W->getUserConfiguration($tableview->getId().'/filters/'.$filterName, 'widgets', false);
         }
         
         $tableview = $this->modelView($filterValues, 'table');
@@ -1808,7 +1808,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id . '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
         
         return $filter;
     }
@@ -1818,12 +1818,12 @@ 
      */
     public function resetFilters($name = null)
     {
-        if(isset($name)){
+        if (isset($name)) {
             $W = bab_Widgets();
-            $filter = $W->getUserConfiguration($tableview->getId() . '/filters/' . $name, 'widgets', false);
+            $filter = $W->getUserConfiguration($tableview->getId().'/filters/'.$name, 'widgets', false);
             $filterValues = $filter['values'];
         }
-        else{
+        else {
             $filterValues = null;
         }
         
@@ -1850,7 +1850,7 @@ 
             'values' => $filterValues
         );
         
-        $W->setUserConfiguration($tableview->getId() . '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
         
         return true;
     }
@@ -1867,7 +1867,7 @@ 
         $Ui = $App->Ui();
         
         $currentFilterName = $this->getCurrentFilterName();
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $currentFilterName, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$currentFilterName, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1904,7 +1904,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1942,8 +1942,8 @@ 
         $page->addItem($filtersBox);
         
         $filterNames = $this->getFilterNames();
-        foreach ($filterNames as $filterName){
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+        foreach ($filterNames as $filterName) {
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
             
             $filterBox = $W->HBoxItems()
                 ->setVerticalAlign('middle')
@@ -1982,7 +1982,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -2013,7 +2013,7 @@ 
         $this->requireDeleteMethod();
         
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         return true;
     }
@@ -2023,7 +2023,7 @@ 
         $modelView = $this->modelView();
         $modelView->setHighlightedRows($ids);
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2033,7 +2033,7 @@ 
         $modelView = $this->modelView();
         $modelView->clearHighlightedRows();
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2052,34 +2052,34 @@ 
         $box = $W->VBoxItems();
         
         $isComponent = false;
-        if($component = $App->getCurrentComponent()){
+        if ($component = $App->getCurrentComponent()) {
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
         }
-        else{
+        else {
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
-            $viewClassname = $recordClassname . 'FullFrame';
+            $viewClassname = $recordClassname.'FullFrame';
         }
         
-        if($records->count() > 0){
+        if ($records->count() > 0) {
             $box->addItem($W->Link('', $this->proxy()
                 ->clearHighlightedRecords())
                 ->setAjaxAction(null, false)
                 ->addClass('icon', \Func_Icons::ACTIONS_ARROW_RIGHT_DOUBLE, "app_closeHighlightButton")
-                ->setSizePolicy(\Func_Icons::ICON_LEFT_32 . ' pull-right'));
+                ->setSizePolicy(\Func_Icons::ICON_LEFT_32.' pull-right'));
             
-            foreach ($records as $record){
+            foreach ($records as $record) {
                 
-                if($isComponent){
+                if ($isComponent) {
                     $fullFrame = $Ui->$viewClassname($record);
-                    if(method_exists($record, getBlueprint)){
+                    if (method_exists($record, getBlueprint)) {
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
                 }
-                else{
+                else {
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 
@@ -2088,7 +2088,7 @@ 
             $box->addClass('box', 'shadow');
         }
         
-        $box->addClass('depends-' . $modelView->getId() . '-HighlightedRecords');
+        $box->addClass('depends-'.$modelView->getId().'-HighlightedRecords');
         $box->setReloadAction($this->proxy()
             ->previewHighlightedRecords($view));
         return $box;

Braces +13 added lines, -26 removed lines

@@ -127,15 +127,12 @@ 
                 $text = $actions->getTitle();
             }
             $html = '<li><a class="icon ' . $actions->getIcon() . '" href="' . $actions->url() . '">' . $text . '</a></li>';
-        }
-        elseif($actions instanceof WidgetLink){
+        } elseif($actions instanceof WidgetLink){
             $html = '<li>' . $actions->display($canvas) . '</li>';
-        }
-        elseif(is_array($actions)){
+        } elseif(is_array($actions)){
             if(isset($actions['items'])){
                 $items = $actions['items'];
-            }
-            else{
+            } else{
                 $items = $actions;
             }
             foreach ($items as $action){
@@ -199,8 +196,7 @@ 
                         'label' => $method['label']
                     );
                 }
-            }
-            catch (\Exception $e){
+            } catch (\Exception $e){
                 unset($types[$index]);
                 continue;
             }
@@ -281,8 +277,7 @@ 
             if(! $record->isUpdatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -619,8 +614,7 @@ 
         
         if($this->getFilterVisibility($itemId)){
             $filterPanel->addClass('show-filter');
-        }
-        else{
+        } else{
             $filterPanel->addClass('hide-filter');
         }
         
@@ -907,8 +901,7 @@ 
             session_start();
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
-        }
-        else{
+        } else{
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -1217,8 +1210,7 @@ 
             if(! $record->isUpdatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -1260,8 +1252,7 @@ 
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $editor->setRecord($record);
-        }
-        else{
+        } else{
             if(! $recordSet->isCreatable()){
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
@@ -1381,8 +1372,7 @@ 
             }
             
             $message = $this->getModifedMessage($record);
-        }
-        else{
+        } else{
             
             $record = $recordSet->newRecord();
             
@@ -1822,8 +1812,7 @@ 
             $W = bab_Widgets();
             $filter = $W->getUserConfiguration($tableview->getId() . '/filters/' . $name, 'widgets', false);
             $filterValues = $filter['values'];
-        }
-        else{
+        } else{
             $filterValues = null;
         }
         
@@ -2056,8 +2045,7 @@ 
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
-        }
-        else{
+        } else{
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
             $viewClassname = $recordClassname . 'FullFrame';
@@ -2078,8 +2066,7 @@ 
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
-                }
-                else{
+                } else{
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 

programs/Ctrl/AppCtrlSSE.php

Spacing +5 added lines, -5 removed lines

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

programs/Ctrl/AppCtrlCustomContainer.php

Spacing +64 added lines, -64 removed lines

@@ -59,15 +59,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);
         }
         
@@ -82,7 +82,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -136,7 +136,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -152,11 +152,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;
         }
         
@@ -257,10 +257,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;
         }
@@ -273,7 +273,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');
@@ -351,10 +351,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';
@@ -369,25 +369,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;
@@ -396,14 +396,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;
@@ -448,7 +448,7 @@ 
     protected function preSave(\ORM_Record $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),
@@ -483,10 +483,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';
@@ -497,14 +497,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());
@@ -512,13 +512,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedManyField = $foreignSet->$selectedField;
                     
-                    if($selectedManyField instanceof \ORM_BoolInterface){
+                    if ($selectedManyField instanceof \ORM_BoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -530,9 +530,9 @@ 
             }
             
             $oneRelations = $objectRecordSet->getHasOneRelations();
-            foreach ($oneRelations as $oneRelation){
+            foreach ($oneRelations as $oneRelation) {
                 /* @var $oneRelation \ORM_OneRelation*/
-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){
+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetClassName = $oneRelation->getForeignSetClassName();
@@ -541,13 +541,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedOneField = $foreignSet->$selectedField;
                     
-                    if($selectedOneField instanceof \ORM_BoolInterface){
+                    if ($selectedOneField instanceof \ORM_BoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -557,20 +557,20 @@ 
                 break;
             }
         }
-        else{
+        else {
             
             $field = $objectRecordSet->$field;
             
-            if($field instanceof \ORM_BoolInterface){
+            if ($field instanceof \ORM_BoolInterface) {
                 $condition = $condition['bool'];
             }
-            else{
+            else {
                 $condition = $condition['default'];
             }
             
             $visibilityCriteria = '';
             
-            if(! empty($condition)){
+            if (!empty($condition)) {
                 $criteria = $field->{$condition}($data['value']);
                 $visibilityCriteria = $criteria->toJson();
             }
@@ -605,7 +605,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)
@@ -620,7 +620,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'));
             }
@@ -631,7 +631,7 @@ 
                 ->addClass($customContainer->classname));
         }
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $containerBoxes->setId($itemId);
         }
         
@@ -657,7 +657,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         
         $containersValues = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $values = $customContainer->getValues();
             unset($values['id']);
             unset($values['uuid']);
@@ -670,7 +670,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']);
@@ -689,7 +689,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);
@@ -747,12 +747,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;
         }
@@ -768,13 +768,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);
@@ -907,9 +907,9 @@ 
         $containersRawFields = array();
         
         $rank = 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));
@@ -918,7 +918,7 @@ 
                 $containersRawFields[$currentContainerId] = $customContainer->getRawFields();
                 
                 $customContainer->rank = $rank;
-                $rank ++;
+                $rank++;
                 $customContainer->save();
                 continue;
             }
@@ -926,18 +926,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

@@ -259,8 +259,7 @@ 
         $customSectionSet = $App->CustomContainerSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->object = $object;
         }
@@ -517,8 +516,7 @@ 
                     
                     if($selectedManyField instanceof \ORM_BoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -546,8 +544,7 @@ 
                     
                     if($selectedOneField instanceof \ORM_BoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -556,15 +553,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof \ORM_BoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             

programs/Ctrl/AppCtrlConfiguration.php

Spacing +12 added lines, -12 removed lines

@@ -39,10 +39,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') {
                 $this->redirect($this->proxy()
                     ->denied());
             }
@@ -109,7 +109,7 @@ 
         $box->addClass('reload-configuration-page');
         $box->addClass('widget-100pc');
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $this->resetCurrentTab();
         }
         
@@ -119,16 +119,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;
         }
         
@@ -157,19 +157,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);
             }
         }
@@ -194,9 +194,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

@@ -57,7 +57,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);
@@ -66,18 +66,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);
         }
         
@@ -92,7 +92,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -147,7 +147,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -164,11 +164,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;
         }
         
@@ -238,12 +238,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;
         }
         
@@ -259,11 +259,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;
         }
         
@@ -346,12 +346,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);
         }
         
@@ -361,18 +361,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);
         }
         
@@ -389,7 +389,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -501,10 +501,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;
         }
@@ -516,7 +516,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');
@@ -532,16 +532,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;
         }
@@ -625,10 +625,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';
@@ -643,25 +643,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;
@@ -670,14 +670,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;
@@ -712,7 +712,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();
@@ -745,11 +745,11 @@ 
             $set->rank->greaterThanOrEqual($record->rank)
         )));
         
-        $position ++;
-        foreach ($afterSections as $afterSection){
+        $position++;
+        foreach ($afterSections as $afterSection) {
             $afterSection->rank = $position;
             $afterSection->save();
-            $position ++;
+            $position++;
         }
     }
     
@@ -777,10 +777,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';
@@ -790,14 +790,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());
@@ -805,13 +805,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedManyField = $foreignSet->$selectedField;
                     
-                    if($selectedManyField instanceof \ORM_BoolInterface){
+                    if ($selectedManyField instanceof \ORM_BoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -823,9 +823,9 @@ 
             }
             
             $oneRelations = $objectRecordSet->getHasOneRelations();
-            foreach ($oneRelations as $oneRelation){
+            foreach ($oneRelations as $oneRelation) {
                 /* @var $oneRelation \ORM_OneRelation*/
-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){
+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetClassName = $oneRelation->getForeignSetClassName();
@@ -834,13 +834,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedOneField = $foreignSet->$selectedField;
                     
-                    if($selectedOneField instanceof \ORM_BoolInterface){
+                    if ($selectedOneField instanceof \ORM_BoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -850,20 +850,20 @@ 
                 break;
             }
         }
-        else{
+        else {
             
             $field = $objectRecordSet->$field;
             
-            if($field instanceof \ORM_BoolInterface){
+            if ($field instanceof \ORM_BoolInterface) {
                 $condition = $condition['bool'];
             }
-            else{
+            else {
                 $condition = $condition['default'];
             }
             
             $visibilityCriteria = '';
             
-            if(! empty($condition)){
+            if (!empty($condition)) {
                 $criteria = $field->{$condition}($data['value']);
                 $visibilityCriteria = $criteria->toJson();
             }
@@ -892,7 +892,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);
         }
         
@@ -919,17 +919,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);
             
@@ -947,40 +947,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;
                 }
                 
@@ -991,20 +991,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']))
@@ -1032,23 +1032,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);
@@ -1075,7 +1075,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']);
@@ -1089,7 +1089,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);
@@ -1141,12 +1141,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;
         }
@@ -1158,7 +1158,7 @@ 
         
         $customSectionSet->delete($customSectionSet->container->is($container));
         
-        foreach ($sectionsValues as $sectionValues){
+        foreach ($sectionsValues as $sectionValues) {
             $customSection = $customSectionSet->newRecord();
             $customSection->setValues($sectionValues);
             $customSection->container = $container;
@@ -1236,59 +1236,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

@@ -503,8 +503,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -810,8 +809,7 @@ 
                     
                     if($selectedManyField instanceof \ORM_BoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -839,8 +837,7 @@ 
                     
                     if($selectedOneField instanceof \ORM_BoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -849,15 +846,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof \ORM_BoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             
@@ -1265,12 +1260,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 +110 added lines, -110 removed lines

@@ -38,10 +38,10 @@ 
 use Capwelton\LibApp\Exceptions\AppNotFoundException;
 use Capwelton\LibApp\Func_App;
 use Capwelton\LibApp\AppComponent;
-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';
 
 class AppController extends \bab_Controller implements AppObjectInterface
 {
@@ -70,7 +70,7 @@ 
     public function addReloadSelector($reloadSelector, $withSSE = false, $for = null)
     {
         $this->reloadSelectors[$reloadSelector] = $reloadSelector;
-        if($withSSE){
+        if ($withSSE) {
             $sseRecordSet = $this->getSSERecordSet();
             $sseRecordSet->newReloadSelector($reloadSelector, $for);
         }
@@ -87,7 +87,7 @@ 
     
     public function getSSERecordSet()
     {
-        if(isset($this->SSERecordSet)){
+        if (isset($this->SSERecordSet)) {
             return $this->SSERecordSet;
         }
         
@@ -126,7 +126,7 @@ 
     public function __call($name, $arguments = array())
     {
         $component = $this->App()->getComponentByName($name);
-        if($component){
+        if ($component) {
             return call_user_func_array(array(
                 $component,
                 'controller'
@@ -169,7 +169,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;
@@ -181,14 +181,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.');
         }
         
@@ -211,10 +211,10 @@ 
         // we try to select one according to the classname prefix.
         list ($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
-        $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);
@@ -232,39 +232,39 @@ 
     static function getProxyInstance(Func_App $App, $classname)
     {
         $class = new \ReflectionClass($classname);
-        $proxyClassname = $class->getShortName() . self::PROXY_CLASS_SUFFIX;
-        if(! class_exists($proxyClassname)){
-            $classStr = 'class ' . $proxyClassname . ' extends ' . $class->name . ' {' . "\n";
+        $proxyClassname = $class->getShortName().self::PROXY_CLASS_SUFFIX;
+        if (!class_exists($proxyClassname)) {
+            $classStr = 'class '.$proxyClassname.' extends '.$class->name.' {'."\n";
             $methods = $class->getMethods();
             
             $classStr .= '	public function __construct(Func_App $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);
@@ -303,7 +303,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);
@@ -325,18 +325,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);
         
@@ -345,32 +345,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);
         }
         
@@ -399,9 +399,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;
@@ -419,44 +419,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',
@@ -467,10 +467,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');
@@ -482,32 +482,32 @@ 
                 )));
             }
         }
-        catch (AppDeletedRecordException $e){
+        catch (AppDeletedRecordException $e) {
             $this->deletedItemPage($action, $e);
         }
-        catch (AppNotFoundException $e){
+        catch (AppNotFoundException $e) {
             $this->notFoundPage($action, $e);
         }
-        catch (\ORM_Exception $e){
+        catch (\ORM_Exception $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)
@@ -517,18 +517,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);
@@ -536,15 +536,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;
                 }
             }
@@ -553,9 +553,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();
@@ -563,21 +563,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);
@@ -590,8 +590,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');
@@ -603,7 +603,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();
@@ -625,7 +625,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());
         }
         
@@ -634,8 +634,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(
@@ -647,7 +647,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');
         
@@ -676,8 +676,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(
@@ -689,7 +689,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');
         
@@ -713,25 +713,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')));
         }
         
@@ -740,8 +740,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(
@@ -753,7 +753,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');
         
@@ -777,25 +777,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')));
         }
         
@@ -804,7 +804,7 @@ 
     
     private function accessPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $message = $e->getMessage();
             $json = array(
                 'messages' => array(
@@ -817,7 +817,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');
         
@@ -854,7 +854,7 @@ 
      */
     public function requireSaveMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -869,7 +869,7 @@ 
      */
     public function requireDeleteMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -901,7 +901,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

@@ -183,8 +183,7 @@ 
     {
         if($this->isAjaxRequest()){
             $authType = 'Basic';
-        }
-        else{
+        } else{
             $authType = '';
         }
         
@@ -253,8 +252,7 @@ 
                     
                     if($parameter->isDefaultValueAvailable()){
                         $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
-                    }
-                    else{
+                    } else{
                         $parametersStr[] = '$' . $parameter->name;
                     }
                 }
@@ -349,11 +347,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 ++;
@@ -431,8 +427,7 @@ 
             if($component){
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
-            }
-            else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 throw new AppUnknownActionException($action);
             }
@@ -447,13 +442,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);
@@ -466,8 +459,7 @@ 
                 }
                 $this->accessPage($e);
             }
-        }
-        catch (AppSaveException $e){
+        } catch (AppSaveException $e){
             
             if($this->isAjaxRequest()){
                 header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
@@ -481,17 +473,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 (\ORM_Exception $e){
+        } catch (\ORM_Exception $e){
             $this->errorPage($e);
-        }
-        catch (\Exception $e){
+        } catch (\Exception $e){
             $this->unexpectedErrorPage($e);
         }
         
@@ -503,8 +491,7 @@ 
                 
                 // If the action returned a page, we display it.
                 $returnedValue->displayHtml();
-            }
-            else{
+            } else{
                 
                 $htmlCanvas = $W->HtmlCanvas();
                 if(self::$acceptJson){
@@ -516,8 +503,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');
@@ -526,8 +512,7 @@ 
                         
                         if(method_exists($htmlCanvas, 'sendPageTitle')){
                             $htmlCanvas->sendPageTitle($pageTitle);
-                        }
-                        else{
+                        } else{
                             header('X-Cto-PageTitle: ' . $pageTitle);
                         }
                     }
@@ -535,16 +520,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;
                 }
             }
@@ -552,8 +535,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();
@@ -730,8 +712,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         
@@ -794,8 +775,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         

programs/Exceptions/AppUnknownActionException.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 {
     public function __construct($action, $code = 0)
     {
-        $message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+        $message = 'Unknown method "'.$action->getController().'::'.$action->getMethod().'"';
         parent::__construct($message, $code);
     }
 }
\ No newline at end of file

programs/Exceptions/AppNotFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     public function getObjectTitle()
     {
         $element = app_translate('object');
-        if($description = $this->getRecordSet()->getDescription()){
+        if ($description = $this->getRecordSet()->getDescription()) {
             $element = mb_strtolower(app_translate($description));
         }
         

programs/Exceptions/AppDeletedRecordException.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function getDeletedBy()
     {
-        if(! $this->record->deletedBy){
+        if (!$this->record->deletedBy) {
             return null;
         }
         
@@ -68,7 +68,7 @@ 
     public function getDeletedOn()
     {
         $set = $this->getRecordSet();
-        if(! $set->deletedOn->isValueSet($this->record->deletedOn)){
+        if (!$set->deletedOn->isValueSet($this->record->deletedOn)) {
             return null;
         }