capwelton / libapp

programs/addonconfiguration.ctrl.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
  */

 

 

-require_once dirname(__FILE__) . '/controller.class.php';

+require_once dirname(__FILE__).'/controller.class.php';

 

 

 /**

@@ -34,7 +34,7 @@ 
     public function display()

     {

         $App = $this->App();

-        if(!bab_isUserAdministrator()) {

+        if (!bab_isUserAdministrator()) {

             throw new app_AccessException($App->translate('You do not have access to this page'));

         }

         

@@ -73,7 +73,7 @@ 
     public function configureSSE()

     {

         $App = $this->App();

-        if(!bab_isUserAdministrator()) {

+        if (!bab_isUserAdministrator()) {

             throw new app_AccessException($App->translate('You do not have access to this page'));

         }

         

programs/record.ctrl.php

Spacing +97 added lines, -97 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/controller.class.php';
+require_once dirname(__FILE__).'/controller.class.php';
 
 
 
@@ -45,11 +45,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;
             }
@@ -71,7 +71,7 @@ 
         $App = $this->App();
         
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
         
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -123,9 +123,9 @@ 
             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 Widget_Link) {
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+            $html = '<li>'.$actions->display($canvas).'</li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -138,10 +138,10 @@ 
             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">'
+                    . '<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 . '">'
+                            . '<ul class="dropdown-menu dropdown-menu-right '.Func_Icons::ICON_LEFT_SYMBOLIC.'">'
                                 . $html
                                 . '</ul>';
             }
@@ -191,10 +191,10 @@ 
             'label' => $App->translate('Statistics')
         );
         
-        foreach ($methods as $index => $method){
-            try{
+        foreach ($methods as $index => $method) {
+            try {
                 $methodName = $recordClassname.$method['method'];
-                if($Ui->$methodName()){
+                if ($Ui->$methodName()) {
                     $types[$index] = array(
                         'classname' => $methodName,
                         'icon' => $method['icon'],
@@ -202,7 +202,7 @@ 
                     );
                 }
             }
-            catch(Exception $e){
+            catch (Exception $e) {
                 unset($types[$index]);
                 continue;
             }
@@ -316,12 +316,12 @@ 
         $W = bab_Widgets();
         
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         
         /* @var $editor app_RecordEditor */
         $editor = $Ui->$editorClassname($record);
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setController($this);
@@ -348,7 +348,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_modelView';
+            $itemId = $this->getClass().'_modelView';
         }
         
         return $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;
         }
         
@@ -464,11 +464,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__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -525,7 +525,7 @@ 
                     $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'])
                     ->setAjaxAction()
@@ -569,7 +569,7 @@ 
         
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         
         return true;
     }
@@ -582,10 +582,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
         if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -599,7 +599,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -615,7 +615,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
         
         return true;
     }
@@ -700,14 +700,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}");
@@ -810,7 +810,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $column = isset($columns[$col]) ? $columns[$col] : null;
         
-        if(!isset($column)){
+        if (!isset($column)) {
             return true;
         }
         
@@ -827,8 +827,8 @@ 
             )
         );
         
-        $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]);
         }
         
@@ -844,21 +844,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;
     }
@@ -905,16 +905,16 @@ 
         $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;
                 }
                 
@@ -930,7 +930,7 @@ 
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
         }
-        else{
+        else {
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -939,8 +939,8 @@ 
         $nbAlreadyAdded = 0;
         
         
-        foreach ($fields as $fieldName => $fieldValue){
-            if(!isset($columns[$fieldName])){
+        foreach ($fields as $fieldName => $fieldValue) {
+            if (!isset($columns[$fieldName])) {
                 continue;
             }
             $column = $columns[$fieldName];
@@ -951,12 +951,12 @@ 
             
             $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')
                 );
@@ -976,7 +976,7 @@ 
                             $this->proxy()->removeMoreCriteriaField($key, $fieldName)
                         )->setAjaxAction()
                         ->addClass('icon', Func_Icons::STATUS_DIALOG_ERROR)
-                        ->addAttribute('data-removefor',  $fieldName)
+                        ->addAttribute('data-removefor', $fieldName)
                     )->setJustifyContent(Widget_FlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN)->setAlignItems(Widget_FlexLayout::FLEX_ALIGN_CONTENT_CENTER)
                 )->addClass('app-customsection-groupedfield app-displaylist-morecriteria-groupedfield')
             );
