capwelton / libapp

programs/Exceptions/AppDeletedRecordException.php

Spacing +2 added lines, -2 removed lines

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

programs/Set/AppLogSet.php

Spacing +2 added lines, -2 removed lines

@@ -75,8 +75,8 @@
     public function serialize(AppRecord $record)
     {
         $values = $record->getValues();
-        foreach ($values as $key => $value){
-            if($value instanceof ORMRecordSet){
+        foreach ($values as $key => $value) {
+            if ($value instanceof ORMRecordSet) {
                 $values[$key] = $value->id;
             }
         }

programs/Ui/AppCardFrame.php

Spacing +1 added lines, -1 removed lines

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

programs/Ui/AppCriteriaEditor.php

Braces +5 added lines, -10 removed lines

@@ -159,13 +159,11 @@ 
                     
                     if($foreignRecordSetField instanceof ORMBoolInterface){
                         $booleanFieldPathes[] = $foreignPath;
-                    }
-                    else{
+                    } else{
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
-            }
-            elseif($recordSetField instanceof ORMFkField){
+            } elseif($recordSetField instanceof ORMFkField){
                 /* @var $recordSetField ORMFkField */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -182,13 +180,11 @@ 
                     
                     if($foreignRecordSetField instanceof ORMBoolInterface){
                         $booleanFieldPathes[] = $foreignPath;
-                    }
-                    else{
+                    } else{
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
-            }
-            else{
+            } else{
                 /* @var $recordSetField ORMField */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();
@@ -204,8 +200,7 @@ 
                 
                 if($recordSetField instanceof ORMBoolInterface){
                     $booleanFieldPathes[] = $path;
-                }
-                else{
+                } else{
                     $defaultFieldPathes[] = $path;
                 }
             }

Spacing +22 added lines, -22 removed lines

@@ -79,17 +79,17 @@ 
      */
     public function getRecordSet()
     {
-        if(isset($this->recordSet)){
+        if (isset($this->recordSet)) {
             return $this->recordSet;
         }
         
         $parentField = $this->criteria->getField();
         
-        if(! isset($parentField)){
+        if (!isset($parentField)) {
             return null;
         }
         
-        do{
+        do {
             $field = $parentField;
             $parentField = $field->getParentSet();
         }
@@ -142,8 +142,8 @@ 
         
         $classPrefix = $App->classPrefix;
         
-        foreach ($recordSetFields as $fieldName => $recordSetField){
-            if($recordSetField instanceof ORMManyRelation){
+        foreach ($recordSetFields as $fieldName => $recordSetField) {
+            if ($recordSetField instanceof ORMManyRelation) {
                 /* @var $recordSetField ORMManyRelation */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -152,31 +152,31 @@ 
                 $foreignRecordSet = $App->$foreignSetName();
                 $foreignRecordSetFields = $foreignRecordSet->getVisibilityCriteriaFields();
                 
-                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField){
-                    if(!method_exists($foreignRecordSetField,'getName')){
+                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField) {
+                    if (!method_exists($foreignRecordSetField, 'getName')) {
                         continue;
                     }
                     $foreignFieldName = $foreignRecordSetField->getName();
                     $foreignFieldDescription = $foreignRecordSetField->getDescription();
-                    if(substr($foreignFieldName, 0, 1) !== '_'){
+                    if (substr($foreignFieldName, 0, 1) !== '_') {
                         $foreignFieldDescription = $App->translate($foreignFieldDescription);
                     }
-                    if(empty($foreignFieldDescription)){
+                    if (empty($foreignFieldDescription)) {
                         $foreignFieldDescription = $foreignFieldName;
                     }
-                    $foreignPath = $path . '/' . $foreignRecordSetField->getPath();
+                    $foreignPath = $path.'/'.$foreignRecordSetField->getPath();
                     
                     $recordSetFieldSelect->addOption($foreignPath, $foreignFieldDescription, $fieldName);
                     
-                    if($foreignRecordSetField instanceof ORMBoolInterface){
+                    if ($foreignRecordSetField instanceof ORMBoolInterface) {
                         $booleanFieldPathes[] = $foreignPath;
                     }
-                    else{
+                    else {
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
             }
-            elseif($recordSetField instanceof ORMFkField){
+            elseif ($recordSetField instanceof ORMFkField) {
                 /* @var $recordSetField ORMFkField */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -185,38 +185,38 @@ 
                 $foreignRecordSet = $App->$foreignSetName();
                 $foreignRecordSetFields = $foreignRecordSet->getVisibilityCriteriaFields();
                 
-                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField){
+                foreach ($foreignRecordSetFields as $foreignFieldName => $foreignRecordSetField) {
                     $foreignFieldDescription = $foreignFieldName;
-                    $foreignPath = $path . '/' . $foreignFieldName;
+                    $foreignPath = $path.'/'.$foreignFieldName;
                     
                     $recordSetFieldSelect->addOption($foreignPath, $foreignFieldDescription, $fieldName);
                     
-                    if($foreignRecordSetField instanceof ORMBoolInterface){
+                    if ($foreignRecordSetField instanceof ORMBoolInterface) {
                         $booleanFieldPathes[] = $foreignPath;
                     }
-                    else{
+                    else {
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
             }
-            else{
+            else {
                 /* @var $recordSetField ORMField */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();
-                if(substr($fieldName, 0, 1) !== '_'){
+                if (substr($fieldName, 0, 1) !== '_') {
                     $fieldDescription = $App->translate($fieldDescription);
                 }
-                if(empty($fieldDescription)){
+                if (empty($fieldDescription)) {
                     $fieldDescription = $fieldName;
                 }
                 $path = $recordSetField->getPath();
                 
                 $recordSetFieldSelect->addOption($path, $fieldDescription);
                 
-                if($recordSetField instanceof ORMBoolInterface){
+                if ($recordSetField instanceof ORMBoolInterface) {
                     $booleanFieldPathes[] = $path;
                 }
-                else{
+                else {
                     $defaultFieldPathes[] = $path;
                 }
             }

programs/Ctrl/AppCtrlCustomContainer.php

Braces +5 added lines, -10 removed lines

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

Spacing +66 added lines, -66 removed lines

@@ -73,15 +73,15 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -96,7 +96,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -150,7 +150,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -166,11 +166,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;
         }
         
@@ -271,10 +271,10 @@ 
         $W = bab_Widgets();
         
         $customSectionSet = $App->CustomContainerSet();
-        if(isset($id)){
+        if (isset($id)) {
             $record = $customSectionSet->request($id);
         }
-        else{
+        else {
             $record = $customSectionSet->newRecord();
             $record->object = $object;
         }
@@ -287,7 +287,7 @@ 
         $editor = new AppEditor($App);
         $editor->setHiddenValue('tg', $App->controllerTg);
         $editor->setHiddenValue('data[view]', $view);
-        if($record->id){
+        if ($record->id) {
             $editor->setHiddenValue('data[id]', $record->id);
         }
         $editor->setName('data');
@@ -365,10 +365,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';
@@ -383,25 +383,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;
@@ -410,14 +410,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;
@@ -459,10 +459,10 @@ 
         return true;
     }
     
-    protected function preSave(ORMRecord  &$record, $data)
+    protected function preSave(ORMRecord & $record, $data)
     {
         parent::preSave($record, $data);
-        if(! isset($record->id) || empty($record->id)){
+        if (!isset($record->id) || empty($record->id)) {
             $set = $record->getParentSet();
             $nbContainers = $set->select($set->all(array(
                 $set->object->is($record->object),
@@ -497,10 +497,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';
@@ -511,14 +511,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());
@@ -526,13 +526,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'];
                     }
                     
@@ -544,9 +544,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();
@@ -555,13 +555,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'];
                     }
                     
@@ -571,20 +571,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();
             }
@@ -619,7 +619,7 @@ 
         
         $containerBoxes = $W->Items();
         
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             
             $menu = $W->HBoxItems($W->Link('', $customSectionCtrl->edit($customContainer->id))
                 ->addClass('icon', FuncIcons::ACTIONS_LIST_ADD)
@@ -634,7 +634,7 @@ 
             $menu->setSizePolicy(FuncIcons::ICON_LEFT_16);
             
             $hasVisibilityBox = $W->FlowItems()->addClass('widget-100');
-            if(! empty($customContainer->visibilityCriteria)){
+            if (!empty($customContainer->visibilityCriteria)) {
                 $hasVisibilityBox->addItem($W->HBoxItems($W->Label($App->translate('This container has a visibility condition')))
                     ->setSizePolicy('alert alert-warning widget-100pc'));
             }
@@ -645,7 +645,7 @@ 
                 ->addClass($customContainer->classname));
         }
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $containerBoxes->setId($itemId);
         }
         
@@ -671,7 +671,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         
         $containersValues = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $values = $customContainer->getValues();
             unset($values['id']);
             unset($values['uuid']);
@@ -684,7 +684,7 @@ 
             unset($values['deleted']);
             $values['customSections'] = array();
             $customSections = $customSectionSet->select($customSectionSet->container->is($customContainer->id));
-            foreach ($customSections as $customSection){
+            foreach ($customSections as $customSection) {
                 $customSectionValues = $customSection->getValues();
                 unset($customSectionValues['id']);
                 unset($customSectionValues['uuid']);
@@ -703,8 +703,8 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"' . "\n");
-        if(BabCharset::getIso() != BabCharset::UTF_8){
+        header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n");
+        if (BabCharset::getIso() != BabCharset::UTF_8) {
             $containersValues = app_utf8Encode($containersValues);
         }
         $json = bab_json_encode($containersValues);
@@ -763,12 +763,12 @@ 
         $files->push($containersfile['uid']);
         
         $data = null;
-        foreach ($files as $f){
+        foreach ($files as $f) {
             $data = file_get_contents($f->toString());
             break;
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             $this->addError($App->translate('Unable to get file content'));
             return true;
         }
@@ -784,13 +784,13 @@ 
         $customContainerSet->delete($customContainerSet->view->is($view)
             ->_AND_($customContainerSet->object->is($object)));
         
-        foreach ($containersValues as $containerValues){
+        foreach ($containersValues as $containerValues) {
             $customContainer = $customContainerSet->newRecord();
             $customContainer->setValues($containerValues);
             $customContainer->object = $object;
             $customContainer->view = $view;
             $customContainer->save();
-            foreach ($containerValues['customSections'] as $sectionValues){
+            foreach ($containerValues['customSections'] as $sectionValues) {
                 $customSection = $customSectionSet->newRecord();
                 $sectionValues['fields'] = json_encode($sectionValues['fields']);
                 $customSection->setValues($sectionValues);
@@ -924,9 +924,9 @@ 
         
         $rank = 0;
         $currentContainerId = 0;
-        foreach (array_keys($containers) as $containerFieldId){
+        foreach (array_keys($containers) as $containerFieldId) {
             
-            if(substr($containerFieldId, 0, 1) === '#'){
+            if (substr($containerFieldId, 0, 1) === '#') {
                 $currentContainerId = substr($containerFieldId, 1);
                 
                 $customContainer = $customContainerSet->request($customContainerSet->id->is($currentContainerId));
@@ -935,7 +935,7 @@ 
                 $containersRawFields[$currentContainerId] = $customContainer->getRawFields();
                 
                 $customContainer->rank = $rank;
-                $rank ++;
+                $rank++;
                 $customContainer->save();
                 continue;
             }
@@ -943,18 +943,18 @@ 
             $containersFields[$currentContainerId][] = $containerFieldId;
         }
         
-        foreach ($containersFields as $containerId => $containerFieldIds){
-            foreach ($containerFieldIds as $containerFieldId){
+        foreach ($containersFields as $containerId => $containerFieldIds) {
+            foreach ($containerFieldIds as $containerFieldId) {
                 list ($srcContainerId, $srcfieldId) = explode('.', $containerFieldId);
-                if(! isset($containersRawFields[$srcContainerId][$srcfieldId])){
+                if (!isset($containersRawFields[$srcContainerId][$srcfieldId])) {
                     return true;
                 }
             }
         }
         
-        foreach ($containersFields as $containerId => $containerFieldIds){
+        foreach ($containersFields as $containerId => $containerFieldIds) {
             $newRawFields = array();
-            foreach ($containerFieldIds as $containerFieldId){
+            foreach ($containerFieldIds as $containerFieldId) {
                 list ($srcContainerId, $srcfieldId) = explode('.', $containerFieldId);
                 $newRawFields[] = $containersRawFields[$srcContainerId][$srcfieldId];
             }

programs/AppAccessManager.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
     public function hasNoAccess(AppRecordSet $recordSet, $accessType, $user = null)
     {
         $criterion = $this->getAccessCriterion($recordSet, $accessType, $user);
-        if(! $criterion instanceof ORMFalseCriterion){
+        if (!$criterion instanceof ORMFalseCriterion) {
             return false;
         }
         return true;

programs/Ctrl/AppCtrlSSE.php

Spacing +6 added lines, -6 removed lines

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

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/Set/AppRecordSet.php

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

Indentation +10 added lines, -10 removed lines

@@ -182,16 +182,16 @@
     
 
         /**
-     * Specifies that the recordset is linked to one element of the recordset of class $foreignSetClassName.
-     *
-     * @param string $fieldName
-     *            Field name of the set that have a link
-     * @param string $foreignSetClassName
-     *            Class name of the set on which the field is bound
-     * @param string $fieldClassName
-     *            Class name of the field to use as foreign key
-     * @return ORMFkField
-     */
+         * Specifies that the recordset is linked to one element of the recordset of class $foreignSetClassName.
+         *
+         * @param string $fieldName
+         *            Field name of the set that have a link
+         * @param string $foreignSetClassName
+         *            Class name of the set on which the field is bound
+         * @param string $fieldClassName
+         *            Class name of the field to use as foreign key
+         * @return ORMFkField
+         */
     public function hasOne($fieldName, $foreignSetClassName, $fieldClassName = 'ORMIntField',$App = null)
     {
         $ownerSetClassName = get_class($this);

Spacing +74 added lines, -74 removed lines

@@ -107,7 +107,7 @@ 
 
     protected function addTraitsFields()
     {
-        if($this->usesWebIdTrait()){
+        if ($this->usesWebIdTrait()) {
             $this->addWebIdField();
         }
     }
@@ -136,11 +136,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);
@@ -155,19 +155,19 @@ 
     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);
         $set = $fkField->App()->$appSetName();
 
-        if($fkField instanceof AppDynamicFkField){
+        if ($fkField instanceof AppDynamicFkField) {
             $set->setDynamicallyJoined();
             $set->setComputedJoinQuery($fkField->getComputedQuery($this->getBackend()));
         }
@@ -192,41 +192,41 @@ 
      *            Class name of the field to use as foreign key
      * @return ORMFkField
      */
-    public function hasOne($fieldName, $foreignSetClassName, $fieldClassName = 'ORMIntField',$App = null)
+    public function hasOne($fieldName, $foreignSetClassName, $fieldClassName = 'ORMIntField', $App = null)
     {
         $ownerSetClassName = get_class($this);
         $ownerSetFieldName = $fieldName;
         
-        if(substr($foreignSetClassName, - 3, 3) !== 'Set'){
-            $foreignSetClassName = $foreignSetClassName . 'Set';
+        if (substr($foreignSetClassName, - 3, 3) !== 'Set') {
+            $foreignSetClassName = $foreignSetClassName.'Set';
         }
         
         $oRelations = bab_getInstance('Capwelton\LibOrm\MySql\ORMRelations');
         $oRelations->addRelation(new ORMOneRelation($ownerSetClassName, $ownerSetFieldName, $foreignSetClassName));
         
         $this->addFields(new AppFkField($fieldName, $foreignSetClassName, false, null, $fieldClassName));
-        if($App == null){
+        if ($App == null) {
             $App = $this->App();
         }
         $this->$fieldName->setApp($App);
         return $this->$fieldName;
     }
     
-    public function hasDynamicOne($fieldName,$foreignSetClassName,$criterias,$App = null){
+    public function hasDynamicOne($fieldName, $foreignSetClassName, $criterias, $App = null) {
         $ownerSetClassName = get_class($this);
         $ownerSetFieldName = $fieldName;
         
-        if(substr($foreignSetClassName, - 3, 3) !== 'Set'){
-            $foreignSetClassName = $foreignSetClassName . 'Set';
+        if (substr($foreignSetClassName, - 3, 3) !== 'Set') {
+            $foreignSetClassName = $foreignSetClassName.'Set';
         }
         
         $oRelations = bab_getInstance('Capwelton\LibOrm\MySql\ORMRelations');
         $oRelations->addRelation(new ORMOneRelation($ownerSetClassName, $ownerSetFieldName, $foreignSetClassName));
         
-        if($App == null){
+        if ($App == null) {
             $App = $this->App();
         }
-        $this->addFields(new AppDynamicFkField($fieldName, $foreignSetClassName, false, null,'ORMIntField',$App));
+        $this->addFields(new AppDynamicFkField($fieldName, $foreignSetClassName, false, null, 'ORMIntField', $App));
         
         $this->$fieldName->setApp($App);
         return $this->$fieldName;
@@ -257,22 +257,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
                 }
             }
@@ -302,15 +302,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);
             }
         }
@@ -339,12 +339,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);
@@ -367,14 +367,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);
         }
     }
@@ -394,14 +394,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);
         }
     }
@@ -419,13 +419,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();
         }
         
@@ -433,11 +433,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));
             }
         }
@@ -459,29 +459,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));
             }
         }
@@ -503,39 +503,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));
             }
         }
@@ -557,39 +557,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));
             }
         }
@@ -704,19 +704,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;
         }
         
@@ -727,31 +727,31 @@ 
     {
         $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;
         }
     }
 
     public function save(ORMRecord $record)
     {
-        if($this->usesWebIdTrait()){
-            if(empty($record->webId)){
+        if ($this->usesWebIdTrait()) {
+            if (empty($record->webId)) {
                 $record->initValue('webId', $this->webId());
             }
         }
@@ -760,8 +760,8 @@ 
 
     public function get($mixedParam = null, $sPropertyName = null)
     {
-        if(!$mixedParam instanceof ORMCriteria){
-            if($this->usesWebIdTrait()){
+        if (!$mixedParam instanceof ORMCriteria) {
+            if ($this->usesWebIdTrait()) {
                 $mixedParam = $this->webId->is($mixedParam);
             }
         }