capwelton / libapp

programs/init.php

Spacing +8 added lines, -8 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)
@@ -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->isSSEEnabled()){
-        $babBody->addJavascriptFile($addon->getTemplatePath() . 'notification.js');
-        if(bab_isUserLogged()){
+    if ($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__) . '/portletbackend.class.php';
+        require_once dirname(__FILE__).'/portletbackend.class.php';
         $functionalities = new bab_functionalities();
-        $functionalities->registerClass('Func_PortletBackend_App', $addonPhpPath . 'portletbackend.class.php');
+        $functionalities->registerClass('Func_PortletBackend_App', $addonPhpPath.'portletbackend.class.php');
     }
 }
\ No newline at end of file

programs/Set/AppTraceableRecordSet.php

Spacing +18 added lines, -18 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,7 +343,7 @@ 
      */
     public function isOwn($userId = null)
     {
-        if(! isset($userId)){
+        if (!isset($userId)) {
             $userId = bab_getUserId();
         }
         return $this->createdBy->is($userId);

programs/Set/AppRecord.php

Spacing +33 added lines, -33 removed lines

@@ -58,7 +58,7 @@ 
     {
         $value = $this->oParentSet->getBackend()->getRecordValue($this, $sFieldName);
         $field = $this->oParentSet->$sFieldName;
-        if(! is_null($value) && $field instanceof ORMFkField){
+        if (!is_null($value) && $field instanceof ORMFkField) {
             
             $sClassName = $field->getForeignSetName();
             
@@ -93,7 +93,7 @@ 
      */
     public function App()
     {
-        if(! isset($this->app)){
+        if (!isset($this->app)) {
             // If the app object was not specified (through the setApp() method),
             // we set it as parent set's App.
             $this->setApp($this->getParentSet()
@@ -114,7 +114,7 @@ 
         $App = $this->App();
         $rClass = new \ReflectionClass(get_class($this));
         $component = $App->getComponentByName($rClass->getShortName());
-        if(isset($component)){
+        if (isset($component)) {
             return $component->getRecordClassName();
             // list(, $classname) = explode('_', $component->getRecordClassName());
             // return $classname;
@@ -130,11 +130,11 @@ 
      */
     public function getRef()
     {
-        if(! isset($this->id)){
+        if (!isset($this->id)) {
             throw new AppException('Trying to get the reference string of a record without an id.');
         }
         $classname = $this->getClassName();
-        return $classname . ':' . $this->id;
+        return $classname.':'.$this->id;
     }
     
     /**
@@ -161,7 +161,7 @@ 
     {
         $App = $this->App();
         
-        if(! isset($deletedStatus)){
+        if (!isset($deletedStatus)) {
             $deletedStatus = AppTraceableRecord::DELETED_STATUS_DELETED;
         }
         
@@ -173,7 +173,7 @@ 
         // referenced elements.
         $manyRelations = $set->getHasManyRelations();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -187,7 +187,7 @@ 
                     
                     $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
                     
-                    foreach ($foreignRecords as $foreignRecord){
+                    foreach ($foreignRecords as $foreignRecord) {
                         $foreignRecord->$foreignSetFieldName = 0;
                         $foreignRecord->save();
                     }
@@ -198,7 +198,7 @@ 
                     
                     $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
                     
-                    foreach ($foreignRecords as $foreignRecord){
+                    foreach ($foreignRecords as $foreignRecord) {
                         $foreignRecord->delete();
                     }
                     
@@ -244,7 +244,7 @@ 
         // referenced elements.
         $manyRelations = $set->getHasManyRelations();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -254,7 +254,7 @@ 
             // $foreignSet = new $foreignSetClassName($App);
             $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
             
-            foreach ($foreignRecords as $foreignRecord){
+            foreach ($foreignRecords as $foreignRecord) {
                 $foreignRecord->$foreignSetFieldName = $id;
                 $foreignRecord->save();
             }
@@ -267,7 +267,7 @@ 
         $links = $linkSet->select($linkSet->sourceClass->is($recordClassName)
             ->_AND_($linkSet->sourceId->is($recordId)));
         
-        foreach ($links as $link){
+        foreach ($links as $link) {
             $link->sourceId = $id;
             $link->save();
         }
@@ -275,7 +275,7 @@ 
         $links = $linkSet->select($linkSet->targetClass->is($recordClassName)
             ->_AND_($linkSet->targetId->is($recordId)));
         
-        foreach ($links as $link){
+        foreach ($links as $link) {
             $link->targetId = $id;
             $link->save();
         }
@@ -300,7 +300,7 @@ 
         
         $relatedRecords = array();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -311,7 +311,7 @@ 
             // $foreignSet = new $foreignSetClassName($App);
             $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
             
-            if($foreignRecords->count() > 0){
+            if ($foreignRecords->count() > 0) {
                 $relatedRecords[$foreignSetClassName] = $foreignRecords;
             }
         }
@@ -328,7 +328,7 @@ 
     {
         $path = $this->App()->uploadPath();
         
-        if(null === $path){
+        if (null === $path) {
             throw new \Exception('Missing upload path information');
             return null;
         }
@@ -351,11 +351,11 @@ 
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($this->getClassName()))
             ->_AND_($linkSet->targetId->is($this->id));
-        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));
             }
         }
@@ -379,11 +379,11 @@ 
         
         $criteria = $linkSet->all($linkSet->targetClass->is($target->getClassName()), $linkSet->targetId->is($target->id), $linkSet->sourceClass->is($this->getClassName()), $linkSet->sourceId->is($this->id));
         
-        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));
             }
         }
@@ -445,7 +445,7 @@ 
      */
     protected function importProperty($name, $value)
     {
-        if(((string) $this->$name) !== ((string) $value)){
+        if (((string) $this->$name) !== ((string) $value)) {
             $this->$name = $value;
             return 1;
         }
@@ -465,13 +465,13 @@ 
      */
     protected function importDate($name, $value)
     {
-        if(preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/', $value)){
+        if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/', $value)) {
             return $this->importProperty($name, $value);
         }
         
         // try in DD/MM/YYYY format
         
-        if(preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/', $value, $matches)){
+        if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/', $value, $matches)) {
             
             $value = sprintf('%04d-%02d-%02d', (int) $matches['year'], (int) $matches['month'], (int) $matches['day']);
             
@@ -491,11 +491,11 @@ 
         $customContainers->groupBy($customContainerSet->view);
         
         $views = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $views[] = $customContainer->view;
         }
         
-        if(empty($views)){
+        if (empty($views)) {
             $views[] = '';
         }
         
@@ -579,9 +579,9 @@ 
      */
     public function requireReadable($message = null)
     {
-        if(! $this->isReadable()){
+        if (!$this->isReadable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);
@@ -597,9 +597,9 @@ 
      */
     public function requireUpdatable($message = null)
     {
-        if(! $this->isUpdatable()){
+        if (!$this->isUpdatable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);
@@ -615,9 +615,9 @@ 
      */
     public function requireDeletable($message = null)
     {
-        if(! $this->isDeletable()){
+        if (!$this->isDeletable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);

programs/Set/AppCustomField.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
                 break;
             
             default:
-                $function = 'Capwelton\LibOrm\ORM_' . $this->fieldtype . 'Field';
+                $function = 'Capwelton\LibOrm\ORM_'.$this->fieldtype.'Field';
                 $field = $function($this->fieldname);
                 break;
         }
@@ -153,7 +153,7 @@ 
         $labelledItem = $W->LabelledWidget($this->name, $widget, null);
         $labelledItem->setName($this->fieldname);
         
-        if(! empty($this->description)){
+        if (!empty($this->description)) {
             $labelledItem->setDescription($this->description);
         }
         

programs/Set/AppRecordSet.php

Spacing +42 added lines, -42 removed lines

@@ -102,11 +102,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);
@@ -121,13 +121,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);
@@ -165,22 +165,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
                 }
             }
@@ -210,15 +210,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);
             }
         }
@@ -247,12 +247,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);
@@ -273,10 +273,10 @@ 
     public function selectLinkedTo($source, $linkType = null)
     {
         $linkSet = $this->App()->LinkSet();
-        if(is_array($source) || ($source instanceof \Iterator)){
+        if (is_array($source) || ($source instanceof \Iterator)) {
             return $linkSet->selectForSources($source, $this->getRecordClassName(), $linkType);
         }
-        else{
+        else {
             return $linkSet->selectForSource($source, $this->getRecordClassName(), $linkType);
         }
     }
@@ -294,10 +294,10 @@ 
     public function selectLinkedFrom($target, $linkType = null)
     {
         $linkSet = $this->App()->LinkSet();
-        if(is_array($target) || ($target instanceof \Iterator)){
+        if (is_array($target) || ($target instanceof \Iterator)) {
             return $linkSet->selectForTargets($target, $this->getRecordClassName(), $linkType);
         }
-        else{
+        else {
             return $linkSet->selectForTarget($target, $this->getRecordClassName(), $linkType);
         }
     }
@@ -321,11 +321,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));
             }
         }
@@ -353,11 +353,11 @@ 
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->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));
             }
         }
@@ -382,26 +382,26 @@ 
         $linkSet->hasOne('targetId', $recordClassName);
         
         $sourceIdsByClasses = array();
-        foreach ($sources as $source){
+        foreach ($sources as $source) {
             $sourceClass = $source->getClassName();
-            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));
         }
         
         $criteria = $linkSet->all($linkSet->targetClass->is($this->newRecord()
             ->getClassName()), $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));
             }
         }
@@ -426,26 +426,26 @@ 
         $linkSet->hasOne('sourceId', $recordClassName);
         
         $targetIdsByClasses = array();
-        foreach ($targets as $target){
+        foreach ($targets as $target) {
             $targetClass = $target->getClassName();
-            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));
         }
         
         $criteria = $linkSet->all($linkSet->sourceClass->is($this->newRecord()
             ->getClassName()), $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));
             }
         }
@@ -560,19 +560,19 @@ 
         $criteria = $linkSet->sourceClass->is($this->getRecordClassName())
             ->_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;
         }
         
@@ -583,7 +583,7 @@ 
     {
         $fields = $this->getFields();
         $manyRelations = $this->getHasManyRelations();
-        foreach ($manyRelations as $fieldName => $manyRelation){
+        foreach ($manyRelations as $fieldName => $manyRelation) {
             $fields[$fieldName] = $manyRelation;
         }
         return $fields;

Braces +9 added lines, -18 removed lines

@@ -179,8 +179,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
                 }
             }
@@ -217,8 +216,7 @@ 
             if($ormField instanceof ORMFkField){
                 $this->hasOne($customField->fieldname, $ormField->getForeignSetName())
                     ->setDescription($description);
-            }
-            else{
+            } else{
                 $this->addFields($ormField);
             }
         }