@@ -994,19 +994,19 @@ 
             
             $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(
@@ -1028,7 +1028,7 @@ 
     {
         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']);
@@ -1042,7 +1042,7 @@ 
     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;
@@ -1109,17 +1109,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;
         }
     }
@@ -1199,7 +1199,7 @@ 
         
         $recordClassname = $this->getRecordClassName();
         
-        $viewClassname =  $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
         
         $fullFrame = $Ui->$viewClassname($record);
         $fullFrame->setView($view);
@@ -1214,7 +1214,7 @@ 
         if (isset($itemId)) {
             $page->setId($itemId);
         }
-        $page->addClass('depends-' . $this->getRecordClassName());
+        $page->addClass('depends-'.$this->getRecordClassName());
         
         $page->addToolbar($mainMenu);
         
@@ -1362,7 +1362,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;
     }
     
@@ -1460,7 +1460,7 @@ 
                 $this->addToast($message);
             }
             
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
         
@@ -1492,7 +1492,7 @@ 
             $this->addToast($deletedMessage);
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1532,7 +1532,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));
@@ -1591,7 +1591,7 @@ 
             }
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1620,7 +1620,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));
@@ -1664,7 +1664,7 @@ 
         $record = null;
         foreach ($records as $record) {
         }
-        if (! isset($record)) {
+        if (!isset($record)) {
             throw new app_AccessException('Sorry, You are not allowed to perform this operation');
         }
         if (!$record->isRestorable()) {
@@ -1678,7 +1678,7 @@ 
         $record->save();
         $this->addToast($deletedMessage);
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1700,7 +1700,7 @@ 
         $record = null;
         foreach ($records as $record) {
         }
-        if (! isset($record)) {
+        if (!isset($record)) {
             throw new app_AccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1713,7 +1713,7 @@ 
         
         $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);
@@ -1830,14 +1830,14 @@ 
         $registry = bab_getRegistryInstance();
         
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id. '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
         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()) {
             $filters[] = $filterName;
@@ -1858,15 +1858,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);
+            $filterValues = $W->getUserConfiguration($tableview->getId().'/filters/'.$filterName, 'widgets', false);
         }
         
         $tableview = $this->modelView($filterValues, 'table');
@@ -1885,7 +1885,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id. '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
         
         return $filter;
     }
@@ -1899,7 +1899,7 @@ 
     {
         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 {
             $filterValues = null;
@@ -1930,7 +1930,7 @@ 
             'values' => $filterValues,
         );
         
-        $W->setUserConfiguration($tableview->getId(). '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
         
         return true;
     }
@@ -1948,7 +1948,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();
         
@@ -2001,7 +2001,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();
         
@@ -2053,7 +2053,7 @@ 
         
         $filterNames = $this->getFilterNames();
         foreach ($filterNames as $filterName) {
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
             
             $filterBox = $W->HBoxItems()
             ->setVerticalAlign('middle')
@@ -2103,7 +2103,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();
         
@@ -2140,7 +2140,7 @@ 
         $this->requireDeleteMethod();
         
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         return true;
     }
@@ -2151,7 +2151,7 @@ 
         $modelView = $this->modelView();
         $modelView->setHighlightedRows($ids);
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2161,7 +2161,7 @@ 
         $modelView = $this->modelView();
         $modelView->clearHighlightedRows();
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2180,35 +2180,35 @@ 
         $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) {
             $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')
+                ->addClass('icon', Func_Icons::ACTIONS_ARROW_RIGHT_DOUBLE, "app_closeHighlightButton")
+                ->setSizePolicy(Func_Icons::ICON_LEFT_32.' pull-right')
                 );
             
             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);
                 }
                 
@@ -2217,7 +2217,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 +4 added lines, -8 removed lines

