capwelton / libapp

programs/init.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
 
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__) . '/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)
@@ -42,7 +42,7 @@ 
 
     $sql .= $backend->setToSql($App->LogSet());
 
-    require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+    require_once $GLOBALS['babInstallPath'] . 'utilit/devtools.php';
     $synchronize = new bab_synchronizeSql();
 
     $synchronize->fromSqlString($sql);
@@ -53,7 +53,7 @@ 
 
 function LibApp_onDeleteAddon()
 {
-    require_once $GLOBALS['babInstallPath'].'utilit/functionalityincl.php';
+    require_once $GLOBALS['babInstallPath'] . 'utilit/functionalityincl.php';
     $functionalities = new bab_functionalities();
     $functionalities->unregister('App');
     return true;

programs/base.class.php

Spacing +1 added lines, -1 removed lines

@@ -146,7 +146,7 @@
             }
             return $returnedValue;
         } else {
-            trigger_error('the method '.$name.' does not exists on '.get_class($this).' and there is no widget defined with the setInheritedItem method');
+            trigger_error('the method ' . $name . ' does not exists on ' . get_class($this) . ' and there is no widget defined with the setInheritedItem method');
         }
     }
     

programs/ui/base.ui.php

Indentation +11 added lines, -11 removed lines

@@ -102,7 +102,7 @@ 
     public function __construct(Func_App $app, $id = null, Widget_Layout $layout = null)
     {
         parent::__construct($app);
-         // We simulate inheritance from Widget_VBoxLayout.
+            // We simulate inheritance from Widget_VBoxLayout.
         $W = $this->widgets = bab_Widgets();
 
 
@@ -307,9 +307,9 @@ 
             $cancelLabel = isset($this->cancelLabel) ? $this->cancelLabel : $App->translate('Cancel');
             $this->addButton(
                 $W->SubmitButton(/*'cancel'*/)
-                     ->addClass('widget-close-dialog')
+                        ->addClass('widget-close-dialog')
                     ->setAction($this->cancelAction)
-                      ->setLabel($cancelLabel)
+                        ->setLabel($cancelLabel)
             );
         }
 
@@ -1148,21 +1148,21 @@ 
 
 
 
-	protected function addCustomFields(app_RecordSet $recordSet)
-	{
-		$customFields = $recordSet->getCustomFields();
+    protected function addCustomFields(app_RecordSet $recordSet)
+    {
+        $customFields = $recordSet->getCustomFields();
 
         foreach ($customFields as $customField) {
             $fieldname = $customField->fieldname;
             $this->addColumn(
                 widget_TableModelViewColumn($recordSet->$fieldname, $customField->name)
-                  ->setSortable(true)
-                  ->setExportable(true)
-                  ->setSearchable($customField->searchable)
-				  ->setVisible($customField->visible)
+                    ->setSortable(true)
+                    ->setExportable(true)
+                    ->setSearchable($customField->searchable)
+                    ->setVisible($customField->visible)
             );
         }
-	}
+    }
 
 
     /**

Spacing +11 added lines, -11 removed lines

@@ -667,7 +667,7 @@ 
                 continue;
             }
             
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
             
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -722,7 +722,7 @@ 
             }
         }
         
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -994,7 +994,7 @@ 
         $row = $W->Items()->setSizePolicy('row');
         foreach ($customSections as $customSection) {
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1046,7 +1046,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -1351,11 +1351,11 @@ 
 
         foreach ($columns as $fieldName => $column) {
             $field = $column->getField();
-            if (! $column->isSearchable()) {
+            if (!$column->isSearchable()) {
                 continue;
             }
 
-            if (! ($field instanceof ORM_Field)) {
+            if (!($field instanceof ORM_Field)) {
                 $field = null;
             }
 
@@ -1385,7 +1385,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Filter'));
         }
@@ -1809,7 +1809,7 @@ 
                 continue;
             }
             
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
             
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1880,7 +1880,7 @@ 
             }
         }
         
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -1994,7 +1994,7 @@ 
         
         $displayable = $field->output($value);
         
-        switch(true) {
+        switch (true) {
             case ($field instanceof ORM_TextField):
                 $displayable = $W->RichText($displayable)->setRenderingOptions(BAB_HTML_ALL ^ BAB_HTML_P);
                 break;
@@ -2004,7 +2004,7 @@ 
                 break;
                 
             case ($field instanceof ORM_EmailField):
-                $displayable = $W->Link($displayable, 'mailto:'.$displayable);
+                $displayable = $W->Link($displayable, 'mailto:' . $displayable);
                 break;
                 
             case ($field instanceof ORM_FkField):

programs/ui/page.class.php

Spacing +2 added lines, -2 removed lines

@@ -286,7 +286,7 @@ 
 
             // all widget have static id to not change id of others widgets in page
 
-            $infoMessages =  $_SESSION['app_msginfo'];
+            $infoMessages = $_SESSION['app_msginfo'];
             foreach ($infoMessages as $infoLine) {
                 $this->App()->Controller()->addMessage($infoLine);
             }
@@ -304,6 +304,6 @@ 
          * @see	app.jquery.js#window.babAddonLibApp.numberFormat
          */
         $this->setMetadata('numberFormatSeparator', mb_substr($str, 1, 1));
