capwelton / libapp

programs/functions.php

Spacing +12 added lines, -12 removed lines

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

Braces +2 added lines, -2 removed lines

@@ -280,7 +280,7 @@ 
         foreach($input as $k=>$v){
             $return[utf8_decode($k)] = app_utf8Decode($v);
         }
-    }else{
+    } else{
         return utf8_decode($input);
     }
     return $return;
@@ -292,7 +292,7 @@ 
         foreach($input as $k=>$v){
             $return[app_utf8Encode($k)] = app_utf8Encode($v);
         }
-    }else{
+    } else{
         return utf8_encode($input);
     }
     return $return;

programs/init.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 use Capwelton\LibOrm\MySql\ORMMySqlBackend;
 
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)
@@ -34,7 +34,7 @@ 
     
     $addon->unregisterFunctionality('App');
     $functionnalities = new bab_functionalities();
-    $functionnalities->registerNamespace('App',"Capwelton\LibApp\Func_App",$addon->getPhpPath().'Func_App.php');
+    $functionnalities->registerNamespace('App', "Capwelton\LibApp\Func_App", $addon->getPhpPath().'Func_App.php');
 
     $addon->addEventListener('bab_eventBeforePageCreated', 'libapp_onBeforePageCreated', 'init.php', -10);
     $App = app_App();
@@ -81,13 +81,13 @@ 
     
     $babBody = bab_getBody();
     $addon = bab_getAddonInfosInstance('libapp');
-    $babBody->addStyleSheet($addon->getStylePath() . '/styles.css');
-    $babBody->addJavascriptFile($addon->getTemplatePath() . 'libapp.js');
+    $babBody->addStyleSheet($addon->getStylePath().'/styles.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');
         }
@@ -113,8 +113,8 @@ 
         $addonPhpPath = $addon->getPhpPath();
         
         require_once $GLOBALS['babInstallPath'].'utilit/functionalityincl.php';
-        require_once dirname(__FILE__) . '/Portlet/Func_PortletBackend_App.php';
+        require_once dirname(__FILE__).'/Portlet/Func_PortletBackend_App.php';
         $functionalities = new bab_functionalities();
-        $functionalities->registerClass('Func_PortletBackend_App', $addonPhpPath . '/Portlet/Func_PortletBackend_App.php');
+        $functionalities->registerClass('Func_PortletBackend_App', $addonPhpPath.'/Portlet/Func_PortletBackend_App.php');
     }
 }
\ No newline at end of file

programs/Set/AppCustomSection.php

Spacing +45 added lines, -45 removed lines

@@ -68,7 +68,7 @@ 
         $App = app_App();
         static $fieldsLayouts = null;
         