@@ -201,8 +201,7 @@ 
                         'label' => $method['label']
                     );
                 }
-            }
-            catch(Exception $e){
+            } catch(Exception $e){
                 unset($types[$index]);
                 continue;
             }
@@ -929,8 +928,7 @@ 
             session_start();
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
-        }
-        else{
+        } else{
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -2184,8 +2182,7 @@ 
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
-        }
-        else{
+        } else{
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
             $viewClassname =  $recordClassname . 'FullFrame';
@@ -2207,8 +2204,7 @@ 
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
-                }
-                else{
+                } else{
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 

programs/link.class.php

Indentation +229 added lines, -229 removed lines

@@ -104,243 +104,243 @@
     }

 

 

-	/**

-	 * @param	string	$sourceClass

-	 */

-	public function joinSource($sourceClass)

-	{

-	    if(!$this->sourceId instanceof $sourceClass){

-	        $this->hasOne('sourceId', $sourceClass . 'Set');

-	        $this->join('sourceId');

-	    }

-	}

-

-

-	/**

-	 * @param	string	$targetClass

-	 */

-	public function joinTarget($targetClass = null)

-	{

-	    if(!$this->targetId instanceof $targetClass){

-	        $this->hasOne('targetId', $targetClass . 'Set');

-	        $this->join('targetId');

-	    }

-	}

+    /**

+     * @param	string	$sourceClass

+     */

+    public function joinSource($sourceClass)

+    {

+        if(!$this->sourceId instanceof $sourceClass){

+            $this->hasOne('sourceId', $sourceClass . 'Set');

+            $this->join('sourceId');

+        }

+    }

+

+

+    /**

+     * @param	string	$targetClass

+     */

+    public function joinTarget($targetClass = null)

+    {

+        if(!$this->targetId instanceof $targetClass){

+            $this->hasOne('targetId', $targetClass . 'Set');

+            $this->join('targetId');

+        }

+    }

 

 

     /**

      * @param string $recordClass

      * @return ORM_IsCriterion

      */

-	public function sourceIsA($recordClass)

-	{

-		return $this->sourceClass->is($recordClass);

-	}

-

-

-	/**

-	 * @param app_Record $record

-	 * @return ORM_Criteria

-	 */

-	public function sourceIs(app_Record $record)

-	{

-	    return $this->all(

-	        $this->sourceId->is($record->id),

+    public function sourceIsA($recordClass)

+    {

+        return $this->sourceClass->is($recordClass);

+    }

+

+

+    /**

+     * @param app_Record $record

+     * @return ORM_Criteria

+     */

+    public function sourceIs(app_Record $record)

+    {

+        return $this->all(

+            $this->sourceId->is($record->id),

             $this->sourceIsA($record->getClassName())

-	    );

-	}

-

-

-	/**

-	 * @param string $recordClass

-	 * @return ORM_IsCriterion

-	 */

-	public function targetIsA($recordClass)

-	{

-	    return $this->targetClass->is($recordClass);

-	}

-

-

-	/**

-	 * @param app_Record $record

-	 * @return ORM_Criteria

-	 */

-	public function targetIs(app_Record $record)

-	{

-	    return $this->all(

-	        $this->targetId->is($record->id),

-	        $this->targetIsA($record->getClassName())

         );

-	}

-

-

-	/**

-	 *

-	 * @return ORM_Iterator

-	 */

-	public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)

-	{

-	    $criteria = $this->sourceIs($object);

-

-		if (isset($targetClass)) {

-		    $this->joinTarget($targetClass);

-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));

-		}

-

-		if (isset($linkType)) {

-			if (is_array($linkType)) {

-				$criteria = $criteria->_AND_($this->type->in($linkType));

-			} else {

-				$criteria = $criteria->_AND_($this->type->is($linkType));

-			}

-		}

-

-		if (is_a($this->targetId, 'app_TraceableRecordSet')) {

-			$criteria = $criteria->_AND_($this->targetId->deleted->is(false));

-		}

-

-		return $this->select($criteria);

-	}

-

-