-        $this->setMetadata('numberFormatPrecision', mb_strlen($str) -2);
+        $this->setMetadata('numberFormatPrecision', mb_strlen($str) - 2);
     }
 }

programs/ui/ui.helpers.php

Indentation +258 added lines, -258 removed lines

@@ -33,50 +33,50 @@ 
  */
 function app_genericSetEditor(ORM_RecordSet $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 ORM_DateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORM_RecordSet) {
-				$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 ORM_DateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORM_RecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -89,50 +89,50 @@ 
  */
 function app_genericSetFilterForm(ORM_RecordSet $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 ORM_DateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORM_RecordSet) {
-			$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 ORM_DateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORM_RecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -145,47 +145,47 @@ 
  */
 function app_LabelledWidget($labelText, Widget_Displayable_Interface $widget)
 {
-	$W = bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof Widget_InputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof Widget_CheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(Widget_SizePolicy::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 Widget_InputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof Widget_CheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(Widget_SizePolicy::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(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -193,42 +193,42 @@ 
 
 function app_LabelledOrmSelect(ORM_MysqlIterator $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);
 }
 
 
@@ -236,106 +236,106 @@ 
 
 function app_OrmWidget(ORM_Field $field)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
 
-	if ($field instanceof ORM_DateField) {
-		$widget = $W->DatePicker();
-	} else if ($field instanceof ORM_TimeField) {
-		$widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORM_EnumField) {
-		$widget = $W->Select();
+    if ($field instanceof ORM_DateField) {
+        $widget = $W->DatePicker();
+    } else if ($field instanceof ORM_TimeField) {
+        $widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORM_EnumField) {
+        $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 ORM_SetField) {
-		$widget = $W->MultiSelect()->setSelectedList(2);
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORM_UserField) {
-	    $widget = $W->SuggestUser()
-    	    ->setMinChars(0)
-    	    ->setSizePolicy(Func_Icons::ICON_LEFT_16);
-	} else if ($field instanceof ORM_CurrencyField) {
-		$widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
-	} else if ($field instanceof ORM_BoolField) {
-		$widget = $W->CheckBox()->setCheckedValue('1');
-	} else if ($field instanceof ORM_IntField) {
-		$widget = $W->LineEdit()
-						->setSize(6)->addClass('widget-input-numeric');
-	} else if ($field instanceof ORM_EmailField) {
-		$widget = $W->EmailLineEdit()
-						->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_FileField) {
-	    $widget = $W->FilePicker();
-	} else if ($field instanceof ORM_StringField) {
-		$widget = $W->LineEdit()
-			->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_TextField) {
-		$widget = $W->TextEdit()
-		  ->addClass('widget-autoresize');
-	} else if ($field instanceof ORM_PkField) {
-	    $widget = $W->Hidden();
-	} else if ($field instanceof ORM_FkField) {
-		$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 ORM_RecordSet) {
-		$widget = $W->Select();
+        $widget->addOption('', '');
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_SetField) {
+        $widget = $W->MultiSelect()->setSelectedList(2);
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_UserField) {
+        $widget = $W->SuggestUser()
+            ->setMinChars(0)
+            ->setSizePolicy(Func_Icons::ICON_LEFT_16);
+    } else if ($field instanceof ORM_CurrencyField) {
+        $widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
+    } else if ($field instanceof ORM_BoolField) {
+        $widget = $W->CheckBox()->setCheckedValue('1');
+    } else if ($field instanceof ORM_IntField) {
+        $widget = $W->LineEdit()
+                        ->setSize(6)->addClass('widget-input-numeric');
+    } else if ($field instanceof ORM_EmailField) {
+        $widget = $W->EmailLineEdit()
+                        ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_FileField) {
+        $widget = $W->FilePicker();
+    } else if ($field instanceof ORM_StringField) {
+        $widget = $W->LineEdit()
+            ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_TextField) {
+        $widget = $W->TextEdit()
+            ->addClass('widget-autoresize');
+    } else if ($field instanceof ORM_PkField) {
+        $widget = $W->Hidden();
+    } else if ($field instanceof ORM_FkField) {
+        $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 ORM_RecordSet) {
+        $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(ORM_Field $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);
 }
 
 
@@ -351,16 +351,16 @@ 
  */
 function app_dateTime(ORM_Field $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
+    );
 
 }
 
@@ -374,24 +374,24 @@ 
  */
 function app_dateTimeField($fieldName, Widget_Label $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;
 }
 
 

programs/app.php

Spacing +7 added lines, -7 removed lines

@@ -125,7 +125,7 @@ 
      */
     public static function register()
     {
-        require_once $GLOBALS['babInstallPath'].'utilit/functionalityincl.php';
+        require_once $GLOBALS['babInstallPath'] . 'utilit/functionalityincl.php';
         $functionalities = new bab_functionalities();
 
         $addon = bab_getAddonInfosInstance('libapp');
@@ -149,7 +149,7 @@ 
             return null;
         }
 
-        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        require_once $GLOBALS['babInstallPath'] . 'utilit/devtools.php';
         $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
         $sql = 'SET FOREIGN_KEY_CHECKS=0;
             ';
@@ -187,7 +187,7 @@ 
             }
         }
 
-        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        require_once $GLOBALS['babInstallPath'] . 'utilit/devtools.php';
         $synchronize = new bab_synchronizeSql();
 
         $synchronize->fromSqlString($sql);
@@ -203,7 +203,7 @@ 
             return null;
         }
 
-        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        require_once $GLOBALS['babInstallPath'] . 'utilit/devtools.php';
         $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
         $sql = '';
 
@@ -694,7 +694,7 @@ 
     public function Controller()
     {
         $this->includeController();
-        return bab_getInstance($this->classPrefix.'Controller')->setApp($this);
+        return bab_getInstance($this->classPrefix . 'Controller')->setApp($this);
     }
 
 
@@ -734,7 +734,7 @@ 
     public function Ui()
     {
         $this->includeUi();
-        return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this);
+        return bab_getInstance($this->classPrefix . 'Ui'); //->setApp($this);
     }
 
 
@@ -756,7 +756,7 @@ 
      */
     public function getUploadPath()
     {
-        require_once $GLOBALS['babInstallPath'].'utilit/path.class.php';
+        require_once $GLOBALS['babInstallPath'] . 'utilit/path.class.php';
         return new bab_Path(bab_getAddonInfosInstance($this->getAddonName())->getUploadPath());
     }
 

programs/record.class.php

Spacing +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
         $setName = $fkField->getForeignSetName();
 
         if (!$setName || 'Set' === $setName) {
-            throw new Exception('The set name is missing on foreign key field '.$fkFieldName);
+            throw new Exception('The set name is missing on foreign key field ' . $fkFieldName);
         }
 
         list($prefix, $appSetName) = $this->extractSetPrefixAndName($setName);
@@ -175,7 +175,7 @@ 
     {
         $App = $this->App();
 
-        $customFieldSet= $App->CustomFieldSet();
+        $customFieldSet = $App->CustomFieldSet();
         $object = mb_substr(get_class($this), mb_strlen($App->classPrefix), -mb_strlen('Set'));
 
         $customFields = $customFieldSet->select($customFieldSet->object->is($object));
@@ -262,7 +262,7 @@ 
      */
     public function isReadable()
     {
-        bab_debug('The query in '.get_class($this).' use the default isReadable() method: none()');
+        bab_debug('The query in ' . get_class($this) . ' use the default isReadable() method: none()');
         return $this->none();
     }
 
@@ -650,13 +650,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']);
 

programs/customsection.class.php

Spacing +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
             if (empty($rawField)) {
                 continue;
             }
-            list($fieldName, ) = explode(':', $rawField);
+            list($fieldName,) = explode(':', $rawField);
 
             if ($removedFieldName == $fieldName) {
                 continue;

programs/record.ctrl.php

Indentation +1 added lines, -1 removed lines

@@ -1642,7 +1642,7 @@
             $W->SubmitButton()
                 ->setAjaxAction($confirmedAction)
                 ->setLabel($App->translate('Delete'))
-         );
+            );
         $form->addButton($W->SubmitButton()->setLabel($App->translate('Cancel'))->addClass('widget-close-dialog'));
         $page->addItem($form);
 

Spacing +16 added lines, -16 removed lines

@@ -103,7 +103,7 @@ 
             if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() .  '"href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon ' . $actions->getIcon() . '"href="' . $actions->url() . '">' . $text . '</a></li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -142,7 +142,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname =  $recordClassname . 'TableView';
+        $viewClassname = $recordClassname . 'TableView';
         if (method_exists($Ui, $viewClassname)) {
             $types['table'] = array(
                 'classname' => $viewClassname,
@@ -151,7 +151,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CardsView';
+        $viewClassname = $recordClassname . 'CardsView';
         if (method_exists($Ui, $viewClassname)) {
             $types['cards'] = array(
                 'classname' => $viewClassname,
@@ -160,7 +160,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'MapView';
+        $viewClassname = $recordClassname . 'MapView';
         if (method_exists($Ui, $viewClassname)) {
             $types['map'] = array(
                 'classname' => $viewClassname,
@@ -256,7 +256,7 @@ 
         bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE);
 
         foreach ($availableFields as $field) {
-            $fieldName =  $field['name'];
+            $fieldName = $field['name'];
             $fieldDescription = $field['description'];
 
             $used = isset($allViewFieldNames[$fieldName]);
@@ -450,7 +450,7 @@ 
         $nbCol = 0;
         foreach ($customSections as $customSection) {
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
 //             if ($currentColumn + $nbCol > 12) {
 //                 $sectionsSection->addItem($row);
@@ -507,7 +507,7 @@ 
                 }
 
                 $fieldItem = $W->FlowItems(
-                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-80pc' ),
+                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-80pc'),
                     $W->FlowItems(
                         $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($field['name']),
                         $W->Link('', $this->proxy()->editDisplayField($customSection->id, $field['name']))
@@ -516,7 +516,7 @@ 
                         $W->Link('', $this->proxy()->removeDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_LIST_REMOVE)
                             ->setAjaxAction()
-                    )->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-20pc widget-align-right widget-actions' )
+                    )->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-20pc widget-align-right widget-actions')
                 )->setSizePolicy('widget-list-element  widget-actions-target');
 
                 $sectionBox->addItem($fieldItem);
@@ -589,7 +589,7 @@ 
         }
 
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $objectName . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n");
+        header('Content-Disposition: attachment; filename="' . $objectName . '.' . ($view === '' ? 'default' : $view) . '.json"' . "\n");
 
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8);
@@ -833,7 +833,7 @@ 
         $recordSet = $this->getEditRecordSet();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname . 'SectionEditor';
         /* @var $editor app_RecordEditor */
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
@@ -914,16 +914,16 @@ 
 
         switch ($type) {
             case 'cards':
-                $tableviewClassname =  $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname . 'CardsView';
                 break;
 
             case 'map':
-                $tableviewClassname =  $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname . 'MapView';
                 break;
 
             case 'table':
             default:
-                $tableviewClassname =  $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname . 'TableView';
                 break;
         }
 
@@ -989,7 +989,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'Editor';
+        $editorClassname = $recordClassname . 'Editor';
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
             $itemId = $this->getClass() . '.' . __FUNCTION__;
@@ -1037,7 +1037,7 @@ 
                     $W->Link(
                         '',
                         $proxy->setFilteredViewType($tableView->getId(), $viewTypeId)
-                    )->addClass('icon', $viewType['icon'] . ($filteredViewType=== $viewTypeId ? ' active' : ''))
+                    )->addClass('icon', $viewType['icon'] . ($filteredViewType === $viewTypeId ? ' active' : ''))
 //                    ->setSizePolicy('btn btn-xs btn-default ' . ($filteredViewType === $viewTypeId ? 'active' : ''))
                     ->setTitle($viewType['label'])
                     ->setAjaxAction()
@@ -1307,7 +1307,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname . 'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);