-        if(! isset($fieldsLayouts)){
+        if (!isset($fieldsLayouts)) {
             $fieldsLayouts = array(
                 self::FIELDS_LAYOUT_VERTICAL_LABEL => $App->translate('Vertical label'),
                 self::FIELDS_LAYOUT_HORIZONTAL_LABEL => $App->translate('Horizontal label'),
@@ -85,7 +85,7 @@ 
      */
     public function getRawFields()
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return array();
         }
         return explode(',', $this->fields);
@@ -110,13 +110,13 @@ 
      */
     public function getFields()
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return array();
         }
         $fields = json_decode($this->fields, true);
         
-        if(json_last_error() === JSON_ERROR_NONE){
-            if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (json_last_error() === JSON_ERROR_NONE) {
+            if (bab_charset::getIso() != bab_charset::UTF_8) {
                 $fields = app_utf8Decode($fields);
             }
             return $fields;
@@ -124,19 +124,19 @@ 
         
         $fields = array();
         $rawFields = $this->getRawFields();
-        foreach ($rawFields as $rawField){
-            if(empty($rawField)){
+        foreach ($rawFields as $rawField) {
+            if (empty($rawField)) {
                 continue;
             }
             $params = array();
             
-            if(strpos($rawField, ':') === false){
+            if (strpos($rawField, ':') === false) {
                 $fieldName = $rawField;
             }
-            else{
+            else {
                 list ($fieldName, $parameters) = explode(':', $rawField);
                 $parameters = explode(';', $parameters);
-                foreach ($parameters as $parameter){
+                foreach ($parameters as $parameter) {
                     list ($key, $value) = explode('=', $parameter);
                     $params[$key] = $value;
                 }
@@ -169,7 +169,7 @@ 
      */
     public function getField($searchedFieldName)
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return null;
         }
         
@@ -186,7 +186,7 @@ 
     public function addField($fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$fieldName] = array(
                 'block' => ''
             );
@@ -194,7 +194,7 @@ 
         }
         $fields[$fieldName]['fieldname'] = $fieldName;
         $fields[$fieldName]['parameters'] = $parameters;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -208,7 +208,7 @@ 
     {
         $fields = $this->getFields();
         unset($fields[$removedFieldName]);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -226,24 +226,24 @@ 
     {
         $isFieldsGroup = false;
         $fields = $this->getFields();
-        if(strpos($updatedFieldName, '_fieldsGroup') !== false){
+        if (strpos($updatedFieldName, '_fieldsGroup') !== false) {
             $isFieldsGroup = true;
             list (, $groupPos) = explode('_fieldsGroup', $updatedFieldName);
-            if(! isset($groupPos) || empty($groupPos)){
+            if (!isset($groupPos) || empty($groupPos)) {
                 $groupPos = 0;
             }
         }
-        if(! isset($fields[$updatedFieldName])){
-            if($isFieldsGroup){
-                while (isset($fields[$updatedFieldName . $groupPos])){
-                    $groupPos ++;
+        if (!isset($fields[$updatedFieldName])) {
+            if ($isFieldsGroup) {
+                while (isset($fields[$updatedFieldName.$groupPos])) {
+                    $groupPos++;
                 }
                 $updatedFieldName .= $groupPos;
             }
             $this->addField($updatedFieldName, $parameters);
             return $this;
         }
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$updatedFieldName] = array(
                 'block' => ''
             );
@@ -251,7 +251,7 @@ 
         }
         $fields[$updatedFieldName]['fieldname'] = $updatedFieldName;
         $fields[$updatedFieldName]['parameters'] = $parameters;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -261,11 +261,11 @@ 
     public function addFieldToGroup($fieldGroupName, $fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(! isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             return $this;
         }
         $groupFields = isset($fields[$fieldGroupName]['fields']) ? $fields[$fieldGroupName]['fields'] : array();
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $groupFields[$fieldName] = array(
                 'block' => ''
             );
@@ -274,7 +274,7 @@ 
         $groupFields[$fieldName]['fieldname'] = $fieldName;
         $groupFields[$fieldName]['parameters'] = $parameters;
         $fields[$fieldGroupName]['fields'] = $groupFields;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -288,7 +288,7 @@ 
     {
         $fields = $this->getFields();
         unset($fields[$fieldGroupName]['fields'][$removedFieldName]);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -305,15 +305,15 @@ 
     public function updateFieldGroup($fieldGroupName, $updatedFieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(! isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             return $this;
         }
         $groupFields = isset($fields[$fieldGroupName]['fields']) ? $fields[$fieldGroupName]['fields'] : array();
-        if(! isset($groupFields[$updatedFieldName])){
+        if (!isset($groupFields[$updatedFieldName])) {
             $this->addFieldToGroup($fieldGroupName, $updatedFieldName, $parameters);
             return $this;
         }
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $groupFields[$updatedFieldName] = array(
                 'block' => ''
             );
@@ -323,7 +323,7 @@ 
         $groupFields[$updatedFieldName]['fieldname'] = $updatedFieldName;
         $groupFields[$updatedFieldName]['parameters'] = $parameters;
         $fields[$fieldGroupName]['fields'] = $groupFields;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -337,46 +337,46 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
         $App = \bab_functionality::get('App');
         $recordSet = $record->getParentSet();
         $arrCriteria = json_decode($this->visibilityCriteria, true);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $arrCriteria = app_utf8Decode($arrCriteria);
         }
-        foreach ($arrCriteria as $fieldName => $condition){
-            if(strpos($fieldName, '/') !== false){
+        foreach ($arrCriteria as $fieldName => $condition) {
+            if (strpos($fieldName, '/') !== false) {
                 list ($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
             }
-            else{
+            else {
                 $field = $recordSet->$fieldName;
             }
-            foreach ($condition as $op => $value){
-                if(! is_array($value)){
+            foreach ($condition as $op => $value) {
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
-                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName) . 'Set';
+                else {
+                    foreach ($value as $foreignClassName => $foreignValues) {
+                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
                         $foreignField = '';
                         $foreignCondition = '';
-                        foreach ($foreignValues as $foreignFieldName => $foreignConditions){
-                            if($foreignFieldName === '_foreignField'){
+                        foreach ($foreignValues as $foreignFieldName => $foreignConditions) {
+                            if ($foreignFieldName === '_foreignField') {
                                 $foreignField = $foreignConditions;
                             }
-                            else{
-                                foreach ($foreignConditions as $key => $val){
+                            else {
+                                foreach ($foreignConditions as $key => $val) {
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }
                             }
                         }
                     }
-                    if(method_exists($foreignSet, 'getDefaultCriteria')){
+                    if (method_exists($foreignSet, 'getDefaultCriteria')) {
                         $foreignCondition = $foreignCondition->_AND_($foreignSet->getDefaultCriteria());
                     }
                     $criteria = $field->in($foreignCondition, $foreignField);

programs/Set/AppRecordSet.php

Spacing +59 added lines, -59 removed lines

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

Braces +10 added lines, -19 removed lines

@@ -180,8 +180,7 @@ 
                         
                         /*@var $customfield AppCustomField */
                     }
-                }
-                catch (ORMBackEndSelectException $e){
+                } catch (ORMBackEndSelectException $e){
                     // table does not exist, this error is thrown by the install program while creating the sets
                 }
             }
@@ -218,8 +217,7 @@ 
             if($ormField instanceof ORMFkField){
                 $this->hasOne($customField->fieldname, $ormField->getForeignSetName())
                     ->setDescription($description);
-            }
-            else{
+            } else{
                 $this->addFields($ormField);
             }
         }
@@ -282,8 +280,7 @@ 
         
         if(is_array($source) || ($source instanceof \Iterator)){
             return $linkSet->selectForSources($source, $targetClass, $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForSource($source, $targetClass, $linkType);
         }
     }
@@ -309,8 +306,7 @@ 
         
         if(is_array($target) || ($target instanceof \Iterator)){
             return $linkSet->selectForTargets($target, $sourceClass, $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForTarget($target, $sourceClass, $linkType);
         }
     }
@@ -345,8 +341,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -389,8 +384,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -443,8 +437,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -497,8 +490,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -615,8 +607,7 @@ 
         
         if(is_array($tagLabels)){
             $criteria = $criteria->_AND_($linkSet->targetId->label->in($tagLabels));
-        }
-        else{
+        } else{
             $criteria = $criteria->_AND_($linkSet->targetId->label->is($tagLabels));
         }
         if(isset($linkType)){
@@ -652,7 +643,7 @@ 
     public function getDisplayNameField(){
         if($this->fieldExist("name")){
             return $this->name;
-        }else{
+        } else{
             return $this->id;
         }
     }

programs/Set/AppTraceableRecordSet.php

Spacing +21 added lines, -21 removed lines

@@ -133,7 +133,7 @@ 
      */
     protected function logSave(AppTraceableRecord $record, $noTrace)
     {
-        if(! $this->isLoggable()){
+        if (!$this->isLoggable()) {
             return;
         }
         $App = $this->App();
@@ -156,14 +156,14 @@ 
      */
     protected function logDelete(ORMCriteria $criteria, $noTrace)
     {
-        if(! $this->isLoggable()){
+        if (!$this->isLoggable()) {
             return;
         }
         $App = $this->App();
         $userId = bab_getUserId();
         $logSet = $App->LogSet();
         $deletedRecords = $this->select($criteria);
-        foreach ($deletedRecords as $record){
+        foreach ($deletedRecords as $record) {
             $log = $logSet->newRecord();
             $log->noTrace = $noTrace;
             $log->objectClass = get_class($record);
@@ -189,7 +189,7 @@ 
      */
     public function select(ORMCriteria $criteria = null, $includeDeleted = false)
     {
-        if($includeDeleted){
+        if ($includeDeleted) {
             $this->setDefaultCriteria(null);
         }
         return parent::select($criteria);
@@ -232,25 +232,25 @@ 
      */
     public function delete(ORMCriteria $criteria = null, $deletedStatus = AppTraceableRecord::DELETED_STATUS_DELETED)
     {
-        $definitive = ($deletedStatus === true) || ! $this->isTraceable();
+        $definitive = ($deletedStatus === true) || !$this->isTraceable();
         $this->logDelete($criteria, $definitive);
-        if($definitive){
+        if ($definitive) {
             return parent::delete($criteria);
         }
         
-        require_once $GLOBALS['babInstallPath'] . '/utilit/dateTime.php';
+        require_once $GLOBALS['babInstallPath'].'/utilit/dateTime.php';
         $now = \BAB_DateTime::now()->getIsoDateTime();
         
         $records = $this->select($criteria);
         
-        foreach ($records as $record){
+        foreach ($records as $record) {
             /* @var $record AppTraceableRecord */
             // Could be optimized at ORM level
             $record->deleted = $deletedStatus;
             $record->deletedOn = $now;
             $record->deletedBy = bab_getUserId();
             
-            if(! parent::save($record)){
+            if (!parent::save($record)) {
                 return false;
             }
         }
@@ -268,13 +268,13 @@ 
      */
     public function save(ORMRecord $record, $noTrace = false)
     {
-        $noTrace = $noTrace || ! $this->isTraceable();
+        $noTrace = $noTrace || !$this->isTraceable();
         $this->logSave($record, $noTrace);
-        if($noTrace){
+        if ($noTrace) {
             return parent::save($record);
         }
         
-        require_once $GLOBALS['babInstallPath'] . '/utilit/dateTime.php';
+        require_once $GLOBALS['babInstallPath'].'/utilit/dateTime.php';
         
         $now = \BAB_DateTime::now()->getIsoDateTime();
         
@@ -282,7 +282,7 @@ 
         $set = $record->getParentSet();
         $primaryKey = $set->getPrimaryKey();
         
-        if(empty($record->{$primaryKey})){
+        if (empty($record->{$primaryKey})) {
             $record->initValue('createdBy', bab_getUserId());
             $record->initValue('createdOn', $now);
             $record->initValue('uuid', $this->uuid());
@@ -313,21 +313,21 @@ 
      */
     public function getRecordByUuid($uuid)
     {
-        if('' === (string) $uuid){
+        if ('' === (string) $uuid) {
             return null;
         }
         
         $record = $this->get($this->uuid->is($uuid));
         
-        if(! isset($record)){
+        if (!isset($record)) {
             return null;
         }
         
-        if(! ($record instanceof AppTraceableRecord)){
+        if (!($record instanceof AppTraceableRecord)) {
             return null;
         }
         
-        if($record->deleted){
+        if ($record->deleted) {
             return null;
         }
         
@@ -343,16 +343,16 @@ 
      */
     public function isOwn($userId = null)
     {
-        if(! isset($userId)){
+        if (!isset($userId)) {
             $userId = bab_getUserId();
         }
         return $this->createdBy->is($userId);
     }
 
-    public function getDisplayNameField(){
-        if($this->fieldExist("name")){
+    public function getDisplayNameField() {
+        if ($this->fieldExist("name")) {
             return $this->name;
-        }else{
+        } else {
             return $this->uuid;
         }
     }

Braces +1 added lines, -1 removed lines

@@ -352,7 +352,7 @@
     public function getDisplayNameField(){
         if($this->fieldExist("name")){
             return $this->name;
-        }else{
+        } else{
             return $this->uuid;
         }
     }

programs/Set/AppCustomContainer.php

Spacing +16 added lines, -16 removed lines

@@ -56,7 +56,7 @@ 
     {
         static $layouts = null;
         
-        if(! isset($layouts)){
+        if (!isset($layouts)) {
             $layouts = array(
                 self::LAYOUT_VERTICAL_BOX => app_translate('Vertical box'),
                 self::LAYOUT_HORIZONTAL_BOX => app_translate('Horizontal box'),
@@ -73,7 +73,7 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
@@ -81,39 +81,39 @@ 
         $recordSet = $record->getParentSet();
         
         $arrCriteria = json_decode($this->visibilityCriteria, true);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $arrCriteria = app_utf8Encode($arrCriteria);
         }
-        foreach ($arrCriteria as $fieldName => $condition){
-            if(strpos($fieldName, '/') !== false){
+        foreach ($arrCriteria as $fieldName => $condition) {
+            if (strpos($fieldName, '/') !== false) {
                 list ($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
             }
-            else{
+            else {
                 $field = $recordSet->$fieldName;
             }
-            foreach ($condition as $op => $value){
-                if(! is_array($value)){
+            foreach ($condition as $op => $value) {
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
-                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName) . 'Set';
+                else {
+                    foreach ($value as $foreignClassName => $foreignValues) {
+                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
                         $foreignField = '';
                         $foreignCondition = '';
-                        foreach ($foreignValues as $foreignFieldName => $foreignConditions){
-                            if($foreignFieldName === '_foreignField'){
+                        foreach ($foreignValues as $foreignFieldName => $foreignConditions) {
+                            if ($foreignFieldName === '_foreignField') {
                                 $foreignField = $foreignConditions;
                             }
-                            else{
-                                foreach ($foreignConditions as $key => $val){
+                            else {
+                                foreach ($foreignConditions as $key => $val) {
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }
                             }
                         }
                     }
-                    if(method_exists($foreignSet, 'getDefaultCriteria')){
+                    if (method_exists($foreignSet, 'getDefaultCriteria')) {
                         $foreignCondition = $foreignCondition->_AND_($foreignSet->getDefaultCriteria());
                     }
                     $criteria = $field->in($foreignCondition, $foreignField);

programs/Func_App.php

Spacing +75 added lines, -75 removed lines

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

programs/Traits/LocaleApp.php

Spacing +5 added lines, -5 removed lines

@@ -34,25 +34,25 @@
      */
     public static function getLocaleApp()
     {
-        try{
+        try {
             $rc = new \ReflectionClass(static::class);
             $path = new \bab_Path($rc->getFileName());
-            for ($popLevel = 0; $popLevel < 7; $popLevel ++){
+            for ($popLevel = 0; $popLevel < 7; $popLevel++) {
                 $path->pop();
             }
             $path->push('composer.json');
-            if(! $path->fileExists()){
+            if (!$path->fileExists()) {
                 return null;
             }
             
             $composer = file_get_contents($path->tostring());
             $composerjson = json_decode($composer, true);
-            if(!isset($composerjson['appFunctionality']) || empty($composerjson['appFunctionality'])){
+            if (!isset($composerjson['appFunctionality']) || empty($composerjson['appFunctionality'])) {
                 return null;
             }
             return \bab_functionality::get($composerjson['appFunctionality']);
         }
-        catch (\Exception $e){
+        catch (\Exception $e) {
             return null;
         }
     }

Braces +1 added lines, -2 removed lines

@@ -51,8 +51,7 @@
                 return null;
             }
             return \bab_functionality::get($composerjson['appFunctionality']);
-        }
-        catch (\Exception $e){
+        } catch (\Exception $e){
             return null;
         }
     }

programs/Ctrl/AppCtrlCustomSection.php

Spacing +112 added lines, -112 removed lines

@@ -61,7 +61,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);
@@ -70,18 +70,18 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
-                foreach ($field['fields'] as $subField){
-                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                foreach ($field['fields'] as $subField) {
+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -96,7 +96,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -151,7 +151,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -168,11 +168,11 @@ 
         
         $field = $availableFields[$fieldName];
         $fieldDescription = $field['description'];
-        if(substr($fieldName, 0, 1) !== '_'){
+        if (substr($fieldName, 0, 1) !== '_') {
             $fieldDescription = $App->translate($fieldDescription);
         }
         
-        if(empty($field)){
+        if (empty($field)) {
             // continue;
         }
         
@@ -242,12 +242,12 @@ 
         
         $groupField = $customSection->getField($fieldGroupName);
         
-        if(! isset($groupField)){
+        if (!isset($groupField)) {
             return null;
         }
         
         $field = $groupField['fields'][$fieldName];
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -263,11 +263,11 @@ 
         
         $field = $availableFields[$fieldName];
         $fieldDescription = $field['description'];
-        if(substr($fieldName, 0, 1) !== '_'){
+        if (substr($fieldName, 0, 1) !== '_') {
             $fieldDescription = $App->translate($fieldDescription);
         }
         
-        if(empty($field)){
+        if (empty($field)) {
             // continue;
         }
         
@@ -350,12 +350,12 @@ 
         
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         $fields = $customSection->getFields();
-        if(! isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             throw new AppException($App->translate('This fields group does not seem to exist'));
         }
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -365,18 +365,18 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
-                foreach ($field['fields'] as $subField){
-                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                foreach ($field['fields'] as $subField) {
+                    $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -393,7 +393,7 @@ 
         
         \bab_Sort::asort($availableFields, 'description', \bab_Sort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -505,10 +505,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;
         }
@@ -520,7 +520,7 @@ 
         
         $editor = new AppEditor($App);
         $editor->setHiddenValue('tg', $App->controllerTg);
-        if($record->id){
+        if ($record->id) {
             $editor->setHiddenValue('data[id]', $record->id);
         }
         $editor->setName('data');
@@ -536,16 +536,16 @@ 
         
         $options = array();
         $rank = 1;
-        foreach ($containers as $container){
+        foreach ($containers as $container) {
             $options[$container->id] = sprintf('%d (%s)', $rank, $container->name);
-            $rank ++;
+            $rank++;
         }
         
         $containerSections = $customSectionSet->select($customSectionSet->container->is($container->id))
             ->orderDesc($customSectionSet->rank);
         
         $nbSections = 0;
-        foreach ($containerSections as $containerSection){
+        foreach ($containerSections as $containerSection) {
             $nbSections = $containerSection->rank + 1;
             break;
         }
@@ -629,10 +629,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';
@@ -647,25 +647,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;
@@ -674,14 +674,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;
@@ -716,7 +716,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();
@@ -749,11 +749,11 @@ 
             $set->rank->greaterThanOrEqual($record->rank)
         )));
         
-        $position ++;
-        foreach ($afterSections as $afterSection){
+        $position++;
+        foreach ($afterSections as $afterSection) {
             $afterSection->rank = $position;
             $afterSection->save();
-            $position ++;
+            $position++;
         }
     }
     
@@ -781,10 +781,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';
@@ -794,14 +794,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());
@@ -809,13 +809,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'];
                     }
                     
@@ -827,9 +827,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();
@@ -838,13 +838,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'];
                     }
                     
@@ -854,20 +854,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();
             }
@@ -896,7 +896,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);
         }
         
@@ -923,17 +923,17 @@ 
         
         $nbCol = 0;
         
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             
-            list (, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list (,, $nbCol) = explode('-', $customSection->sizePolicy);
             
             $currentColumn += $nbCol;
             
-            $sectionSection = $W->Section($customSection->name . ' (' . $customSection->rank . ')', $sectionBox = $W->VBoxItems($W->Hidden()
-                ->setName('#' . $customSection->id)));
+            $sectionSection = $W->Section($customSection->name.' ('.$customSection->rank.')', $sectionBox = $W->VBoxItems($W->Hidden()
+                ->setName('#'.$customSection->id)));
             $sectionSection->addClass('app-custom-section');
             $sectionSection->addClass($customSection->classname);
-            $sectionSection->setSizePolicy($customSection->sizePolicy . ' widget-sameheight');
+            $sectionSection->setSizePolicy($customSection->sizePolicy.' widget-sameheight');
             
             $row->addItem($sectionSection);
             
@@ -951,40 +951,40 @@ 
                 ->addClass('icon', \Func_Icons::ACTIONS_EDIT_DELETE)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box red')));
-            if(! empty($customSection->visibilityCriteria)){
+            if (!empty($customSection->visibilityCriteria)) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section has a visibility condition')))
                     ->setSizePolicy('alert alert-warning widget-100pc'));
             }
             $fields = $customSection->getFields();
-            if(count($fields) == 0){
+            if (count($fields) == 0) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section does not contain any field')))
                     ->setSizePolicy('alert alert-warning'));
             }
-            foreach ($fields as $fieldId => $field){
-                if(empty($field)){
+            foreach ($fields as $fieldId => $field) {
+                if (empty($field)) {
                     continue;
                 }
                 
                 $fieldName = $field['fieldname'];
                 
                 $isFieldsGroup = false;
-                if(strpos($fieldName, '_fieldsGroup') !== false){
+                if (strpos($fieldName, '_fieldsGroup') !== false) {
                     $fieldName = '_fieldsGroup';
                     $isFieldsGroup = true;
                 }
                 
                 $field = $availableFields[$fieldName];
                 $fieldDescription = $field['description'];
-                if(substr($fieldName, 0, 1) !== '_'){
+                if (substr($fieldName, 0, 1) !== '_') {
                     $fieldDescription = $App->translate($fieldDescription);
                 }
                 
-                if(empty($field)){
+                if (empty($field)) {
                     continue;
                 }
                 
                 $fieldName = $field['name'];
-                if($isFieldsGroup){
+                if ($isFieldsGroup) {
                     $fieldName = $fieldId;
                 }
                 
@@ -995,20 +995,20 @@ 
                     ->setGrowable(true)
                     ->setWrap(WidgetFlexLayout::FLEX_WRAP_WRAP))
                     ->setSizePolicy('maximum'), $btnBox = $W->HBoxItems($W->Hidden()
-                    ->setName($customSection->id . '.' . $fieldId)
+                    ->setName($customSection->id.'.'.$fieldId)
                     ->setValue($fieldName))
                     ->addClass('widget-actions'))
                     ->setSizePolicy('widget-list-element widget-actions-target')
                     ->addClass(\Func_Icons::ICON_LEFT_16);
-                if(strpos($field['name'], '_fieldsGroup') !== false){
+                if (strpos($field['name'], '_fieldsGroup') !== false) {
                     $btnBox->addItem($W->Link('', $customSectionCtrl->addDisplayFieldToGroup($customSection->id, $fieldName))
                         ->addClass('icon', \Func_Icons::ACTIONS_LIST_ADD)
                         ->setOpenMode(WidgetLink::OPEN_DIALOG));
                     $groupedFields = $fields[$fieldName]['fields'];
-                    foreach ($groupedFields as $groupedField){
+                    foreach ($groupedFields as $groupedField) {
                         $groupedFieldDetails = $availableFields[$groupedField['fieldname']];
                         $fieldGroupBox->addItem($flexField = $W->FlowItems($W->Hidden(null, array(
-                            $customSection->id . '.fieldsGroups',
+                            $customSection->id.'.fieldsGroups',
                             $fieldName,
                             $groupedField['fieldname']
                         ), $groupedField['fieldname']), $W->Label($groupedFieldDetails['description']), $W->FlowItems($W->Link('', $customSectionCtrl->editGroupFieldDisplayField($customSection->id, $fieldName, $groupedField['fieldname']))
@@ -1036,23 +1036,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);
@@ -1079,7 +1079,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']);
@@ -1093,7 +1093,7 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $container->object . '.' . ($container->view === '' ? 'default' : $container->view) . '.' . $container->name . '.json"' . "\n");
+        header('Content-Disposition: attachment; filename="'.$container->object.'.'.($container->view === '' ? 'default' : $container->view).'.'.$container->name.'.json"'."\n");
         
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, \bab_charset::UTF_8);
@@ -1145,12 +1145,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;
         }
@@ -1162,7 +1162,7 @@ 
         
         $customSectionSet->delete($customSectionSet->container->is($container));
         
-        foreach ($sectionsValues as $sectionValues){
+        foreach ($sectionsValues as $sectionValues) {
             $customSection = $customSectionSet->newRecord();
             $customSection->setValues($sectionValues);
             $customSection->container = $container;
@@ -1240,62 +1240,62 @@ 
         $ranks = array();
         $rank = 0;
         
-        foreach ($sections as $key => $value){
+        foreach ($sections as $key => $value) {
             // Sections ids start with #, while section fields start with their original section id
-            if(substr($key, 0, 1) === '#'){
+            if (substr($key, 0, 1) === '#') {
                 $currentSectionId = substr($key, 1);
                 $rawSectionData[$currentSectionId] = array();
-                if(! isset($oldSectionId)){
+                if (!isset($oldSectionId)) {
                     $oldSectionId = $currentSectionId;
                 }
-                if(isset($currentSection) && $oldSectionId != $currentSectionId){
+                if (isset($currentSection) && $oldSectionId != $currentSectionId) {
                     $oldSectionId = $currentSectionId;
                 }
                 $ranks[$currentSectionId] = $rank;
-                $rank ++;
+                $rank++;
                 $currentSection = $customSectionSet->get($customSectionSet->id->is($currentSectionId));
                 continue;
             }
-            if(! isset($currentSection)){
+            if (!isset($currentSection)) {
                 continue;
             }
             list ($fieldSectionId, $fieldName) = explode('.', $key);
-            if($fieldSectionId == $currentSectionId){
+            if ($fieldSectionId == $currentSectionId) {
                 $field = $currentSection->getField($fieldName);
-                if(strpos($fieldName, '_fieldsGroup') !== false){
+                if (strpos($fieldName, '_fieldsGroup') !== false) {
                     $rawSectionData[$currentSectionId][$fieldName]['block'] = $field['block'];
                     $rawSectionData[$currentSectionId][$fieldName]['fieldname'] = '_fieldsGroup';
                     $rawSectionData[$currentSectionId][$fieldName]['parameters'] = $field['parameters'];
-                    foreach ($sections[$currentSection->id . '.fieldsGroups'][$fieldName] as $subKey => $subValue){
+                    foreach ($sections[$currentSection->id.'.fieldsGroups'][$fieldName] as $subKey => $subValue) {
                         $rawSectionData[$currentSectionId][$fieldName]['fields'][$subKey] = $field['fields'][$subKey];
                     }
                 }
-                elseif($fieldName != 'fieldsGroups'){
+                elseif ($fieldName != 'fieldsGroups') {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
-            else{
+            else {
                 $field = null;
                 $tmpSection = $customSectionSet->get($customSectionSet->id->is($fieldSectionId));
-                if($tmpSection){
+                if ($tmpSection) {
                     $field = $tmpSection->getField($fieldName);
                 }
-                if(isset($field)){
+                if (isset($field)) {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
         }
         
-        foreach ($rawSectionData as $sectionId => $fields){
+        foreach ($rawSectionData as $sectionId => $fields) {
             $section = $customSectionSet->get($customSectionSet->id->is($sectionId));
-            if($section){
-                if(bab_charset::getIso() != bab_charset::UTF_8){
+            if ($section) {
+                if (bab_charset::getIso() != bab_charset::UTF_8) {
                     $fields = app_utf8Encode($fields);
                 }
                 $section->fields = json_encode($fields);
                 $section->rank = isset($ranks[$sectionId]) ? $ranks[$sectionId] : 0;
                 $section->save();
-                $rank ++;
+                $rank++;
             }
         }