-	/**

-	 *

-	 * @return ORM_Iterator

-	 */

-	public function selectForSources($objects, $targetClass, $linkType = null)

-	{

-		$sourceClass = null;

-		$sourceIds = array();

-

-		foreach ($objects as $obj) {

-			if (is_null($sourceClass)) {

-			    $sourceClass = $obj->getClassName();

-			}

-			$sourceIds[] = $obj->id;

-		}

-		$criteria = $this->sourceId->in($sourceIds)

-			->_AND_($this->sourceClass->is($sourceClass));

-

-		if (isset($targetClass)) {

-		    $this->joinTarget($targetClass);

-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));

-		}

-

-		if (isset($linkType)) {

-			if (is_array($linkType)) {

-				$criteria = $criteria->_AND_($this->type->in($linkType));

-			} else {

-				$criteria = $criteria->_AND_($this->type->is($linkType));

-			}

-		}

-		return $this->select($criteria);

-	}

-

-

-	/**

-	 *

-	 * @return ORM_Iterator

-	 */

-	public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)

-	{

-	    $criteria = $this->targetIs($object);

-

-		if (isset($sourceClass)) {

-		    $this->joinSource($sourceClass);

-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));

-		}

-

-		if (isset($linkType)) {

-			if (is_array($linkType)) {

-				$criteria = $criteria->_AND_($this->type->in($linkType));

-			} else {

-				$criteria = $criteria->_AND_($this->type->is($linkType));

-			}

-		}

-

-		return $this->select($criteria);

-	}

-

-

-	/**

-	 *

-	 * @return ORM_Iterator

-	 */

-	public function selectForTargets($objects, $sourceClass = null, $linkType = null)

-	{

-		$targetClass = null;

-		$targetIds = array();

-

-		foreach ($objects as $obj) {

-			if (is_null($targetClass)) {

-			    $targetClass = $obj->getClassName();

-			}

-			$targetIds[] = $obj->id;

-		}

-		$criteria = $this->targetId->in($targetIds)

-			->_AND_($this->targetClass->is($targetClass));

-

-		if (isset($sourceClass)) {

-		    $this->joinSource($sourceClass);

-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));

-		}

-

-		if (isset($linkType)) {

-			if (is_array($linkType)) {

-				$criteria = $criteria->_AND_($this->type->in($linkType));

-			} else {

-				$criteria = $criteria->_AND_($this->type->is($linkType));

-			}

-		}

-

-		return $this->select($criteria);

-	}

-

-

-

-	/**

-	 * delete all links to an object

-	 *

-	 * @param	app_Record		$object

-	 * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes

-	 * @param	bool			$deleteTarget	if set to true, the target will be deleted to

-	 */

-	public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)

-	{

-		$set = clone $this;

-		$App = $object->App();

-

-		$criteria = $set->sourceId->is($object->id)->_AND_(

-			$set->sourceClass->is($object->getClassName())

-		);

-

-		if (null !== $targetClass) {

-			$criteria = $criteria->_AND_(

-				$set->targetClass->is($targetClass)

-			);

-		}

-		if (null !== $linkType) {

-			$criteria = $criteria->_AND_(

-				$set->type->is($linkType)

-			);

-		}

-

-		if ($deleteTarget) {

-			foreach($set->select($criteria) as $link) {

-

-				$className = $link->targetClass.'Set';

-

-				// remove prefix

-

-				$className = mb_substr($className, 1 + mb_strpos($className, '_'));

-				$targetSet = $App->$className();

-

-				$targetSet->delete($targetSet->id->is($link->targetId));

-			}

-		}

-

-		return $set->delete($criteria);

-	}

+    }

+

+

+    /**

+     * @param string $recordClass

+     * @return ORM_IsCriterion

+     */

+    public function targetIsA($recordClass)

+    {

+        return $this->targetClass->is($recordClass);

+    }

+

+

+    /**

+     * @param app_Record $record

+     * @return ORM_Criteria

+     */

+    public function targetIs(app_Record $record)

+    {

+        return $this->all(

+            $this->targetId->is($record->id),

+            $this->targetIsA($record->getClassName())

+        );

+    }