@@ -275,8 +273,7 @@ 
         $linkSet = $this->App()->LinkSet();
         if(is_array($source) || ($source instanceof \Iterator)){
             return $linkSet->selectForSources($source, $this->getRecordClassName(), $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForSource($source, $this->getRecordClassName(), $linkType);
         }
     }
@@ -296,8 +293,7 @@ 
         $linkSet = $this->App()->LinkSet();
         if(is_array($target) || ($target instanceof \Iterator)){
             return $linkSet->selectForTargets($target, $this->getRecordClassName(), $linkType);
-        }
-        else{
+        } else{
             return $linkSet->selectForTarget($target, $this->getRecordClassName(), $linkType);
         }
     }
@@ -324,8 +320,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -356,8 +351,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -400,8 +394,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -444,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));
             }
         }
@@ -562,8 +554,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)){

programs/Set/AppCustomFieldSet.php

Spacing +5 added lines, -5 removed lines

@@ -80,14 +80,14 @@ 
             ORM_BoolField('visible')->setOutputOptions($App->translate('No'), $App->translate('Yes'))->setDescription($App->translate('Column in list'))
         );
         
-        if($App->onlineShop){
+        if ($App->onlineShop) {
             $this->addFields(ORM_BoolField('visible_in_shop'));
         }
     }
     
     public function save(ORMRecord $record, $noTrace = false)
     {
-        if(! $record->fieldname){
+        if (!$record->fieldname) {
             $record->fieldname = $this->getFieldName($record->name);
         }
         
@@ -108,11 +108,11 @@ 
         $name = preg_replace('/[^a-zA-Z0-9]+/', '', $name);
         $name = mb_strtolower($name);
         
-        if(empty($name)){
+        if (empty($name)) {
             throw new AppSaveException($this->App()->translate('The name is mandatory'));
         }
         
-        return '_' . $name;
+        return '_'.$name;
     }
     
     /**
@@ -126,7 +126,7 @@ 
         
         $arr = array();
         
-        if(isset($App->Article)){
+        if (isset($App->Article)) {
             $arr['Article'] = $App->translate('Products database');
         }
         

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/AppHelpers.php

Indentation +260 added lines, -260 removed lines

@@ -57,50 +57,50 @@ 
 
 function app_genericSetEditor(ORMRecordSet $set)
 {
-	$O = \bab_functionality::get('LibOrm');
-	$O->init();
-	$W = \bab_Widgets();
-	$layout = $W->VBoxLayout();
-	$layout->setVerticalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORMDateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORMRecordSet) {
-				$widget = app_genericSetEditor($field);
-				$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = \bab_functionality::get('LibOrm');
+    $O->init();
+    $W = \bab_Widgets();
+    $layout = $W->VBoxLayout();
+    $layout->setVerticalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORMDateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORMRecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -113,50 +113,50 @@ 
  */
 function app_genericSetFilterForm(ORMRecordSet $set)
 {
-	$O = \bab_functionality::get('LibOrm');
-	$O->init();
-	$W = \bab_Widgets();
-	$layout = $W->FlowLayout();
-	$layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORMDateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORMRecordSet) {
-			$widget = app_genericSetFilterForm($field);
-			$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = \bab_functionality::get('LibOrm');
+    $O->init();
+    $W = \bab_Widgets();
+    $layout = $W->FlowLayout();
+    $layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORMDateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORMRecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -169,47 +169,47 @@ 
  */
 function app_LabelledWidget($labelText, WidgetDisplayableInterface $widget)
 {
-	$W = \bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof WidgetInputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof WidgetCheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
-			$label
-		)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
-	} else {
-		$layout = $W->VBoxItems(
-			$label,
-			$widget
-		)->setVerticalSpacing(0.5, 'em');
-	}
-
-	return $layout;
+    $W = \bab_Widgets();
+
+    $label = $W->Label($labelText);
+    if ($widget instanceof WidgetInputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof WidgetCheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(WidgetSizePolicy::MINIMUM),
+            $label
+        )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    } else {
+        $layout = $W->VBoxItems(
+            $label,
+            $widget
+        )->setVerticalSpacing(0.5, 'em');
+    }
+
+    return $layout;
 }
 
 
 
 function app_LabelledCheckbox($labelText, $checkboxName, $options = null)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
