capwelton / libapp

programs/FuncApp.php

Spacing +86 added lines, -86 removed lines

@@ -64,13 +64,13 @@ 
 
 bab_Widgets();
 
-require_once dirname(__FILE__) . '/define.php';
-require_once dirname(__FILE__) . '/functions.php';
+require_once dirname(__FILE__).'/define.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $libappAddon = bab_getAddonInfosInstance('libapp');
 $libappPhpPath = $libappAddon->getPhpPath();
 
-require_once $libappPhpPath . '../vendor/autoload.php';
+require_once $libappPhpPath.'../vendor/autoload.php';
 
 /**
  * Provides extensible functionalities to manage an application.
@@ -106,13 +106,13 @@ 
         $this->addonPrefix = 'app';
 
         $this->classPrefix = 'App';
-        $this->controllerTg = 'addon/' . $this->addonName . '/main';
+        $this->controllerTg = 'addon/'.$this->addonName.'/main';
 
         $addon = bab_getAddonInfosInstance($this->addonName);
         $this->phpPath = $addon->getPhpPath();
         $this->recordSetPath = $this->phpPath;
         $this->ctrlPath = $this->phpPath;
-        $this->uiPath = $this->phpPath . 'ui/';
+        $this->uiPath = $this->phpPath.'ui/';
 
         $babDB = bab_GetDatabaseInstance();
 
@@ -129,7 +129,7 @@ 
         if (class_exists($componentDefinitionObjectName)) {
             $componentDefinition = new $componentDefinitionObjectName;
             $components = $componentDefinition->getComponents($this);
-            foreach ($components as $singleName => $singleComponent){
+            foreach ($components as $singleName => $singleComponent) {
                 $this->addComponent($singleName, $singleComponent);
             }
         }
@@ -158,7 +158,7 @@ 
         $nbElem = count($componentName);
         $componentName = $componentName[$nbElem - 1];
         $componentName = strtoupper($componentName);
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
         }
         return null;
@@ -187,9 +187,9 @@ 
     
     public function __get($componentName)
     {
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
-        }else{
+        } else {
             return null;
         }
     }
@@ -208,12 +208,12 @@ 
         
         $messages = array();
         
-        foreach ($components as $componentName => $component){
+        foreach ($components as $componentName => $component) {
             $dependencies = $component->checkDependencies();
-            foreach($dependencies['requiredComponents'] as $requiredComponent){
+            foreach ($dependencies['requiredComponents'] as $requiredComponent) {
                 $messages['requiredComponents'][$componentName][] = $requiredComponent;
             }
-            foreach($dependencies['optionalComponents'] as $optionalComponent){
+            foreach ($dependencies['optionalComponents'] as $optionalComponent) {
                 $messages['optionalComponents'][$componentName][] = $optionalComponent;
             }
         }
@@ -225,9 +225,9 @@ 
     {
         $components = $this->getComponents();
         $componentDefinitions = array();
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $packageName = $component->getPackageName();
-            if(isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])){
+            if (isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])) {
                 continue;
             }
             $componentDefinitions[$packageName] = $component->getDefinition();
@@ -270,8 +270,8 @@ 
     public function getRecordSetPathname($class)
     {
         // $App->MyRecordSet() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -283,8 +283,8 @@ 
     public function getRecordPathname($class)
     {
         // $App->MyRecord() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -379,12 +379,12 @@ 
         $mysqlbackend = new ORMMySqlBackend($GLOBALS['babDB']);
         $sql = 'SET FOREIGN_KEY_CHECKS=0;
             ';
-        $temp =get_class_methods($this);
+        $temp = get_class_methods($this);
         foreach ($temp as $method) {
 
             if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
 
                 $classname = $this->$classNameMethod();
@@ -406,7 +406,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -424,20 +424,20 @@ 
     {
         $methods = array();
         $doc = (new ReflectionClass($this))->getDocComment();
-        if(empty($doc)){
+        if (empty($doc)) {
             return $methods;
         }
 
-        $lines = array_map(function($line){
+        $lines = array_map(function($line) {
             return trim($line, " *");
         }, explode("\n", $doc));
 
-        $lines = array_filter($lines, function($line){
+        $lines = array_filter($lines, function($line) {
             return strpos($line, "@method") === 0;
         });
         
         
-        foreach($lines as $line){
+        foreach ($lines as $line) {
             list(, $value) = explode(' ', $line, 2);
             $value = trim(substr($value, strpos($value, ' ')));
             $methods[] = $value;
@@ -457,9 +457,9 @@ 
             ';
 
         $noPackageNames = array();
-        foreach ($this->components as $component){
+        foreach ($this->components as $component) {
             /* @var $component AppComponent */