+

+

+    /**

+     *

+     * @return ORM_Iterator

+     */

+    public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)

+    {

+        $criteria = $this->sourceIs($object);

+

+        if (isset($targetClass)) {

+            $this->joinTarget($targetClass);

+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));

+        }

+

+        if (isset($linkType)) {

+            if (is_array($linkType)) {

+                $criteria = $criteria->_AND_($this->type->in($linkType));

+            } else {

+                $criteria = $criteria->_AND_($this->type->is($linkType));

+            }

+        }

+

+        if (is_a($this->targetId, 'app_TraceableRecordSet')) {

+            $criteria = $criteria->_AND_($this->targetId->deleted->is(false));

+        }

+

+        return $this->select($criteria);

+    }

+

+

+    /**

+     *

+     * @return ORM_Iterator

+     */

+    public function selectForSources($objects, $targetClass, $linkType = null)

+    {

+        $sourceClass = null;

+        $sourceIds = array();

+

+        foreach ($objects as $obj) {

+            if (is_null($sourceClass)) {

+                $sourceClass = $obj->getClassName();

+            }

+            $sourceIds[] = $obj->id;

+        }

+        $criteria = $this->sourceId->in($sourceIds)

+            ->_AND_($this->sourceClass->is($sourceClass));

+

+        if (isset($targetClass)) {

+            $this->joinTarget($targetClass);

+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));

+        }

+

+        if (isset($linkType)) {

+            if (is_array($linkType)) {

+                $criteria = $criteria->_AND_($this->type->in($linkType));

+            } else {

+                $criteria = $criteria->_AND_($this->type->is($linkType));

+            }

+        }

+        return $this->select($criteria);

+    }

+

+

+    /**

+     *

+     * @return ORM_Iterator

+     */

+    public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)

+    {

+        $criteria = $this->targetIs($object);

+

+        if (isset($sourceClass)) {

+            $this->joinSource($sourceClass);

+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));

+        }

+

+        if (isset($linkType)) {

+            if (is_array($linkType)) {

+                $criteria = $criteria->_AND_($this->type->in($linkType));

+            } else {

+                $criteria = $criteria->_AND_($this->type->is($linkType));

+            }

+        }

+

+        return $this->select($criteria);

+    }

+

+

+    /**

+     *

+     * @return ORM_Iterator

+     */

+    public function selectForTargets($objects, $sourceClass = null, $linkType = null)

+    {

+        $targetClass = null;

+        $targetIds = array();

+

+        foreach ($objects as $obj) {

+            if (is_null($targetClass)) {

+                $targetClass = $obj->getClassName();

+            }

+            $targetIds[] = $obj->id;

+        }

+        $criteria = $this->targetId->in($targetIds)

+            ->_AND_($this->targetClass->is($targetClass));

+

+        if (isset($sourceClass)) {

+            $this->joinSource($sourceClass);

+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));

+        }

+

+        if (isset($linkType)) {

+            if (is_array($linkType)) {

+                $criteria = $criteria->_AND_($this->type->in($linkType));

+            } else {

+                $criteria = $criteria->_AND_($this->type->is($linkType));

+            }

+        }

+

+        return $this->select($criteria);

+    }

+

+

+

+    /**

+     * delete all links to an object

+     *

+     * @param	app_Record		$object

+     * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes

+     * @param	bool			$deleteTarget	if set to true, the target will be deleted to

+     */

+    public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)