-	$label = $W->Label($labelText)->colon(false);
-	$checkbox = $W->Checkbox()->setName($checkboxName);
-	$label->setAssociatedWidget($checkbox);
-	if (isset($options)) {
-		$label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -217,42 +217,42 @@ 
 
 function app_LabelledOrmSelect(ORMMySqlIterator $iterator, $fieldName, $selectName, $label, $hidden = false, $groupFieldName = null)
 {
-	$W = \bab_Widgets();
-
-	if (isset($groupFieldName)) {
-		$groupPathElements = explode('/', $groupFieldName);
-	}
-
-	$select = $W->Select()->setName($selectName);
-
-	$select->addOption('', '');
-
-	$nbOptions = 0;
-	foreach ($iterator as $record) {
-		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
-		} else {
-			$optionText = $record->$fieldName;
-		}
-		if (isset($groupFieldName)) {
-			$group = $record;
-			foreach ($groupPathElements as $groupPathElement) {
-				$group = $group->$groupPathElement;
-			}
-			$select->addOption($record->id, $optionText, $group);
-		} else {
-			$select->addOption($record->id, $optionText);
-		}
-		$nbOptions++;
-		$lastId = $record->id;
-	}
-
-	if ($nbOptions == 1) {
-		$select->setValue($lastId);
-	}
-
-
-	return app_LabelledWidget($label, $select);
+    $W = \bab_Widgets();
+
+    if (isset($groupFieldName)) {
+        $groupPathElements = explode('/', $groupFieldName);
+    }
+
+    $select = $W->Select()->setName($selectName);
+
+    $select->addOption('', '');
+
+    $nbOptions = 0;
+    foreach ($iterator as $record) {
+        if (isset($record->code)) {
+            $optionText = $record->code . ' - ' . $record->$fieldName;
+        } else {
+            $optionText = $record->$fieldName;
+        }
+        if (isset($groupFieldName)) {
+            $group = $record;
+            foreach ($groupPathElements as $groupPathElement) {
+                $group = $group->$groupPathElement;
+            }
+            $select->addOption($record->id, $optionText, $group);
+        } else {
+            $select->addOption($record->id, $optionText);
+        }
+        $nbOptions++;
+        $lastId = $record->id;
+    }
+
+    if ($nbOptions == 1) {
+        $select->setValue($lastId);
+    }
+
+
+    return app_LabelledWidget($label, $select);
 }
 
 