-            try{
+            try {
                 /* @var $set ORMRecordSet */
                 $set = $component->recordSet();
                 //Check if the component is not overriden by the addon
@@ -467,26 +467,26 @@ 
                 //In case the set has been overriden, we simply do nothing here, as it will be instanciated by the synchronizeSql method
                 $cmprc = new \ReflectionClass($set);
                 $componentSetClass = $cmprc->getShortName();
-                if(method_exists($this, $componentSetClass)){
+                if (method_exists($this, $componentSetClass)) {
                     continue;
                 }
-                if(method_exists($set, 'useLang')){
+                if (method_exists($set, 'useLang')) {
                     // This is necessary if the recordSet constructor uses a setLang().
                     // We need to revert to multilang fields before synchronizing.
                     $set->useLang(false);
                 }
-                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                $sql .= $mysqlbackend->setToSql($set)."\n";
                 
-                if(empty($component->getPackageName())){
+                if (empty($component->getPackageName())) {
                     $noPackageNames[] = $component->getName();
                 }
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 
             }
         }
         
-        if(!empty($noPackageNames)){
+        if (!empty($noPackageNames)) {
             $errorMessage = implode(', ', $noPackageNames);
             babinstallWindow::message(
                 sprintf(
@@ -509,18 +509,18 @@ 
         $synchronize->fromSqlString($sql);
         
         $dependencies = $this->checkComponentsDependencies();
-        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents){
-            foreach ($requiredComponents as $requiredComponent){
+        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents) {
+            foreach ($requiredComponents as $requiredComponent) {
                 $hasComponent = $this->getComponentByName($requiredComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     BabInstallWindow::message(sprintf($this->translate('The component %s is required for the component %s to work. You will encounter fatal errors'), $requiredComponent, $componentName));
                 }
             }
         }
-        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents){
-            foreach ($optionalComponents as $optionalComponent){
+        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents) {
+            foreach ($optionalComponents as $optionalComponent) {
                 $hasComponent = $this->getComponentByName($optionalComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     BabInstallWindow::message(sprintf($this->translate('The optional component %s has not been added. The component %s may have reduced functionalities'), $optionalComponent, $componentName));
                 }
             }
@@ -533,7 +533,7 @@ 
     {
         $components = $this->getComponents();
         
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $component->onUpdate();
         }
         
@@ -554,7 +554,7 @@ 
 
             if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
                 $classname = $this->$classNameMethod();
 
@@ -568,7 +568,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -582,7 +582,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -629,7 +629,7 @@ 
     public function getRecordSetByRef($recordClassname)
     {
         $recordClassname = str_replace($this->classPrefix, '', $recordClassname);
-        $classSet = $recordClassname . 'Set';
+        $classSet = $recordClassname.'Set';
         $set = $this->$classSet();
         return $set;
     }
@@ -650,7 +650,7 @@ 
         list($recordClassname, $id) = $refParts;
         $set = $this->getRecordSetByRef($recordClassname);
         if (isset($set)) {
-            if($noDefaultCriteria){
+            if ($noDefaultCriteria) {
                 $set->setDefaultCriteria(null);
             }
             return $set->get($id);
@@ -669,7 +669,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -725,7 +725,7 @@ 
         
         //Then, check if current component has a translation
         if ($translation === $str) {
-            if($currentComponent = $this->getCurrentComponent()){
+            if ($currentComponent = $this->getCurrentComponent()) {
                 $translator->setAddonName($currentComponent->getPackageName());
                 $translator->setLangPath($currentComponent->getLangPath());
                 $translation = $translator->translate($str, $str_plurals, $number);
@@ -734,7 +734,7 @@ 
         }
         //Then, check if libapp has a translation
         if ($translation === $str) { 
-            $translator->setLangPath(null);//Reset lang path
+            $translator->setLangPath(null); //Reset lang path
             $translator->setAddonName('libapp');
             $translation = $translator->translate($str, $str_plurals, $number);
         }
@@ -782,16 +782,16 @@ 
      */
     public function mailTo($addr, $subject = null, $body = null)
     {
-        $mailTo = 'mailto:' . $addr;
+        $mailTo = 'mailto:'.$addr;
         $parameters = array();
         if (isset($subject)) {
-            $parameters[] = 'subject=' . $subject;
+            $parameters[] = 'subject='.$subject;
         }
         if (isset($body)) {
-            $parameters[] = 'body=' . $body;
+            $parameters[] = 'body='.$body;
         }
         if (!empty($parameters)) {
-            $mailTo .= '?' . implode('&', $parameters);
+            $mailTo .= '?'.implode('&', $parameters);
         }
 
         return $mailTo;
@@ -842,7 +842,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -862,7 +862,7 @@ 
         }
 
         if (!isset($format)) {
-            $format = BabRegistry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat());
+            $format = BabRegistry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat());
         }
         $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil();
 
@@ -904,12 +904,12 @@ 
         $rc = new \ReflectionClass($this);
         $namespace = $rc->getNamespaceName();
         $prefix = '';
-        if(!empty($namespace)){
+        if (!empty($namespace)) {
             $namespaces = explode('\\', $namespace);
             $prefix = $namespaces[0].'\\'.$namespaces[1].'\Ctrl\\';
         }
         $this->includeController();
-        return bab_getInstance($prefix.$this->classPrefix . 'Controller')->setApp($this);
+        return bab_getInstance($prefix.$this->classPrefix.'Controller')->setApp($this);
     }
 
 
@@ -950,12 +950,12 @@ 
         $rc = new \ReflectionClass($this);
         $namespace = $rc->getNamespaceName();
         $prefix = '';
-        if(!empty($namespace)){
+        if (!empty($namespace)) {
             $namespaces = explode('\\', $namespace);
             $prefix = $namespaces[0].'\\'.$namespaces[1].'\Ui\\';
         }
         $this->includeUi();
-        return bab_getInstance($prefix.$this->classPrefix . 'Ui')->setApp($this);
+        return bab_getInstance($prefix.$this->classPrefix.'Ui')->setApp($this);
     }
 
     /**
@@ -982,40 +982,40 @@ 
 
             case substr($name, -strlen('SetClassName')) === 'SetClassName':
                 $className = substr($name, 0, strlen($name) - strlen('SetClassName'));
-                if($component = $this->getComponentByName($className)){
+                if ($component = $this->getComponentByName($className)) {
                     return $component->getSetClassName();
                 }
                 $setName = $className.'Set';
-                return $this->classPrefix . $setName;
+                return $this->classPrefix.$setName;
 
             case substr($name, -strlen('ClassName')) === 'ClassName':
                 $recordName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                if($component = $this->getComponentByName($recordName)){
+                if ($component = $this->getComponentByName($recordName)) {
                     return $component->getRecordClassName();
                 }
-                return $this->classPrefix . $recordName;
+                return $this->classPrefix.$recordName;
 
             case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set':
                 $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include')));
-                if($this->getComponentByName($fileNameBase)){
+                if ($this->getComponentByName($fileNameBase)) {
                     return;
                 }
-                $path = APP_SET_PATH . $fileNameBase . '.class.php';
-                if(is_file($path)){
+                $path = APP_SET_PATH.$fileNameBase.'.class.php';
+                if (is_file($path)) {
                     require_once $path;
                 }
                 return;
 
             case substr($name, -strlen('Set')) === 'Set':
-                try{
+                try {
                     $sClassName = str_replace($this->classPrefix, '', $name);
-                    if(method_exists($this, $sClassName)){
+                    if (method_exists($this, $sClassName)) {
                         return $this->$sClassName();
                     }
                     throw new Exception("Class '{$sClassName}' not found");
                 }
-                catch(Exception $e){
-                    if($component = $this->getComponentByName(substr($name, 0, strlen($name) -strlen('Set')))){
+                catch (Exception $e) {
+                    if ($component = $this->getComponentByName(substr($name, 0, strlen($name) - strlen('Set')))) {
                         return $component->recordSet();
                     }
                     throw $e;
@@ -1024,8 +1024,8 @@ 
             case ($component = $this->getComponentByName($name)) != false:
                 return $component;
             default:
-                $setName = $name . 'Set';
-                $recordClassNameMethod = $name . 'ClassName';
+                $setName = $name.'Set';
+                $recordClassNameMethod = $name.'ClassName';
                 $recordClassName = $this->$recordClassNameMethod();
                 if (isset($arguments[0])) {
                     if ($arguments[0] instanceof $recordClassName) {
@@ -1039,38 +1039,38 @@ 
     }
     
 
-    public function LinkSet(){
+    public function LinkSet() {
         return $this->AppLinkSet();
     }
-    public function AppLinkSet(){
+    public function AppLinkSet() {
         return new AppLinkSet($this);
     }
 
-    public function CustomFieldSet(){
+    public function CustomFieldSet() {
         return $this->AppCustomFieldSet();
     }
-    public function AppCustomFieldSet(){
+    public function AppCustomFieldSet() {
         return new AppCustomFieldSet($this);
     }
 
-    public function CustomContainerSet(){
+    public function CustomContainerSet() {
         return $this->AppCustomContainerSet();
     }
-    public function AppCustomContainerSet(){
+    public function AppCustomContainerSet() {
         return new AppCustomContainerSet($this);
     }
 
-    public function CustomSectionSet(){
+    public function CustomSectionSet() {
         return $this->AppCustomSectionSet();
     }
-    public function AppCustomSectionSet(){
+    public function AppCustomSectionSet() {
         return new AppCustomSectionSet($this);
     }
 
-    public function LogSet(){
+    public function LogSet() {
         return $this->AppLogSet();
     }
-    public function AppLogSet(){
+    public function AppLogSet() {
         return new AppLogSet($this);
     }
     
@@ -1204,9 +1204,9 @@ 
     {
         $sets = array();
         
-        foreach ($this->components as $component){
+        foreach ($this->components as $component) {
             /* @var $component AppComponent */
-            try{
+            try {
                 /* @var $set ORMRecordSet */
                 $set = $component->recordSet();
                 //Check if the component is not overriden by the addon
@@ -1214,13 +1214,13 @@ 
                 //In case the set has been overriden, we simply do nothing here, as it will be instanciated by the synchronizeSql method
                 $cmprc = new \ReflectionClass($set);
                 $componentSetClass = $cmprc->getShortName();
-                if(method_exists($this, $componentSetClass)){
+                if (method_exists($this, $componentSetClass)) {
                     continue;
                 }
                 
                 $sets[$componentSetClass] = $set;
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 
             }
         }
@@ -1231,7 +1231,7 @@ 
 
             if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
 
                 $classname = $this->$classNameMethod();

Braces +4 added lines, -7 removed lines

@@ -189,7 +189,7 @@ 
     {
         if(isset($this->components[$componentName])){
             return $this->components[$componentName];
-        }else{
+        } else{
             return null;
         }
     }
@@ -480,8 +480,7 @@ 
                 if(empty($component->getPackageName())){
                     $noPackageNames[] = $component->getName();
                 }
-            }
-            catch (\Exception $e){
+            } catch (\Exception $e){
                 
             }
         }
@@ -1013,8 +1012,7 @@ 
                         return $this->$sClassName();
                     }
                     throw new Exception("Class '{$sClassName}' not found");
-                }
-                catch(Exception $e){
+                } catch(Exception $e){
                     if($component = $this->getComponentByName(substr($name, 0, strlen($name) -strlen('Set')))){
                         return $component->recordSet();
                     }
@@ -1219,8 +1217,7 @@ 
                 }
                 
                 $sets[$componentSetClass] = $set;
-            }
-            catch (\Exception $e){
+            } catch (\Exception $e){
                 
             }
         }

programs/Ctrl/AppCtrlCustomSection.php

Spacing +151 added lines, -151 removed lines

@@ -74,7 +74,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);
@@ -83,20 +83,20 @@ 
             ->_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;
-                if(isset($field["fields"])){
-                    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;
+                if (isset($field["fields"])) {
+                    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);
         }
         
@@ -111,7 +111,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -166,7 +166,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -181,20 +181,20 @@ 
         
         $availableFields = $objectCtrl->getAvailableDisplayFields();
         
-        if(isset($availableFields[$fieldName])){
+        if (isset($availableFields[$fieldName])) {
             $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;
         }
         
         $page = $App->Ui()->Page();
-        if(!empty($fieldDescription)){
+        if (!empty($fieldDescription)) {
             $page->setTitle($fieldDescription);
         }
         
@@ -262,45 +262,45 @@ 
         $subGroups = explode('/', $fieldGroupName);
         $nbEntryInSubGroup = count($subGroups);
 
-        if($nbEntryInSubGroup == 1){
+        if ($nbEntryInSubGroup == 1) {
             $groupField = $customSection->getField($fieldGroupName);
         }
-        elseif($nbEntryInSubGroup == 2){
+        elseif ($nbEntryInSubGroup == 2) {
             $groupField = $customSection->getField($subGroups[0]);
-            if(isset($groupField['fields'][$subGroups[1]])){
+            if (isset($groupField['fields'][$subGroups[1]])) {
                 $groupField = $groupField['fields'][$subGroups[1]];
             }   
-            else{
+            else {
                 return $this;
             }         
         }
-        elseif($nbEntryInSubGroup == 3){
+        elseif ($nbEntryInSubGroup == 3) {
             $groupField = $customSection->getField($subGroups[0]);
-            if(isset($groupField['fields'][$subGroups[1]]['fields'][$subGroups[2]])){
+            if (isset($groupField['fields'][$subGroups[1]]['fields'][$subGroups[2]])) {
                 $groupField = $groupField['fields'][$subGroups[1]]['fields'][$subGroups[2]];
             }   
-            else{
+            else {
                 return $this;
             }         
         }
-        else{
+        else {
             return $this;
         }
         
         
-        if(! isset($groupField)){
+        if (!isset($groupField)) {
             return null;
         }
 
         $isSubGroup = false;
-        if(isset($groupField['fields'][$fieldName])){
+        if (isset($groupField['fields'][$fieldName])) {
             $field = $groupField['fields'][$fieldName];
         }
-        else{
+        else {
             return null;
         }
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -319,22 +319,22 @@ 
             'description' => sprintf('[%s]', $App->translate('Sub section'))
         );
 
-        if(strpos($fieldName, '_subSection') !== false){
+        if (strpos($fieldName, '_subSection') !== false) {
             $field = $availableFields['_subSection'];
         }
-        elseif(strpos($fieldName, '_fieldsGroup') !== false){
+        elseif (strpos($fieldName, '_fieldsGroup') !== false) {
             $field = $availableFields['_fieldsGroup'];
         }
-        else{
+        else {
             $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;
         }
         
@@ -423,17 +423,17 @@ 
 
         $inSubGroup = false;
 
-        if($nbEntryInSubGroup == 1 && !isset($fields[$fieldGroupName])){
+        if ($nbEntryInSubGroup == 1 && !isset($fields[$fieldGroupName])) {
             throw new AppException($App->translate('This fields group does not seem to exist'));
         }
-        elseif($nbEntryInSubGroup == 3){
+        elseif ($nbEntryInSubGroup == 3) {
             $inSubGroup = true;
             $currentFieldToCheck = $fields;
-            foreach($subGroups as $subGroup){
-                if(!isset($currentFieldToCheck[$subGroup])){
+            foreach ($subGroups as $subGroup) {
+                if (!isset($currentFieldToCheck[$subGroup])) {
                     throw new AppException($App->translate('This fields group does not seem to exist'));
                 }
-                if(!isset($currentFieldToCheck[$subGroup]['fields'])){
+                if (!isset($currentFieldToCheck[$subGroup]['fields'])) {
                     $currentFieldToCheck[$subGroup]['fields'] = array();
                 }
                 $currentFieldToCheck = $currentFieldToCheck[$subGroup]['fields'];
@@ -442,7 +442,7 @@ 
 
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -452,20 +452,20 @@ 
             ->_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;
-                if(isset($field["fields"])){
-                    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;
+                if (isset($field["fields"])) {
+                    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);
         }
         
@@ -480,7 +480,7 @@ 
         unset($availableFields['_fieldsGroup']);
         unset($availableFields['_spacer']);
         
-        if(!$inSubGroup){
+        if (!$inSubGroup) {
             $availableFields['_subSection'] = array(
                 'name' => '_subSection',
                 'description' => sprintf('[%s]', $App->translate('Sub section'))
@@ -489,7 +489,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -527,12 +527,12 @@ 
         
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         $fields = $customSection->getFields();
-        if(!isset($fields[$fieldGroupName]['fields'][$subSectionName])){
+        if (!isset($fields[$fieldGroupName]['fields'][$subSectionName])) {
             throw new AppException($App->translate('This fields group or sub section 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);
         }
         
@@ -542,20 +542,20 @@ 
             ->_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;
-                if(isset($field["fields"])){
-                    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;
+                if (isset($field["fields"])) {
+                    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);
         }
         
@@ -564,7 +564,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -680,10 +680,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;
         }
@@ -725,10 +725,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';
@@ -743,25 +743,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;
@@ -770,14 +770,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;
@@ -812,7 +812,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();
@@ -824,7 +824,7 @@ 
         return true;
     }
     
-    protected function postSave(ORMRecord &$record, $data)
+    protected function postSave(ORMRecord & $record, $data)
     {
         parent::postSave($record, $data);
         $set = $record->getParentSet();
@@ -845,11 +845,11 @@ 
             $set->rank->greaterThanOrEqual($record->rank)
         )));
         
-        $position ++;
-        foreach ($afterSections as $afterSection){
+        $position++;
+        foreach ($afterSections as $afterSection) {
             $afterSection->rank = $position;
             $afterSection->save();
-            $position ++;
+            $position++;
         }
     }
     
@@ -877,10 +877,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';
@@ -890,14 +890,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());
@@ -905,13 +905,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedManyField = $foreignSet->$selectedField;
                     
-                    if($selectedManyField instanceof ORMBoolInterface){
+                    if ($selectedManyField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -923,9 +923,9 @@ 
             }
             
             $oneRelations = $objectRecordSet->getHasOneRelations();
-            foreach ($oneRelations as $oneRelation){
+            foreach ($oneRelations as $oneRelation) {
                 /* @var $oneRelation ORMOneRelation*/
-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){
+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetClassName = $oneRelation->getForeignSetClassName();
@@ -934,13 +934,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedOneField = $foreignSet->$selectedField;
                     
-                    if($selectedOneField instanceof ORMBoolInterface){
+                    if ($selectedOneField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -950,20 +950,20 @@ 
                 break;
             }
         }
-        else{
+        else {
             
             $field = $objectRecordSet->$field;
             
-            if($field instanceof ORMBoolInterface){
+            if ($field instanceof ORMBoolInterface) {
                 $condition = $condition['bool'];
             }
-            else{
+            else {
                 $condition = $condition['default'];
             }
             
             $visibilityCriteria = '';
             
-            if(! empty($condition)){
+            if (!empty($condition)) {
                 $criteria = $field->{$condition}($data['value']);
                 $visibilityCriteria = $criteria->toJson();
             }
@@ -992,7 +992,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);
         }
         
@@ -1024,16 +1024,16 @@ 
         
         $nbCol = 0;
         
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             $nbCol = $customSection->getNbColFromSizePolicy();
             
             $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);
             
@@ -1058,50 +1058,50 @@ 
                 ->addClass('icon', FuncIcons::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;
                 }
                 $isSpacer = false;
-                if(strpos($fieldName, '_spacer') !== false){
+                if (strpos($fieldName, '_spacer') !== false) {
                     $fieldName = '_spacer';
                     $isSpacer = true;
                 }
                 
-                if(!isset($availableFields[$fieldName])){
+                if (!isset($availableFields[$fieldName])) {
                     $field = array();
                     $fieldDescription = "";
-                }else{
+                } else {
                     $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 || $isSpacer){
+                if ($isFieldsGroup || $isSpacer) {
                     $fieldName = $fieldId;
                 }
                 
@@ -1112,12 +1112,12 @@ 
                     ->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(FuncIcons::ICON_LEFT_16);
-                if(strpos($field['name'], '_fieldsGroup') !== false){
+                if (strpos($field['name'], '_fieldsGroup') !== false) {
                     $btnBox->addItem(
                         $W->Link(
                             '', 
@@ -1125,12 +1125,12 @@ 
                         )->addClass('icon', FuncIcons::ACTIONS_LIST_ADD)->setOpenMode(WidgetLink::OPEN_DIALOG)
                     );
                     
-                    if(isset($fields[$fieldName]["fields"])){
+                    if (isset($fields[$fieldName]["fields"])) {
                         $groupedFields = $fields[$fieldName]['fields'];
-                        foreach ($groupedFields as $groupedField){
+                        foreach ($groupedFields as $groupedField) {
                             $groupedFieldName = $groupedField['fieldname'];
                             $isSubSubSection = false;
-                            if(strpos($groupedFieldName, '_subSection') !== false){
+                            if (strpos($groupedFieldName, '_subSection') !== false) {
                                 $groupedFieldName = '_subSection';
                                 $isSubSubSection = true;
                             }
@@ -1138,7 +1138,7 @@ 
                             $fieldGroupBox->addItem(
                                 $flexField = $W->VBoxItems(
                                     $W->HBoxItems(
-                                        $W->Hidden(null, array($customSection->id . '.fieldsGroups',$fieldName,$groupedField['fieldname']), $groupedField['fieldname']), 
+                                        $W->Hidden(null, array($customSection->id.'.fieldsGroups', $fieldName, $groupedField['fieldname']), $groupedField['fieldname']), 
                                         $W->Label($groupedFieldDetails['description']), 
                                         $fieldMenu = $W->FlowItems(
                                             $W->Link(
@@ -1154,7 +1154,7 @@ 
                                 )->addClass('app-customsection-groupedfield')
                             )->addClass('app-customsection-groupedfields-edit');
 
-                            if($isSubSubSection){
+                            if ($isSubSubSection) {
                                 $fieldMenu->addItem(
                                     $W->Link(
                                         '', 
@@ -1169,15 +1169,15 @@ 
 
                                 $flexField->addClass('app-customsection-subSection-edit');
 
-                                if(isset($groupedField['fields'])){
+                                if (isset($groupedField['fields'])) {
                                     $subSectionFields = $groupedField['fields'];
-                                    foreach($subSectionFields as $subSectionField){
+                                    foreach ($subSectionFields as $subSectionField) {
                                         $groupFieldBox->addItem(
                                             $groupFieldItemBox = $W->VBoxItems()
                                         );
                                         $subSectionFieldName = $subSectionField['fieldname'];
                                         $isFieldsGroupSubSection = false;
-                                        if(strpos($subSectionFieldName, '_fieldsGroup') !== false){
+                                        if (strpos($subSectionFieldName, '_fieldsGroup') !== false) {
                                             $subSectionFieldName = '_fieldsGroup';
                                             $isFieldsGroupSubSection = true;
                                         }
@@ -1196,7 +1196,7 @@ 
                                                 )
                                             )
                                         );
-                                        if($isFieldsGroupSubSection){
+                                        if ($isFieldsGroupSubSection) {
                                             $groupFieldItemMenu->addItem(
                                                 $W->Link(
                                                     '', 
@@ -1204,11 +1204,11 @@ 
                                                 )->addClass('icon', FuncIcons::ACTIONS_LIST_ADD)->setOpenMode(WidgetLink::OPEN_DIALOG),
                                                 0
                                             );
-                                            if(isset($subSectionField['fields'])){
+                                            if (isset($subSectionField['fields'])) {
                                                 $groupFieldItemBox->addItem(
                                                     $groupFieldItemGroupBox = $W->FlexItems()->setJustifyContent(WidgetFlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN)
                                                 );
-                                                foreach($subSectionField['fields'] as $subSectionFieldGroupFields){
+                                                foreach ($subSectionField['fields'] as $subSectionFieldGroupFields) {
                                                     $groupFieldItemGroupBox->addItem(
                                                         $W->FlowItems(
                                                             $W->Label($availableFields[$subSectionFieldGroupFields['fieldname']]['description']),
@@ -1251,23 +1251,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);
@@ -1294,7 +1294,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']);
@@ -1308,7 +1308,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, BabCharset::UTF_8);
@@ -1360,12 +1360,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;
         }
@@ -1377,7 +1377,7 @@ 
         
         $customSectionSet->delete($customSectionSet->container->is($container));
         
-        foreach ($sectionsValues as $sectionValues){
+        foreach ($sectionsValues as $sectionValues) {
             $customSection = $customSectionSet->newRecord();
             $customSection->setValues($sectionValues);
             $customSection->container = $container;
@@ -1455,59 +1455,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 && isset($rawSectionData[$currentSectionId][$fieldName])){
+                if (strpos($fieldName, '_fieldsGroup') !== false && isset($rawSectionData[$currentSectionId][$fieldName])) {
                     $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 +17 added lines, -33 removed lines

@@ -264,26 +264,21 @@ 
 
         if($nbEntryInSubGroup == 1){
             $groupField = $customSection->getField($fieldGroupName);
-        }
-        elseif($nbEntryInSubGroup == 2){
+        } elseif($nbEntryInSubGroup == 2){
             $groupField = $customSection->getField($subGroups[0]);
             if(isset($groupField['fields'][$subGroups[1]])){
                 $groupField = $groupField['fields'][$subGroups[1]];
-            }   
-            else{
+            } else{
                 return $this;
             }         
-        }
-        elseif($nbEntryInSubGroup == 3){
+        } elseif($nbEntryInSubGroup == 3){
             $groupField = $customSection->getField($subGroups[0]);
             if(isset($groupField['fields'][$subGroups[1]]['fields'][$subGroups[2]])){
                 $groupField = $groupField['fields'][$subGroups[1]]['fields'][$subGroups[2]];
-            }   
-            else{
+            } else{
                 return $this;
             }         
-        }
-        else{
+        } else{
             return $this;
         }
         
@@ -295,8 +290,7 @@ 
         $isSubGroup = false;
         if(isset($groupField['fields'][$fieldName])){
             $field = $groupField['fields'][$fieldName];
-        }
-        else{
+        } else{
             return null;
         }
         
@@ -321,11 +315,9 @@ 
 
         if(strpos($fieldName, '_subSection') !== false){
             $field = $availableFields['_subSection'];
-        }
-        elseif(strpos($fieldName, '_fieldsGroup') !== false){
+        } elseif(strpos($fieldName, '_fieldsGroup') !== false){
             $field = $availableFields['_fieldsGroup'];
-        }
-        else{
+        } else{
             $field = $availableFields[$fieldName];
         }
 
@@ -425,8 +417,7 @@ 
 
         if($nbEntryInSubGroup == 1 && !isset($fields[$fieldGroupName])){
             throw new AppException($App->translate('This fields group does not seem to exist'));
-        }
-        elseif($nbEntryInSubGroup == 3){
+        } elseif($nbEntryInSubGroup == 3){
             $inSubGroup = true;
             $currentFieldToCheck = $fields;
             foreach($subGroups as $subGroup){
@@ -682,8 +673,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -910,8 +900,7 @@ 
                     
                     if($selectedManyField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -939,8 +928,7 @@ 
                     
                     if($selectedOneField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -949,15 +937,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof ORMBoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             
@@ -1088,7 +1074,7 @@ 
                 if(!isset($availableFields[$fieldName])){
                     $field = array();
                     $fieldDescription = "";
-                }else{
+                } else{
                     $field = $availableFields[$fieldName];
                     $fieldDescription = $field['description'];
                 }
@@ -1484,12 +1470,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/AppCtrlRecord.php

Spacing +103 added lines, -103 removed lines

@@ -103,7 +103,7 @@ 
 
 
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -151,9 +151,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 WidgetDisplayableInterface) {
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+            $html = '<li>'.$actions->display($canvas).'</li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -165,7 +165,7 @@ 
             }
             if (isset($actions['icon'])) {
 
-                $html = '<li class="dropdown">' . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' . ($actions['icon'] === 'actions-context-menu'/*FuncIcons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>') . '</a>' . '<ul class="dropdown-menu dropdown-menu-right ' . FuncIcons::ICON_LEFT_SYMBOLIC . '">' . $html . '</ul>';
+                $html = '<li class="dropdown">'.'<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'.($actions['icon'] === 'actions-context-menu'/*FuncIcons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>').'</a>'.'<ul class="dropdown-menu dropdown-menu-right '.FuncIcons::ICON_LEFT_SYMBOLIC.'">'.$html.'</ul>';
             }
         }
 
@@ -213,7 +213,7 @@ 
 
         foreach ($methods as $index => $method) {
             try {
-                $methodName = $recordClassname . $method['method'];
+                $methodName = $recordClassname.$method['method'];
                 if ($Ui->$methodName()) {
                     $types[$index] = array(
                         'classname' => $methodName,
@@ -299,11 +299,11 @@ 
 
         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()) {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -331,12 +331,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);
@@ -365,8 +365,8 @@ 
      */
     public function getModelViewDefaultId($itemId = null)
     {
-        if (! isset($itemId)) {
-            $itemId = $this->getClass() . '_modelView';
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_modelView';
         }
 
         return $itemId;
@@ -394,7 +394,7 @@ 
 
         $itemId = $this->getModelViewDefaultId($itemId);
 
-        if (! isset($type)) {
+        if (!isset($type)) {
             $type = $this->getFilteredViewType($itemId);
         }
 
@@ -402,24 +402,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;
         }
         /* @var $tableview WidgetTableModelView */
@@ -475,11 +475,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);
@@ -532,7 +532,7 @@ 
 
             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'])
@@ -565,8 +565,8 @@ 
         $W = bab_Widgets();
 
         $filterVisibility = $this->getFilterVisibility($itemId);
-        $filterVisibility = ! $filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $filterVisibility = !$filterVisibility;
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -578,10 +578,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;
     }
@@ -596,8 +596,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;
@@ -614,7 +614,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -699,13 +699,13 @@ 
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
 
         if (isset($data['pageLength'])) {
-            $W->setUserConfiguration($tableModelViewId . '/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
+            $W->setUserConfiguration($tableModelViewId.'/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
         }
         if (isset($data['displaySubTotalRow'])) {
-            $W->setUserConfiguration($tableModelViewId . '/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
+            $W->setUserConfiguration($tableModelViewId.'/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
         }
         if (isset($data['columns'])) {
-            $W->setUserConfiguration($tableModelViewId . '/columns', $data['columns'], 'widgets', $sessionOnly);
+            $W->setUserConfiguration($tableModelViewId.'/columns', $data['columns'], 'widgets', $sessionOnly);
         }
 
         $this->addReloadSelector("#{$tableModelViewId}");
@@ -720,7 +720,7 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
 
-        $W->deleteUserConfiguration($data['tableModelViewId'] . '/columns', 'widgets', $sessionOnly);
+        $W->deleteUserConfiguration($data['tableModelViewId'].'/columns', 'widgets', $sessionOnly);
 
         $this->addReloadSelector("#{$tableModelViewId}");
         return true;
@@ -822,7 +822,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $column = isset($columns[$col]) ? $columns[$col] : null;
 
-        if (! isset($column)) {
+        if (!isset($column)) {
             return true;
         }
 
@@ -839,7 +839,7 @@ 
         $labelledWidget->getLabelWidget()->addClass($label->getClasses());
         $labelledWidget->getInputWidget()->addClass($widget->getClasses());
 
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
         if (isset($filter[$col])) {
             $widget->setValue($filter[$col]);
         }
@@ -856,7 +856,7 @@ 
 
         $key = $data['key'];
 
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
         if (isset($data['moreCriteria']) && $data['moreCriteria']) {
             $filter = array();
         }
@@ -868,7 +868,7 @@ 
                 $filter[$filterName] = $filterValue;
             }
         }
-        $W->setUserConfiguration($key . '/filter', $filter, 'widgets', false);
+        $W->setUserConfiguration($key.'/filter', $filter, 'widgets', false);
 
 
         if (session_status() == PHP_SESSION_NONE) {
@@ -878,7 +878,7 @@ 
         unset($_SESSION['modelViewMoreCriterias'][$key]);
         session_write_close();
 
-        $this->addReloadSelector('.depends-' . $key . ':not(.widget-tableview-clone)');
+        $this->addReloadSelector('.depends-'.$key.':not(.widget-tableview-clone)');
 
         return true;
     }
@@ -889,7 +889,7 @@ 
         $Ui = $App->Ui();
 
         $page = $Ui->Page();
-        $page->addClass('depends-modelViewMoreCriterias-' . $key);
+        $page->addClass('depends-modelViewMoreCriterias-'.$key);
 
         $page->setTitle($App->translate('Search'));
 
@@ -909,7 +909,7 @@ 
         $editor = $Ui->BasicEditor($itemId, $W->VBoxLayout());
         $editor->setReloadAction($this->proxy()
             ->getDisplayListMoreCriteriaEditor($key, $editor->getId()));
-        $editor->addClass('depends-modelViewMoreCriterias-' . $key);
+        $editor->addClass('depends-modelViewMoreCriterias-'.$key);
         $editor->addClass('widget-no-close');
         $editor->setIconFormat();
         $editor->isAjax = true;
@@ -924,7 +924,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $filter = $tableview->getFilterValues();
 
-        if (! isset($itemId)) {
+        if (!isset($itemId)) {
             $editor->setSaveAction($this->proxy()
                 ->saveDisplayListFilter(), $App->translate('Search'));
             $editor->setCancelAction($this->proxy()
@@ -935,13 +935,13 @@ 
                 if (empty($value)) {
                     continue;
                 }
-                if (! isset($columns[$fieldName])) {
+                if (!isset($columns[$fieldName])) {
                     continue;
                 }
 
                 $column = $columns[$fieldName];
 
-                if (! $column->isSearchable()) {
+                if (!$column->isSearchable()) {
                     continue;
                 }
 
@@ -962,12 +962,12 @@ 
         $nbAlreadyAdded = 0;
 
         foreach ($fields as $fieldName => $fieldValue) {
-            if (! isset($columns[$fieldName])) {
+            if (!isset($columns[$fieldName])) {
                 continue;
             }
             $column = $columns[$fieldName];
 
-            if (! $column->isSearchable()) {
+            if (!$column->isSearchable()) {
                 continue;
             }
 
@@ -978,7 +978,7 @@ 
                 $alreadyFilteredBox = null;
             }
 
-            if (! isset($alreadyFilteredBox)) {
+            if (!isset($alreadyFilteredBox)) {
                 $editor->addItem($alreadyFilteredBox = $W->FlexItems()
                     ->setSizePolicy('customsection-field-box customsection-fieldsgroup-box'));
             }
@@ -1011,7 +1011,7 @@ 
         );
 
         foreach ($columns as $fieldName => $column) {
-            if (! $column->isSearchable()) {
+            if (!$column->isSearchable()) {
                 continue;
             }
 
@@ -1048,12 +1048,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;
@@ -1069,7 +1069,7 @@ 
             }
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         }
-        $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+        $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         return true;
     }
 
@@ -1125,17 +1125,17 @@ 
 
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
                 break;
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
                 break;
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
                 break;
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, BabCharset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, BabCharset::getIso());
                 break;
         }
     }
@@ -1201,7 +1201,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'));
         }
 
@@ -1209,7 +1209,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname = $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
 
         $fullFrame = $Ui->$viewClassname($record);
         $fullFrame->setView($view);
@@ -1224,7 +1224,7 @@ 
         if (isset($itemId)) {
             $page->setId($itemId);
         }
-        $page->addClass('depends-' . $this->getRecordClassName());
+        $page->addClass('depends-'.$this->getRecordClassName());
 
         $page->addToolbar($mainMenu);
 
@@ -1265,11 +1265,11 @@ 
 
         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()) {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1306,12 +1306,12 @@ 
 
         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()) {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1356,7 +1356,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;
     }
 
@@ -1387,14 +1387,14 @@ 
      *
      * @param AppRecord $record
      */
-    protected function preSave(ORMRecord &$record, $data) {}
+    protected function preSave(ORMRecord & $record, $data) {}
 
     /**
      * Method for post save actions on record
      *
      * @param AppRecord $record
      */
-    protected function postSave(ORMRecord &$record, $data) {}
+    protected function postSave(ORMRecord & $record, $data) {}
 
     public function saveDraft($data = null)
     {
@@ -1426,12 +1426,12 @@ 
         $pk = $recordSet->getPrimaryKey();
         $message = null;
 
-        if (! empty($data[$pk])) {
+        if (!empty($data[$pk])) {
             $record = $recordSet->request($data[$pk]);
             $record->deleted = AppTraceableRecord::DELETED_STATUS_EXISTING;
             unset($data[$pk]);
 
-            if (! $record->isUpdatable()) {
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException('Access denied');
             }
 
@@ -1440,18 +1440,18 @@ 
 
             $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'));
         }
 
@@ -1464,7 +1464,7 @@ 
                 $this->addToast($message);
             }
 
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
 
@@ -1487,7 +1487,7 @@ 
 
         $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);
@@ -1496,7 +1496,7 @@ 
             $this->addToast($deletedMessage);
         }
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1520,7 +1520,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;
@@ -1533,7 +1533,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));
@@ -1572,7 +1572,7 @@ 
 
         $record = $recordSet->request($id);
 
-        if (! $record->isRemovable()) {
+        if (!$record->isRemovable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
 
@@ -1585,7 +1585,7 @@ 
             }
         }
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1613,7 +1613,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));
@@ -1655,10 +1655,10 @@ 
         $record = null;
         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');
         }
 
@@ -1669,7 +1669,7 @@ 
         $record->save();
         $this->addToast($deletedMessage);
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1691,7 +1691,7 @@ 
         $record = null;
         foreach ($records as $record) {
         }
-        if (! isset($record)) {
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
 
@@ -1704,7 +1704,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);
@@ -1814,14 +1814,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;
@@ -1840,15 +1840,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');
@@ -1864,7 +1864,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id . '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
 
         return $filter;
     }
@@ -1877,7 +1877,7 @@ 
         if (isset($name)) {
             $W = bab_Widgets();
             // @TODO : fix missing parameters 
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
             $filterValues = $filter['values'];
         } else {
             $filterValues = null;
@@ -1914,7 +1914,7 @@ 
             'values' => $filterValues
         );
 
-        $W->setUserConfiguration($tableview->getId() . '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
 
         return true;
     }
@@ -1931,7 +1931,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();
 
@@ -1974,7 +1974,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();
 
@@ -2022,7 +2022,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')
@@ -2061,7 +2061,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();
 
@@ -2093,7 +2093,7 @@ 
         $this->requireDeleteMethod();
 
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
 
         return true;
     }
@@ -2103,7 +2103,7 @@ 
         $modelView = $this->modelView();
         $modelView->setHighlightedRows($ids);
 
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
 
         return true;
     }
@@ -2113,7 +2113,7 @@ 
         $modelView = $this->modelView();
         $modelView->clearHighlightedRows();
 
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
 
         return true;
     }
@@ -2133,7 +2133,7 @@ 
         $W = bab_Widgets();
         $inSession = false;
         // $inSession = true;
-        $highlightedRows = $W->getUserConfiguration($modelViewId . '/highlightedRows', 'widgets', $inSession);
+        $highlightedRows = $W->getUserConfiguration($modelViewId.'/highlightedRows', 'widgets', $inSession);
 
 
         $recordSet = $this->getRecordSet();
@@ -2154,7 +2154,7 @@ 
         // else{
         $Ui = $App->Ui();
         $recordClassname = $this->getRecordClassName();
-        $viewClassname = $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
         // }
 
         if ($records->count() > 0) {
@@ -2162,7 +2162,7 @@ 
                 ->clearHighlightedRecords())
                 ->setAjaxAction(null, false)
                 ->addClass('icon', FuncIcons::ACTIONS_ARROW_RIGHT_DOUBLE, "app_closeHighlightButton")
-                ->setSizePolicy(FuncIcons::ICON_LEFT_32 . ' pull-right'));
+                ->setSizePolicy(FuncIcons::ICON_LEFT_32.' pull-right'));
 
             foreach ($records as $record) {
 
@@ -2181,7 +2181,7 @@ 
             $box->addClass('box', 'shadow');
         }
 
-        $box->addClass('depends-' . $modelViewId . '-HighlightedRecords');
+        $box->addClass('depends-'.$modelViewId.'-HighlightedRecords');
         $box->setReloadAction($this->proxy()
             ->previewHighlightedRecords($view));
         return $box;

programs/Ctrl/AppCtrlConfiguration.php

Spacing +12 added lines, -12 removed lines

@@ -48,10 +48,10 @@ 
     public function __construct(FuncApp $app = null)
     {
         parent::__construct($app);
-        if(!$this->isAdmin()){
+        if (!$this->isAdmin()) {
             $action = WidgetAction::fromRequest();
             list (, $method) = explode('.', $action->getMethod());
-            if($method !== 'accessDenied'){
+            if ($method !== 'accessDenied') {
                 /**
                  * @var WidgetAction
                  */
@@ -114,7 +114,7 @@ 
         $box->addClass('reload-configuration-page');
         $box->addClass('widget-100pc');
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $this->resetCurrentTab();
         }
         
@@ -124,16 +124,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;
         }
         
@@ -162,19 +162,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);
             }
         }
@@ -199,9 +199,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/AppController.php

Spacing +47 added lines, -47 removed lines

@@ -64,7 +64,7 @@ 
 use function Cofy\Utilities\User\bab_isUserAdministrator;
 use function Cofy\Utilities\User\bab_isUserLogged;
 
-require_once dirname(__FILE__) . '/../functions.php';
+require_once dirname(__FILE__).'/../functions.php';
 
 /**
  * @method self proxy()
@@ -239,7 +239,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;
@@ -257,7 +257,7 @@ 
             $authType = '';
         }
 
-        if (! isset($message)) {
+        if (!isset($message)) {
             $message = $this->App()->translate('You must be logged in to access this page.');
         }
 
@@ -281,10 +281,10 @@ 
         list($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
         /** @var FuncApp */
-        $App = BabFunctionality::get('App/' . $functionalityName);
+        $App = BabFunctionality::get('App/'.$functionalityName);
 
         if (!$App) {
-            throw new AppException('Faild to autodetect functionality App/' . $functionalityName . ', the getInstance method is deprecated, use $App->ControllerProxy() instead');
+            throw new AppException('Faild to autodetect functionality App/'.$functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
         }
 
         $controller = $App->ControllerProxy($classname, $proxy);
@@ -302,14 +302,14 @@ 
     static function getProxyInstance(BabFunctionality $App = null, $classname)
     {
         $class = new \ReflectionClass($classname);
-        $proxyClassname = $class->getShortName() . self::PROXY_CLASS_SUFFIX;
-        $finalProxyClassname = $class->getNamespaceName() . "\\" . $proxyClassname;
-        if (! class_exists($finalProxyClassname)) {
+        $proxyClassname = $class->getShortName().self::PROXY_CLASS_SUFFIX;
+        $finalProxyClassname = $class->getNamespaceName()."\\".$proxyClassname;
+        if (!class_exists($finalProxyClassname)) {
             $classStr = "";
             if ($class->getNamespaceName() != "") {
-                $classStr .= " namespace " . $class->getNamespaceName() . "; ";
+                $classStr .= " namespace ".$class->getNamespaceName()."; ";
             }
-            $classStr .= 'class ' . $proxyClassname . ' extends ' . $class->getShortName() . ' {' . "\n";
+            $classStr .= 'class '.$proxyClassname.' extends '.$class->getShortName().' {'."\n";
             $methods = $class->getMethods();
 
             $classStr .= '	public function __construct($App) {
@@ -317,11 +317,11 @@ 
             }' . "\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') {
+                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.'(';
                 $types = array();
                 if ($type = $method->getReturnType()) {
                     if ($type instanceof ReflectionUnionType) {
@@ -341,22 +341,22 @@ 
                         $reference = "&";
                     }
                     if ($parameter->isDefaultValueAvailable()) {
-                        $parametersStr[] = $reference . '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                        $parametersStr[] = $reference.'$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     } else {
-                        $parametersStr[] = $reference . '$' . $parameter->name;
+                        $parametersStr[] = $reference.'$'.$parameter->name;
                     }
                 }
                 $classStr .= implode(', ', $parametersStr);
                 $classStr .= ')';
                 if (count($types) != 0) {
-                    $classStr .= ':' . implode('|', $types);
+                    $classStr .= ':'.implode('|', $types);
                 }
-                $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);
         }
@@ -431,8 +431,8 @@ 
 
         $rc = new \ReflectionClass($fullClassName);
 
-        if (! $rc->hasMethod($methodName)) {
-            throw new BabInvalidActionException($fullClassName . '::' . $methodName);
+        if (!$rc->hasMethod($methodName)) {
+            throw new BabInvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new \ReflectionMethod($fullClassName, $methodName);
 
@@ -455,7 +455,7 @@ 
 
         $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) {
@@ -495,7 +495,7 @@ 
 
         list(,, $file) = explode('/', $App->controllerTg);
 
-        $action->setParameter('addon', $App->getAddonName() . '.' . $file);
+        $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
 
         return $action;
@@ -513,13 +513,13 @@ 
 
         $method = $action->getMethod();
         $returnedValue = null;
-        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) {
@@ -531,9 +531,9 @@ 
             }
         }
 
-        if (! isset($component)) {
+        if (!isset($component)) {
             $objectController = $this->{$objectName}(false);
-            if (! ($objectController instanceof AppController)) {
+            if (!($objectController instanceof AppController)) {
                 return false;
             }
         }
@@ -542,12 +542,12 @@ 
             $returnedValue = $objectController->execAction($action);
         } catch (AppAccessException $e) {
 
-            if (! bab_isUserLogged() && $e->requireCredential) {
+            if (!bab_isUserLogged() && $e->requireCredential) {
                 bab_requireCredential($e->getMessage());
             } 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',
@@ -560,7 +560,7 @@ 
         } catch (AppSaveException $e) {
 
             if ($this->isAjaxRequest()) {
-                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');
                 header('Content-type: application/json');
@@ -585,7 +585,7 @@ 
 
         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();
@@ -611,7 +611,7 @@ 
                         if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         } else {
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -677,7 +677,7 @@ 
     protected function deletedItemPage(WidgetAction $action, AppDeletedRecordException $e)
     {
         if ($this->isAjaxRequest()) {
-            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');
             header('Content-type: application/json');
@@ -690,7 +690,7 @@ 
                 )
             ));
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
 
         $App = app_App();
         $W = bab_Widgets();
@@ -722,7 +722,7 @@ 
     protected function notFoundPage(WidgetAction $action, AppNotFoundException $e)
     {
         if ($this->isAjaxRequest()) {
-            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle() . ' (' . $e->getId() . ')');
+            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle().' ('.$e->getId().')');
             $json = array(
                 'messages' => array(
                     array(
@@ -734,7 +734,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');
 
@@ -764,7 +764,7 @@ 
     protected function unexpectedErrorPage(\Exception $e)
     {
         if ($this->isAjaxRequest()) {
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -776,7 +776,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');
 
@@ -800,11 +800,11 @@ 
             ->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)));
 
@@ -827,7 +827,7 @@ 
     protected function errorPage(\Exception $e)
     {
         if ($this->isAjaxRequest()) {
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -839,7 +839,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');
 
@@ -863,11 +863,11 @@ 
             ->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)));
 
@@ -902,7 +902,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');
 
@@ -986,7 +986,7 @@ 
             'position' => $position
         );
         $babBody = bab_getBody();
-        if (! isset($babBody->messages['toasts'])) {
+        if (!isset($babBody->messages['toasts'])) {
             $babBody->messages['toasts'] = array();
         }
         $babBody->messages['toasts'][] = $toast;

programs/init.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
 use function Cofy\Utilities\bab_GetDatabaseInstance;
 use function Cofy\Utilities\User\bab_isUserLogged;
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)
@@ -95,12 +95,12 @@ 
     
     $babBody = bab_getBody();
     $addon = bab_getAddonInfosInstance('libapp');
-    $babBody->addStyleSheet($addon->getStylePath() . '/libapp.min.css');
-    $babBody->addJavascriptFile($addon->getTemplatePath() . 'libapp.js');
+    $babBody->addStyleSheet($addon->getStylePath().'/libapp.min.css');
+    $babBody->addJavascriptFile($addon->getTemplatePath().'libapp.js');
     $App = app_App();
-    if($App && $App->isSSEEnabled()){
-        $babBody->addJavascriptFile($addon->getTemplatePath() . 'notification.js');
-        if(bab_isUserLogged()){
+    if ($App && $App->isSSEEnabled()) {
+        $babBody->addJavascriptFile($addon->getTemplatePath().'notification.js');
+        if (bab_isUserLogged()) {
             $babBody->babecho('<script>window.libapp={"sseServerUrl": "'.$App->Controller()->SSE()->server()->url().'"}</script>');
             $babBody->addJavascriptFile($addon->getTemplatePath().'sse.js');
         }
@@ -122,7 +122,7 @@ 
     @BabFunctionality::includefile('Portletbackend');
     if (class_exists('FuncPortletbackend')) {
         $addon = bab_getAddonInfosInstance('libapp');
-        $path = APP_PORTLET_PATH. '/FuncPortletbackendApp.php';
+        $path = APP_PORTLET_PATH.'/FuncPortletbackendApp.php';
         require_once $path;
         $functionalities = new BabFunctionalities();
         $functionalities->register('Portletbackend/App',);

programs/define.php

Spacing +6 added lines, -6 removed lines

@@ -26,10 +26,10 @@
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)

  * @copyright Copyright (c) 2023 by SI-4YOU ({@link https://www.siforyou.com})

  */

-define('APP_PHP_PATH', dirname(__FILE__) . '/');

-define('APP_SET_PATH', dirname(__FILE__) . '/');

-define('APP_UI_PATH', dirname(__FILE__) . '/ui/');

-define('APP_WIDGETS_PATH', APP_UI_PATH . 'widgets/');

-define('APP_CTRL_PATH', dirname(__FILE__) . '/');

-define('APP_PORTLET_PATH', APP_PHP_PATH . 'Portlet/');

+define('APP_PHP_PATH', dirname(__FILE__).'/');

+define('APP_SET_PATH', dirname(__FILE__).'/');

+define('APP_UI_PATH', dirname(__FILE__).'/ui/');

+define('APP_WIDGETS_PATH', APP_UI_PATH.'widgets/');

+define('APP_CTRL_PATH', dirname(__FILE__).'/');

+define('APP_PORTLET_PATH', APP_PHP_PATH.'Portlet/');

 define('APP_SSE_DEFAULT_REFRESH_FREQUENCY', 5);

programs/Set/AppLinkSet.php

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         if (!$this->sourceId instanceof $sourceClass) {
-            $this->hasOne('sourceId', $sourceClass . 'Set');
+            $this->hasOne('sourceId', $sourceClass.'Set');
             $this->join('sourceId');
         }
     }
@@ -141,7 +141,7 @@ 
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         if (!$this->targetId instanceof $targetClass) {
-            $this->hasOne('targetId', $targetClass . 'Set');
+            $this->hasOne('targetId', $targetClass.'Set');
             $this->join('targetId');
         }
     }
@@ -343,7 +343,7 @@ 
         if ($deleteTarget) {
             foreach ($set->select($criteria) as $link) {
 
-                $className = $link->targetClass . 'Set';
+                $className = $link->targetClass.'Set';
 
                 // remove prefix
 

programs/Set/AppSSESet.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
         }

 

         if (!empty($reloadSelectors)) {

-            $sseData .= '"reloadSelector":' . bab_json_encode($reloadSelectors);

+            $sseData .= '"reloadSelector":'.bab_json_encode($reloadSelectors);

             $hasData = true;

         }

 

@@ -129,7 +129,7 @@ 
             if ($hasData) {

                 $sseData .= ', ';

             }

-            $sseData .= '"browserNotifications":' . bab_json_encode($browserNotifications);

+            $sseData .= '"browserNotifications":'.bab_json_encode($browserNotifications);

             $hasData = true;

         }