+    {

+        $set = clone $this;

+        $App = $object->App();

+

+        $criteria = $set->sourceId->is($object->id)->_AND_(

+            $set->sourceClass->is($object->getClassName())

+        );

+

+        if (null !== $targetClass) {

+            $criteria = $criteria->_AND_(

+                $set->targetClass->is($targetClass)

+            );

+        }

+        if (null !== $linkType) {

+            $criteria = $criteria->_AND_(

+                $set->type->is($linkType)

+            );

+        }

+

+        if ($deleteTarget) {

+            foreach($set->select($criteria) as $link) {

+

+                $className = $link->targetClass.'Set';

+

+                // remove prefix

+

+                $className = mb_substr($className, 1 + mb_strpos($className, '_'));

+                $targetSet = $App->$className();

+

+                $targetSet->delete($targetSet->id->is($link->targetId));

+            }

+        }

+

+        return $set->delete($criteria);

+    }

 

 

     /**

Spacing +5 added lines, -5 removed lines

@@ -109,8 +109,8 @@ 
 	 */

 	public function joinSource($sourceClass)

 	{

-	    if(!$this->sourceId instanceof $sourceClass){

-	        $this->hasOne('sourceId', $sourceClass . 'Set');

+	    if (!$this->sourceId instanceof $sourceClass) {

+	        $this->hasOne('sourceId', $sourceClass.'Set');

 	        $this->join('sourceId');

 	    }

 	}

@@ -121,8 +121,8 @@ 
 	 */

 	public function joinTarget($targetClass = null)

 	{

-	    if(!$this->targetId instanceof $targetClass){

-	        $this->hasOne('targetId', $targetClass . 'Set');

+	    if (!$this->targetId instanceof $targetClass) {

+	        $this->hasOne('targetId', $targetClass.'Set');

 	        $this->join('targetId');

 	    }

 	}

@@ -326,7 +326,7 @@ 
 		}

 

 		if ($deleteTarget) {

-			foreach($set->select($criteria) as $link) {

+			foreach ($set->select($criteria) as $link) {

 

 				$className = $link->targetClass.'Set';

 

programs/customsection.ctrl.php

Spacing +68 added lines, -68 removed lines

@@ -22,7 +22,7 @@ 
  */

 

 

-require_once APP_CTRL_PATH . '/record.ctrl.php';

+require_once APP_CTRL_PATH.'/record.ctrl.php';

 

 

 /**

@@ -47,7 +47,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);

@@ -62,9 +62,9 @@ 
         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;

+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;

+                foreach ($field['fields'] as $subField) {

+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;

                 }

             }

         }

@@ -88,7 +88,7 @@ 
         bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE);

 

         foreach ($availableFields as $field) {

-            $fieldName =  $field['name'];

+            $fieldName = $field['name'];

             $fieldDescription = $field['description'];

 

             $used = isset($allViewFieldNames[$fieldName]);

@@ -353,12 +353,12 @@ 
         

         $customSection = $customSectionSet->request($customSectionSet->id->is($section));

         $fields = $customSection->getFields();

-        if(!isset($fields[$fieldGroupName])){

+        if (!isset($fields[$fieldGroupName])) {

             throw new app_Exception($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);

         }

         

@@ -374,9 +374,9 @@ 
         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;

+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;

+                foreach ($field['fields'] as $subField) {

+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;

                 }

             }

         }

@@ -402,7 +402,7 @@ 
         bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE);

         

         foreach ($availableFields as $field) {

-            $fieldName =  $field['name'];

+            $fieldName = $field['name'];

             $fieldDescription = $field['description'];

             

             $used = isset($allViewFieldNames[$fieldName]);

@@ -560,7 +560,7 @@ 
         

         $options = array();

         $rank = 1;

-        foreach($containers as $container){

+        foreach ($containers as $container) {

             $options[$container->id] = sprintf('%d (%s)', $rank, $container->name);

             $rank++;

         }

@@ -570,7 +570,7 @@ 
         )->orderDesc($customSectionSet->rank);

         

         $nbSections = 0;

-        foreach ($containerSections as $containerSection){

+        foreach ($containerSections as $containerSection) {

             $nbSections = $containerSection->rank + 1;

             break;

         }

@@ -694,10 +694,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';

@@ -721,16 +721,16 @@ 
                 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;

@@ -739,14 +739,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;

@@ -781,7 +781,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();

         }

@@ -822,7 +822,7 @@ 
         );

         

         $position++;

-        foreach ($afterSections as $afterSection){

+        foreach ($afterSections as $afterSection) {

             $afterSection->rank = $position;

             $afterSection->save();

             $position++;

@@ -855,10 +855,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';

@@ -868,14 +868,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());

@@ -883,7 +883,7 @@ 
                 

                 $visibilityCriteria = '';

                 

-                if($foreignSet){

+                if ($foreignSet) {

                     $selectedManyField = $foreignSet->$selectedField;

                     

                     if ($selectedManyField instanceof ORM_BoolInterface) {

@@ -903,9 +903,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();

@@ -914,7 +914,7 @@ 
                 

                 $visibilityCriteria = '';

                 

-                if($foreignSet){

+                if ($foreignSet) {

                     $selectedOneField = $foreignSet->$selectedField;

                     

                     if ($selectedOneField instanceof ORM_BoolInterface) {

@@ -929,7 +929,7 @@ 
                 break;

             }

         }

-        else{

+        else {

         

             $field = $objectRecordSet->$field;

     

@@ -941,7 +941,7 @@ 
     

             $visibilityCriteria = '';

             

-            if(!empty($condition)){

+            if (!empty($condition)) {

                 $criteria = $field->{$condition}($data['value']);

                 $visibilityCriteria = $criteria->toJson();

             }

@@ -976,7 +976,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);

         }

         

@@ -1007,19 +1007,19 @@ 
         

         foreach ($customSections as $customSection) {

 

-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);

+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);

 

             $currentColumn += $nbCol;

 

             $sectionSection = $W->Section(

-                $customSection->name . ' (' . $customSection->rank . ')',

+                $customSection->name.' ('.$customSection->rank.')',

                 $sectionBox = $W->VBoxItems(

-                    $W->Hidden()->setName('#' . $customSection->id)

+                    $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);

 

@@ -1049,7 +1049,7 @@ 
                     ->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'))

@@ -1057,7 +1057,7 @@ 
                 );

             }

             $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'))

@@ -1071,8 +1071,8 @@ 
 

                 $fieldName = $field['fieldname'];

 

-                $isFieldsGroup= false;

-                if(strpos($fieldName, '_fieldsGroup') !== false){

+                $isFieldsGroup = false;

+                if (strpos($fieldName, '_fieldsGroup') !== false) {

                     $fieldName = '_fieldsGroup';

                     $isFieldsGroup = true;

                 }

@@ -1088,7 +1088,7 @@ 
                 }

                 

                 $fieldName = $field['name'];

-                if($isFieldsGroup){

+                if ($isFieldsGroup) {

                     $fieldName = $fieldId;

                 }

                 

@@ -1100,18 +1100,18 @@ 
                         $fieldGroupBox = $W->FlexItems()->setGrowable(true)->setWrap(Widget_FlexLayout::FLEX_WRAP_WRAP)

                     )->setSizePolicy('maximum'),

                     $btnBox = $W->HBoxItems(

-                        $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($fieldName)

+                        $W->Hidden()->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(Widget_Link::OPEN_DIALOG)

                     );

                     $groupedFields = $fields[$fieldName]['fields'];

-                    foreach ($groupedFields as $groupedField){

+                    foreach ($groupedFields as $groupedField) {

                         $groupedFieldDetails = $availableFields[$groupedField['fieldname']];

                         $fieldGroupBox->addItem(

                             $flexField = $W->FlowItems(

@@ -1212,7 +1212,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);

@@ -1393,15 +1393,15 @@ 
         $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) === '#') {

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

@@ -1409,39 +1409,39 @@ 
                 $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();

Braces +3 added lines, -6 removed lines

@@ -928,8 +928,7 @@ 
                 }

                 break;

             }

-        }

-        else{

+        } else{

         

             $field = $objectRecordSet->$field;

     

@@ -1422,12 +1421,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/portletbackend.class.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2019 by CAPWELTON ({@link http://www.capwelton.com})
  */
 
-require_once dirname(__FILE__) . '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 bab_Functionality::includefile('PortletBackend');
 
@@ -99,7 +99,7 @@ 
     
     public function includeNotifications()
     {
-        require_once APP_PORTLET_PATH . 'notifications.portlet.php';
+        require_once APP_PORTLET_PATH.'notifications.portlet.php';
     }
     
     public function Notifications()