@@ -260,108 +260,108 @@ 
 
 function app_OrmWidget(ORMField $field)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
 
-	if ($field instanceof ORMDateField) {
-		$widget = $W->DatePicker();
-	} else if ($field instanceof ORMTimeField) {
-		$widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORMDatetimeField) {
-	    $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORMEnumField) {
-		$widget = $W->Select();
+    if ($field instanceof ORMDateField) {
+        $widget = $W->DatePicker();
+    } else if ($field instanceof ORMTimeField) {
+        $widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORMDatetimeField) {
+        $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORMEnumField) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
-		$widget->addOption('', '');
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORMSetField) {
-		$widget = $W->MultiSelect()->setSelectedList(2);
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORMUserField) {
-	    $widget = $W->SuggestUser()
-    	    ->setMinChars(0)
-    	    ->setSizePolicy(\Func_Icons::ICON_LEFT_16);
-	} else if ($field instanceof ORMCurrencyField) {
-		$widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
-	} else if ($field instanceof ORMBoolField) {
-		$widget = $W->CheckBox()->setCheckedValue('1');
-	} else if ($field instanceof ORMIntField) {
-		$widget = $W->LineEdit()
-						->setSize(6)->addClass('widget-input-numeric');
-	} else if ($field instanceof ORMEmailField) {
-		$widget = $W->EmailLineEdit()
-						->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORMFileField) {
-	    $widget = $W->FilePicker();
-	} else if ($field instanceof ORMStringField) {
-		$widget = $W->LineEdit()
-			->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORMTextField) {
-		$widget = $W->TextEdit()
-		  ->addClass('widget-autoresize');
-	} else if ($field instanceof ORMPkField) {
-	    $widget = $W->Hidden();
-	} else if ($field instanceof ORMFkField) {
-		$widget = $W->Select();
-		$fieldName = $field->getName();
-		$parentSet = clone $field->getParentSet();
-		$parentSet->join($fieldName);
-		$set = $parentSet->$fieldName;
-		$records = $set->select();
-		$records->orderAsc($set->name);
-		$pkName = $set->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else if ($field instanceof ORMRecordSet) {
-		$widget = $W->Select();
+        $widget->addOption('', '');
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORMSetField) {
+        $widget = $W->MultiSelect()->setSelectedList(2);
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORMUserField) {
+        $widget = $W->SuggestUser()
+            ->setMinChars(0)
+            ->setSizePolicy(\Func_Icons::ICON_LEFT_16);
+    } else if ($field instanceof ORMCurrencyField) {
+        $widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
+    } else if ($field instanceof ORMBoolField) {
+        $widget = $W->CheckBox()->setCheckedValue('1');
+    } else if ($field instanceof ORMIntField) {
+        $widget = $W->LineEdit()
+                        ->setSize(6)->addClass('widget-input-numeric');
+    } else if ($field instanceof ORMEmailField) {
+        $widget = $W->EmailLineEdit()
+                        ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORMFileField) {
+        $widget = $W->FilePicker();
+    } else if ($field instanceof ORMStringField) {
+        $widget = $W->LineEdit()
+            ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORMTextField) {
+        $widget = $W->TextEdit()
+            ->addClass('widget-autoresize');
+    } else if ($field instanceof ORMPkField) {
+        $widget = $W->Hidden();
+    } else if ($field instanceof ORMFkField) {
+        $widget = $W->Select();
+        $fieldName = $field->getName();
+        $parentSet = clone $field->getParentSet();
+        $parentSet->join($fieldName);
+        $set = $parentSet->$fieldName;
+        $records = $set->select();
+        $records->orderAsc($set->name);
+        $pkName = $set->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else if ($field instanceof ORMRecordSet) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
 //		$fieldName = $field->getName();
 //		$parentSet = $field->getParentSet();
 //		$parentSet->join($fieldName);
 //		$set = $parentSet->$fieldName;
-		$records = $field->select();
-		$records->orderAsc($field->name);
-		$pkName = $field->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else {
-		$widget = $W->LineEdit();
-	}
-
-	$widget->setName($field->getName());
-
-	return $widget;
+        $records = $field->select();
+        $records->orderAsc($field->name);
+        $pkName = $field->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else {
+        $widget = $W->LineEdit();
+    }
+
+    $widget->setName($field->getName());
+
+    return $widget;
 }
 
 
 
 function app_LabelledOrmWidget(ORMField $field, $label = null, $hidden = false)
 {
-	$W = \bab_Widgets();
+    $W = \bab_Widgets();
 
-	if ($hidden) {
-		$widget = $W->Hidden();
-		$widget->setName($field->getName());
-		return $widget;
-	}
+    if ($hidden) {
+        $widget = $W->Hidden();
+        $widget->setName($field->getName());
+        return $widget;
+    }
 
-	if (is_null($label)) {
-		$label = $field->getDescription();
-	}
+    if (is_null($label)) {
+        $label = $field->getDescription();
+    }
 
-	$widget = app_OrmWidget($field);
+    $widget = app_OrmWidget($field);
 
-	return app_LabelledWidget($label, $widget);
+    return app_LabelledWidget($label, $widget);
 }
 
 
@@ -377,16 +377,16 @@ 
  */
 function app_dateTime(ORMField $field, $value) {
 
-	$W = \bab_functionality::get('Widgets');
-	$name = $field->getName();
-	$label = $W->Label($field->getDescription());
+    $W = \bab_functionality::get('Widgets');
+    $name = $field->getName();
+    $label = $W->Label($field->getDescription());
 
-	$frame = app_dateTimeField($name, $label, $value);
+    $frame = app_dateTimeField($name, $label, $value);
 
-	return $W->VBoxItems(
-		$label,
-		$frame
-	);
+    return $W->VBoxItems(
+        $label,
+        $frame
+    );
 
 }
 
@@ -400,24 +400,24 @@ 
  */
 function app_dateTimeField($fieldName, WidgetLabel $label, $value = null)
 {
-	$W = \bab_functionality::get('Widgets');
+    $W = \bab_functionality::get('Widgets');
 
-	$datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
-	$timepart = $W->TimePicker()->setName('time');
+    $datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
+    $timepart = $W->TimePicker()->setName('time');
 
-	if (isset($value)) {
+    if (isset($value)) {
 
-		$value = explode(' ', $value);
+        $value = explode(' ', $value);
 
-		$datepart->setValue($value[0]);
-		$timepart->setValue($value[1]);
-	}
+        $datepart->setValue($value[0]);
+        $timepart->setValue($value[1]);
+    }
 
-	$datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
-			->addItem($datepart)
-			->addItem($timepart);
+    $datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
+            ->addItem($datepart)
+            ->addItem($timepart);
 
-	return $datetime;
+    return $datetime;
 }
 
 

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->DatePicker();
@@ -127,7 +127,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->PeriodPicker();
@@ -230,7 +230,7 @@ 
 	$nbOptions = 0;
 	foreach ($iterator as $record) {
 		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
+			$optionText = $record->code.' - '.$record->$fieldName;
 		} else {
 			$optionText = $record->$fieldName;
 		}

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;