capwelton / libapp

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 +24 added lines, -24 removed lines

@@ -26,7 +26,7 @@ 
 bab_Widgets()->includePhpClass('widget_InputWidget');
 bab_Widgets()->includePhpClass('widget_TableModelView');
 
-require_once dirname(__FILE__) . '/ui.helpers.php';
+require_once dirname(__FILE__).'/ui.helpers.php';
 
 /**
  * @return Widget_Form
@@ -669,7 +669,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -697,7 +697,7 @@ 
                 $parameters = $displayField['parameters'];
                 $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
                 $label = isset($parameters['label']) && $parameters['label'] !== '__' ? $parameters['label'] : '';
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
 
                 if (method_exists($this, $displayFieldMethod)) {
                     $widget = $this->$displayFieldMethod($customSection);
@@ -724,7 +724,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -757,7 +757,7 @@ 
             $parameters = $displayField['parameters'];
             $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
             $label = isset($parameters['label']) && $parameters['label'] !== '__' ? $parameters['label'] : '';
-            $displayFieldMethod = '_' . $displayFieldName;
+            $displayFieldMethod = '_'.$displayFieldName;
 
             if (method_exists($this, $displayFieldMethod)) {
                 $widget = $this->$displayFieldMethod($customSection);
@@ -996,7 +996,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);
@@ -1023,7 +1023,7 @@ 
                 $parameters = $displayField['parameters'];
                 $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
                 $label = isset($parameters['label']) ? $parameters['label'] : '';
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
 
                 if (method_exists($this, $displayFieldMethod)) {
                     $value = $this->$displayFieldMethod($customSection);
@@ -1048,7 +1048,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -1070,14 +1070,14 @@ 
 
     $fileSize = filesize($file->getFilePath()->tostring());
     if ($fileSize > 1024 * 1024) {
-        $fileSizeText = round($fileSize / (1024 * 1024), 1) . ' ' . $App->translate('MB');
+        $fileSizeText = round($fileSize / (1024 * 1024), 1).' '.$App->translate('MB');
     } elseif ($fileSize > 1024) {
-        $fileSizeText = round($fileSize / 1024) . ' ' . $App->translate('KB');
+        $fileSizeText = round($fileSize / 1024).' '.$App->translate('KB');
     } else {
-        $fileSizeText = $fileSize . ' ' . $App->translate('Bytes');
+        $fileSizeText = $fileSize.' '.$App->translate('Bytes');
     }
 
-    $fileIcon = $W->FileIcon($file->toString() . "\n" . $fileSizeText, $file->getFilePath())
+    $fileIcon = $W->FileIcon($file->toString()."\n".$fileSizeText, $file->getFilePath())
         ->setThumbnailSize($width, $height);
 
     return $fileIcon;
@@ -1140,7 +1140,7 @@ 
             // we try to select one according to the classname prefix.
             list($prefix) = explode('_', get_class($this));
             $functionalityName = ucwords($prefix);
-            $this->app = @bab_functionality::get('App/' . $functionalityName);
+            $this->app = @bab_functionality::get('App/'.$functionalityName);
             if (!$this->app) {
                 $this->app = @bab_functionality::get('App');
             }
@@ -1201,7 +1201,7 @@ 
         $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
 
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }
@@ -1353,11 +1353,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;
             }
 
@@ -1374,7 +1374,7 @@ 
 
                 $formItem = $this->handleFilterLabel($label, $input);
                 $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12');
-                $formItem->addClass('field_' . $fieldName);
+                $formItem->addClass('field_'.$fieldName);
 
                 $mainSearch = (method_exists($column, 'isMainSearch') && $column->isMainSearch());
 
@@ -1387,7 +1387,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Filter'));
         }
@@ -1460,7 +1460,7 @@ 
 //        $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
 
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }
@@ -1525,7 +1525,7 @@ 
 
     $tableview->setCurrentPage(isset($filterValues['pageNumber']) ? $filterValues['pageNumber'] : 0);
 
-    $tableview->sortParameterName = $name . '[filter][sort]';
+    $tableview->sortParameterName = $name.'[filter][sort]';
 
     if (isset($filterValues['sort'])) {
         $tableview->setSortField($filterValues['sort']);
@@ -1811,7 +1811,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1853,7 +1853,7 @@ 
                 $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
                 $label = isset($parameters['label']) ? $parameters['label'] : null;
 
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $label);
                 } else {
@@ -1882,7 +1882,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -1996,7 +1996,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;

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

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORM_DateField) {
 			$widget = $W->DatePicker();
@@ -103,7 +103,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORM_DateField) {
 			$widget = $W->PeriodPicker();
@@ -206,7 +206,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/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 +38 added lines, -38 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/controller.class.php';
+require_once dirname(__FILE__).'/controller.class.php';
 
 
 
@@ -52,7 +52,7 @@ 
     {
         $App = $this->App();
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -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'];
@@ -116,10 +116,10 @@ 
             if (isset($actions['icon'])) {
 
                 $html = '<li class="dropdown">'
-                    . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
+                    . '<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
                     . ($actions['icon'] === 'actions-context-menu'/*Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>')
                     . '</a>'
-                    . '<ul class="dropdown-menu dropdown-menu-right ' . Func_Icons::ICON_LEFT_SYMBOLIC . '">'
+                    . '<ul class="dropdown-menu dropdown-menu-right '.Func_Icons::ICON_LEFT_SYMBOLIC.'">'
                     . $html
                     . '</ul>';
             }
@@ -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,
@@ -232,7 +232,7 @@ 
         foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
             foreach ($fields as $field) {
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
             }
         }
 
@@ -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);
@@ -461,8 +461,8 @@ 
             $currentColumn += $nbCol;
 
             $sectionSection = $W->Section(
-                $customSection->name . ' (' . $customSection->rank . ')',
-                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#' . $customSection->id))
+                $customSection->name.' ('.$customSection->rank.')',
+                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#'.$customSection->id))
 //                     ->addClass('widget-dockable-content')
             );
             $sectionSection->addClass('crm-custom-section');
@@ -507,16 +507,16 @@ 
                 }
 
                 $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->Hidden()->setName($customSection->id.'.'.$fieldId)->setValue($field['name']),
                         $W->Link('', $this->proxy()->editDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_DOCUMENT_EDIT)
                             ->setOpenMode(Widget_Link::OPEN_DIALOG),
                         $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,11 +833,11 @@ 
         $recordSet = $this->getEditRecordSet();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         /* @var $editor app_RecordEditor */
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '.' . __FUNCTION__;
+            $itemId = $this->getClass().'.'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -880,7 +880,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '.modelView';
+            $itemId = $this->getClass().'.modelView';
         }
 
         return $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,10 +989,10 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -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()
@@ -1081,7 +1081,7 @@ 
 
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -1094,10 +1094,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
         if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -1111,7 +1111,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -1127,7 +1127,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -1272,14 +1272,14 @@ 
 
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, bab_charset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, bab_charset::getIso());
         }
     }
 
@@ -1307,7 +1307,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname.'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);
 
 
@@ -1470,7 +1470,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"');
+        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"');
         return $message;
     }
 
@@ -1626,7 +1626,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
 
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));

programs/customfield.class.php

Indentation +149 added lines, -149 removed lines

@@ -47,78 +47,78 @@ 
     /**
      * @param Func_App $App
      */
-	public function __construct(Func_App $App = null)
-	{
-		parent::__construct($App);
-
-		$this->setDescription('Custom field');
-
-		$this->setPrimaryKey('id');
-
-		$this->addFields(
-			ORM_StringField('name')
-				->setDescription('Name of field used for display'),
-			ORM_StringField('fieldname')
-				->setDescription('Name of field used in table, not modifiable'),
-			ORM_TextField('description')
-				->setDescription('Optional description'),
-			ORM_EnumField('object', $this->getObjects())
-				->setDescription('Name of object in App ex : Article, Contact, Organization...'),
-			ORM_EnumField('fieldtype', $this->getFieldTypes())
-				->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'),
-			ORM_TextField('enumvalues')
-				->setDescription('serialized array of values for enum fields'),
-			ORM_BoolField('mandatory')
-				->setDescription('Mandatory')
-		);
-
-		if ($App->onlineShop) {
-			$this->addFields(
-				ORM_BoolField('visible_in_shop')
-			);
-		}
-	}
-
-
-
-	/**
-	 * List of objects where custom fields are applicable.
-	 *
-	 * @return string[]
-	 */
-	public function getObjects()
-	{
-		$App = $this->App();
-
-		$arr = array();
-
-		if (isset($App->Article)) {
-			$arr['Article'] = $App->translate('Products database');
-		}
-
-		return $arr;
-	}
-
-	/**
-	 * list of ORM fields to use for a custom field
-	 */
-	public function getFieldTypes()
-	{
-		$App = $this->App();
-
-		return array(
-			'String' 	=> $App->translate('Line edit'),
-			'Text'		=> $App->translate('Text edit'),
-			'Bool'		=> $App->translate('Checkbox'),
-			'Int'		=> $App->translate('Integer number'),
-			'Decimal'	=> $App->translate('Decimal number'),
-			'Date'		=> $App->translate('Date'),
-			'DateTime'	=> $App->translate('Date and time'),
-			'Enum' 		=> $App->translate('Selection list'),
-			'Url' 		=> $App->translate('Url'),
-			'Email' 	=> $App->translate('Email address'),
-		);
-	}
+    public function __construct(Func_App $App = null)
+    {
+        parent::__construct($App);
+
+        $this->setDescription('Custom field');
+
+        $this->setPrimaryKey('id');
+
+        $this->addFields(
+            ORM_StringField('name')
+                ->setDescription('Name of field used for display'),
+            ORM_StringField('fieldname')
+                ->setDescription('Name of field used in table, not modifiable'),
+            ORM_TextField('description')
+                ->setDescription('Optional description'),
+            ORM_EnumField('object', $this->getObjects())
+                ->setDescription('Name of object in App ex : Article, Contact, Organization...'),
+            ORM_EnumField('fieldtype', $this->getFieldTypes())
+                ->setDescription('Name of ORM field ex : Enum, String, Text, Bool...'),
+            ORM_TextField('enumvalues')
+                ->setDescription('serialized array of values for enum fields'),
+            ORM_BoolField('mandatory')
+                ->setDescription('Mandatory')
+        );
+
+        if ($App->onlineShop) {
+            $this->addFields(
+                ORM_BoolField('visible_in_shop')
+            );
+        }
+    }
+
+
+
+    /**
+     * List of objects where custom fields are applicable.
+     *
+     * @return string[]
+     */
+    public function getObjects()
+    {
+        $App = $this->App();
+
+        $arr = array();
+
+        if (isset($App->Article)) {
+            $arr['Article'] = $App->translate('Products database');
+        }
+
+        return $arr;
+    }
+
+    /**
+     * list of ORM fields to use for a custom field
+     */
+    public function getFieldTypes()
+    {
+        $App = $this->App();
+
+        return array(
+            'String' 	=> $App->translate('Line edit'),
+            'Text'		=> $App->translate('Text edit'),
+            'Bool'		=> $App->translate('Checkbox'),
+            'Int'		=> $App->translate('Integer number'),
+            'Decimal'	=> $App->translate('Decimal number'),
+            'Date'		=> $App->translate('Date'),
+            'DateTime'	=> $App->translate('Date and time'),
+            'Enum' 		=> $App->translate('Selection list'),
+            'Url' 		=> $App->translate('Url'),
+            'Email' 	=> $App->translate('Email address'),
+        );
+    }
 
     /**
      * @return ORM_Criteria
@@ -183,7 +183,7 @@ 
             case 'Bool':
                 $field = ORM_BoolField($this->fieldname);
                 $field->setOutputOptions(
-                       $this->App()->translate('No'),
+                        $this->App()->translate('No'),
                     $this->App()->translate('Yes')
                 );
                 break;
@@ -200,80 +200,80 @@ 
     }
 
 
-	/**
-	 * @return string[]
-	 */
-	public function getEnumValues()
-	{
-	    return unserialize($this->enumvalues);
-	}
-
-
-	/**
-	 * @return Widget_LabelledWidget
-	 */
-	public function getWidget()
-	{
-		$W = bab_Widgets();
-		$App = $this->App();
-
-		switch ($this->fieldtype) {
-			case 'Text':
-				$widget = $W->TextEdit()->setLines(3)->setColumns(70);
-				break;
-
-			case 'Bool':
-				$widget = $W->Checkbox();
-				break;
-
-			case 'Enum':
-				$options = array('' => '') + $this->getEnumValues();
-				$widget = $W->Select()->setOptions($options);
-				break;
-
-			case 'Date':
-				$widget = $W->DatePicker();
-				break;
-
-			case 'DateTime':
-				$widget = $W->DateTimePicker();
-				break;
-
-			case 'Int':
-				$widget = $W->RegExpLineEdit();
-				$widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT)
-					->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name))
-					->setSize(10);
-				break;
-
-			case 'Decimal':
-				$widget = $W->RegExpLineEdit();
-				$widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT)
-					->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name))
-					->setSize(10);
-				break;
-
-			case 'Url':
-				$widget = $W->UrlLineEdit();
-				break;
-
-			case 'Email':
-				$widget = $W->EmailLineEdit();
-				break;
-
-			default:
-			case 'String':
-				$widget = $W->LineEdit()->setSize(70)->setMaxSize(255);
-				break;
-		}
-
-		$labelledItem = $W->LabelledWidget($this->name, $widget, null);
-		$labelledItem->setName($this->fieldname);
-
-		if (!empty($this->description)) {
-			$labelledItem->setDescription($this->description);
-		}
-
-		return $labelledItem;
-	}
+    /**
+     * @return string[]
+     */
+    public function getEnumValues()
+    {
+        return unserialize($this->enumvalues);
+    }
+
+
+    /**
+     * @return Widget_LabelledWidget
+     */
+    public function getWidget()
+    {
+        $W = bab_Widgets();
+        $App = $this->App();
+
+        switch ($this->fieldtype) {
+            case 'Text':
+                $widget = $W->TextEdit()->setLines(3)->setColumns(70);
+                break;
+
+            case 'Bool':
+                $widget = $W->Checkbox();
+                break;
+
+            case 'Enum':
+                $options = array('' => '') + $this->getEnumValues();
+                $widget = $W->Select()->setOptions($options);
+                break;
+
+            case 'Date':
+                $widget = $W->DatePicker();
+                break;
+
+            case 'DateTime':
+                $widget = $W->DateTimePicker();
+                break;
+
+            case 'Int':
+                $widget = $W->RegExpLineEdit();
+                $widget->setRegExp(Widget_RegExpLineEdit::INT_FORMAT)
+                    ->setSubmitMessage(sprintf($App->translate('The field %s should be a integer number'), $this->name))
+                    ->setSize(10);
+                break;
+
+            case 'Decimal':
+                $widget = $W->RegExpLineEdit();
+                $widget->setRegExp(Widget_RegExpLineEdit::FLOAT_FORMAT)
+                    ->setSubmitMessage(sprintf($App->translate('The field %s should be a decimal number'), $this->name))
+                    ->setSize(10);
+                break;
+
+            case 'Url':
+                $widget = $W->UrlLineEdit();
+                break;
+
+            case 'Email':
+                $widget = $W->EmailLineEdit();
+                break;
+
+            default:
+            case 'String':
+                $widget = $W->LineEdit()->setSize(70)->setMaxSize(255);
+                break;
+        }
+
+        $labelledItem = $W->LabelledWidget($this->name, $widget, null);
+        $labelledItem->setName($this->fieldname);
+
+        if (!empty($this->description)) {
+            $labelledItem->setDescription($this->description);
+        }
+
+        return $labelledItem;
+    }
 }

programs/customfield.ctrl.php

Indentation +88 added lines, -88 removed lines

@@ -94,13 +94,13 @@ 
 
 
 
-	/**
-	 * @return Widget_Page
-	 */
-	public function edit($customfield = null)
-	{
-		$W = bab_Widgets();
-		$App = $this->App();
+    /**
+     * @return Widget_Page
+     */
+    public function edit($customfield = null)
+    {
+        $W = bab_Widgets();
+        $App = $this->App();
 // 		$access = $Crm->Access();
 
 // 		if (!$access->viewShopAdmin()) {
@@ -109,134 +109,134 @@ 
 
 // 		crm_BreadCrumbs::setCurrentPosition($this->proxy()->edit($customfield), $Crm->translate('Edit custom field'));
 
-		/* @var $Ui app_Ui */
-		$Ui = $App->Ui();
-		$page = $Ui->Page();
+        /* @var $Ui app_Ui */
+        $Ui = $App->Ui();
+        $page = $Ui->Page();
 
-		$page->addClass('app-page-editor');
-		$page->setTitle($App->translate('Edit custom field'));
+        $page->addClass('app-page-editor');
+        $page->setTitle($App->translate('Edit custom field'));
 
-		if (null !== $customfield) {
-		    $set = $App->CustomFieldSet();
-			$customfield = $set->request($customfield);
-		}
+        if (null !== $customfield) {
+            $set = $App->CustomFieldSet();
+            $customfield = $set->request($customfield);
+        }
 
 
 
-		$form = $Ui->CustomFieldEditor($customfield);
+        $form = $Ui->CustomFieldEditor($customfield);
 
-		$page->addItem($form);
+        $page->addItem($form);
 
-		if ($customfield instanceof app_CustomField) {
-			$actionsFrame = $page->ActionsFrame();
-			$page->addContextItem($actionsFrame);
+        if ($customfield instanceof app_CustomField) {
+            $actionsFrame = $page->ActionsFrame();
+            $page->addContextItem($actionsFrame);
 
-			$actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));
-		}
+            $actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));
+        }
 
-		return $page;
-	}
+        return $page;
+    }
 
 
-	/**
-	 * @return bool
-	 */
-	public function save($customfield = null)
-	{
-	    $App = $this->App();
+    /**
+     * @return bool
+     */
+    public function save($customfield = null)
+    {
+        $App = $this->App();
 // 		$access = $Crm->Access();
 
 // 		if (!$access->viewShopAdmin()) {
 // 			throw new crm_AccessException($Crm->translate('Access denied to online shop administration'));
 // 		}
 
-	    $set = $App->CustomFieldSet();
+        $set = $App->CustomFieldSet();
 
-		if (empty($customfield['id'])) {
-			$record = $set->newRecord();
-		} else {
-			$record = $set->get($customfield['id']);
+        if (empty($customfield['id'])) {
+            $record = $set->newRecord();
+        } else {
+            $record = $set->get($customfield['id']);
 // 			if (null == $record) {
 // 				throw new crm_SaveException($Crm->translate('This custom field does not exists'));
 // 			}
-		}
+        }
 
-		if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {
-		    $enumvalues = array();
-		    foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {
-		        $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);
-		    }
-			$record->enumvalues = serialize($enumvalues);
-		} else {
-			$record->enumvalues = '';
-		}
+        if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {
+            $enumvalues = array();
+            foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {
+                $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);
+            }
+            $record->enumvalues = serialize($enumvalues);
+        } else {
+            $record->enumvalues = '';
+        }
 
-		unset($customfield['enumvalues']);
-		$record->setFormInputValues($customfield);
+        unset($customfield['enumvalues']);
+        $record->setFormInputValues($customfield);
 
 
-		$record->save();
+        $record->save();
 
 
-		// refresh target table structure
+        // refresh target table structure
 
-		$object = $record->object.'Set';
-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
+        $object = $record->object.'Set';
+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
 
-		$recordSet = $App->$object();
-		if (method_exists($recordSet, 'useLang')) {
-		    // This is necessary if the recordSet constructor uses a setLang().
-		    // We need to revert to multilang fields before synchronizing.
-		    $recordSet->useLang(false);
-		}
+        $recordSet = $App->$object();
+        if (method_exists($recordSet, 'useLang')) {
+            // This is necessary if the recordSet constructor uses a setLang().
+            // We need to revert to multilang fields before synchronizing.
+            $recordSet->useLang(false);
+        }
 
-		$sql = $mysqlbackend->setToSql($recordSet);
+        $sql = $mysqlbackend->setToSql($recordSet);
 
-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
-		$synchronize = new bab_synchronizeSql();
-		$synchronize->fromSqlString($sql);
+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        $synchronize = new bab_synchronizeSql();
+        $synchronize->fromSqlString($sql);
 
-		return true;
-	}
+        return true;
+    }
 
 
     /**
      * {@inheritDoc}
      * @see app_CtrlRecord::delete()
      */
-	public function delete($customfield)
-	{
-	    $App = $this->App();
+    public function delete($customfield)
+    {
+        $App = $this->App();
 // 		$access = $Crm->Access();
 
 // 		if (!$access->viewShopAdmin()) {
 // 			throw new crm_AccessException($Crm->translate('Access denied to online shop administration'));
 // 		}
 
-		if (!$customfield)
-		{
-		    throw new app_AccessException($App->translate('Access denied'));
-		}
+        if (!$customfield)
+        {
+            throw new app_AccessException($App->translate('Access denied'));
+        }
 
-		$set = $App->CustomFieldSet();
-		$record = $set->request($customfield);
-		$object = $record->object.'Set';
-		$set->delete($set->id->is($customfield));
+        $set = $App->CustomFieldSet();
+        $record = $set->request($customfield);
+        $object = $record->object.'Set';
+        $set->delete($set->id->is($customfield));
 
-		$recordSet = $App->$object();
-		if (method_exists($recordSet, 'useLang')) {
-		    // This is necessary if the recordSet constructor uses a setLang().
-		    // We need to revert to multilang fields before synchronizing.
-		    $recordSet->useLang(false);
-		}
+        $recordSet = $App->$object();
+        if (method_exists($recordSet, 'useLang')) {
+            // This is necessary if the recordSet constructor uses a setLang().
+            // We need to revert to multilang fields before synchronizing.
+            $recordSet->useLang(false);
+        }
 
-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
-		$sql = $mysqlbackend->setToSql($recordSet);
+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);
+        $sql = $mysqlbackend->setToSql($recordSet);
 
-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
-		$synchronize = new bab_synchronizeSql();
-		$synchronize->fromSqlString($sql);
+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';
+        $synchronize = new bab_synchronizeSql();
+        $synchronize->fromSqlString($sql);
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2008 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once APP_CTRL_PATH . '/record.ctrl.php';
+require_once APP_CTRL_PATH.'/record.ctrl.php';
 
 /**
  * This controller manages actions that can be performed on custom fields
@@ -39,7 +39,7 @@ 
             $W->Link(
                 $App->translate('Add a custom field'),
                 $this->proxy()->edit()
-            )->addClass('icon',  Func_Icons::ACTIONS_LIST_ADD)
+            )->addClass('icon', Func_Icons::ACTIONS_LIST_ADD)
             ->setOpenMode(Widget_Link::OPEN_DIALOG_AND_RELOAD)
         );
 

programs/functions.php

Braces +9 added lines, -3 removed lines

@@ -233,9 +233,15 @@
  */
 function app_json_encode($a)
 {
-    if (is_null($a)) return 'null';
-    if ($a === false) return 'false';
-    if ($a === true) return 'true';
+    if (is_null($a)) {
+        return 'null';
+    }
+    if ($a === false) {
+        return 'false';
+    }
+    if ($a === true) {
+        return 'true';
+    }
     if (is_scalar($a)) {
         if (is_float($a)) {
             // Always use "." for floats.

Spacing +9 added lines, -9 removed lines

@@ -112,7 +112,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>';
@@ -124,7 +124,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);
@@ -133,7 +133,7 @@ 
         }
     }
 
-    header('Location: ' . $url);
+    header('Location: '.$url);
     die;
 }
 
@@ -165,7 +165,7 @@ 
  */
 function app_fileUploadError($error)
 {
-    switch($error) {
+    switch ($error) {
         case UPLOAD_ERR_OK:
             return null;
 
@@ -244,15 +244,15 @@ 
         
         if (is_string($a)) {
             static $jsonReplaces = array(array("\\", "/", "\n", "\t", "\r", "\b", "\f", '"'), array('\\\\', '\\/', '\\n', '\\t', '\\r', '\\b', '\\f', '\"'));
-            return '"' . str_replace($jsonReplaces[0], $jsonReplaces[1], $a) . '"';
+            return '"'.str_replace($jsonReplaces[0], $jsonReplaces[1], $a).'"';
         } else {
             return $a;
         }
     }
-    require_once $GLOBALS['babInstallPath'] . 'utilit/dateTime.php';
+    require_once $GLOBALS['babInstallPath'].'utilit/dateTime.php';
     if ($a instanceof BAB_DateTime) {
         /* @var $a BAB_DateTime */
-        return 'new Date(Date.UTC(' . $a->getYear() . ',' . ($a->getMonth() - 1) . ',' . $a->getDayOfMonth() . ',' . $a->getHour() . ',' . $a->getMinute() . ',' . $a->getSecond() . ',0))';
+        return 'new Date(Date.UTC('.$a->getYear().','.($a->getMonth() - 1).','.$a->getDayOfMonth().','.$a->getHour().','.$a->getMinute().','.$a->getSecond().',0))';
     }
     if (is_object($a) && method_exists($a, 'toJson')) {
         return $a->toJson();
@@ -269,11 +269,11 @@ 
         foreach ($a as $v) {
             $result[] = app_json_encode($v);
         }
-        return '[' . join(',', $result) . ']';
+        return '['.join(',', $result).']';
     } else {
         foreach ($a as $k => $v) {
             $result[] = app_json_encode($k).':'.app_json_encode($v);
         }
-        return '{' . join(',', $result) . '}';
+        return '{'.join(',', $result).'}';
     }
 }

programs/controller.class.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
 
 class app_UnknownActionException extends Exception
 {
-	public function __construct($action, $code = 0)
-	{
-		$message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
-		parent::__construct($message, $code);
-	}
+    public function __construct($action, $code = 0)
+    {
+        $message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+        parent::__construct($message, $code);
+    }
 }
 
 

Spacing +30 added lines, -30 removed lines

@@ -21,8 +21,8 @@ 
  * @copyright Copyright (c) 2008 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once $GLOBALS['babInstallPath'] . 'utilit/controller.class.php';
-require_once dirname(__FILE__). '/functions.php';
+require_once $GLOBALS['babInstallPath'].'utilit/controller.class.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $App = app_App();
 $App->includeBase();
@@ -32,7 +32,7 @@ 
 {
 	public function __construct($action, $code = 0)
 	{
-		$message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+		$message = 'Unknown method "'.$action->getController().'::'.$action->getMethod().'"';
 		parent::__construct($message, $code);
 	}
 }
@@ -215,11 +215,11 @@ 
         // we try to select one according to the classname prefix.
         list($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
-        $App = @bab_functionality::get('App/' . $functionalityName);
+        $App = @bab_functionality::get('App/'.$functionalityName);
 
         if (!$App)
         {
-            throw new app_Exception('Faild to autodetect functionality App/' . $functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
+            throw new app_Exception('Faild to autodetect functionality App/'.$functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
         }
 
         $controller = $App->ControllerProxy($classname, $proxy);
@@ -238,9 +238,9 @@ 
     static function getProxyInstance(Func_App $App, $classname)
     {
         $class = new ReflectionClass($classname);
-        $proxyClassname = $class->name . self::PROXY_CLASS_SUFFIX;
+        $proxyClassname = $class->name.self::PROXY_CLASS_SUFFIX;
         if (!class_exists($proxyClassname)) {
-            $classStr = 'class ' . $proxyClassname . ' extends ' . $class->name . ' {' . "\n";
+            $classStr = 'class '.$proxyClassname.' extends '.$class->name.' {'."\n";
             $methods = $class->getMethods();
 
             $classStr .= '	public function __construct(Func_App $App) {
@@ -253,24 +253,24 @@ 
                 }
 
 
-                $classStr .= '	public function ' . $method->name . '(';
+                $classStr .= '	public function '.$method->name.'(';
                 $parameters = $method->getParameters();
                 $parametersStr = array();
                 foreach ($parameters as $parameter) {
 
                     if ($parameter->isDefaultValueAvailable()) {
-                        $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                        $parametersStr[] = '$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     } else {
-                        $parametersStr[] = '$' . $parameter->name;
+                        $parametersStr[] = '$'.$parameter->name;
                     }
                 }
                 $classStr .= implode(', ', $parametersStr);
-                $classStr .= ') {' . "\n";
-                $classStr .= '		$args = func_get_args();' . "\n";
-                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);' . "\n";
-                $classStr .= '	}' . "\n";
+                $classStr .= ') {'."\n";
+                $classStr .= '		$args = func_get_args();'."\n";
+                $classStr .= '		return $this->getMethodAction(__FUNCTION__, $args);'."\n";
+                $classStr .= '	}'."\n";
             }
-            $classStr .= '}' . "\n";
+            $classStr .= '}'."\n";
 
             // We define the proxy class
             eval($classStr);
@@ -394,7 +394,7 @@ 
         $action->setParameters($actionParams);
 
 
-        list(,,$file) = explode('/', $App->controllerTg);
+        list(,, $file) = explode('/', $App->controllerTg);
 
         $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
@@ -418,7 +418,7 @@ 
             return false;
         }
 
-        list($objectName, ) = explode('.', $method);
+        list($objectName,) = explode('.', $method);
 
         if (!method_exists($this, $objectName)) {
             header('HTTP/1.0 400 Bad Request');
@@ -426,7 +426,7 @@ 
         }
 
         $objectController = $this->{$objectName}(false);
-        if ( ! ($objectController instanceof app_Controller)) {
+        if (!($objectController instanceof app_Controller)) {
             return false;
         }
 
@@ -440,7 +440,7 @@ 
             } else {
                 if ($this->isAjaxRequest()) {
 
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                    header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
 
                     die(
                         bab_json_encode(
@@ -461,7 +461,7 @@ 
         } catch (app_SaveException $e) {
 
             if ($this->isAjaxRequest()) {
-                header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
                 header('Cache-Control: no-cache, must-revalidate');
                 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                 header('Content-type: application/json');
@@ -528,7 +528,7 @@ 
                         if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         } else {
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -588,7 +588,7 @@ 
     private function deletedItemPage(Widget_Action $action, app_DeletedRecordException $e)
     {
         if ($this->isAjaxRequest()) {
-            header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+            header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
             header('Cache-Control: no-cache, must-revalidate');
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Content-type: application/json');
@@ -605,7 +605,7 @@ 
                 );
 
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
 
         $App = $this->App();
         $W = bab_Widgets();
@@ -639,7 +639,7 @@ 
     private function notFoundPage(Widget_Action $action, app_NotFoundException $e)
     {
         if ($this->isAjaxRequest()) {
-            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle() . ' (' . $e->getId() . ')');
+            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle().' ('.$e->getId().')');
             $json = array(
                 'messages' => array(
                     array(
@@ -651,7 +651,7 @@ 
             echo bab_json_encode($json);
             die;
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 
@@ -671,14 +671,14 @@ 
 
     private function errorPage(Exception $e)
     {
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
 
-        require_once $GLOBALS['babInstallPath'] . 'utilit/uiutil.php';
+        require_once $GLOBALS['babInstallPath'].'utilit/uiutil.php';
         $popup = new babBodyPopup();
         $popup->babEcho(
-            '<h1>' . $this->App()->translate('There was a problem when trying to perform this operation') . '</h1>'
-            . '<h2 class="error">' . $this->App()->translate('Additional debugging information:') . '</h2>'
-            . '<p class="error">' . $e->getMessage() . ' ' .  $e->getFile() . ' ' . $e->getLine()  . ' ' . $e->getTraceAsString() . '</p>'
+            '<h1>'.$this->App()->translate('There was a problem when trying to perform this operation').'</h1>'
+            . '<h2 class="error">'.$this->App()->translate('Additional debugging information:').'</h2>'
+            . '<p class="error">'.$e->getMessage().' '.$e->getFile().' '.$e->getLine().' '.$e->getTraceAsString().'</p>'
             );
 
 

programs/link.class.php

Indentation +197 added lines, -197 removed lines

@@ -69,205 +69,205 @@
 
 
 
-	/**
-	 * @param	string	$sourceClass
-	 */
-	public function joinSource($sourceClass)
-	{
-	    if (get_class($this->sourceId) !== $sourceClass . 'Set') {
-    	    $this->hasOne('sourceId', $sourceClass . 'Set');
-    		$this->join('sourceId');
-	    }
-	}
-
-
-	/**
-	 * @param	string	$targetClass
-	 */
-	public function joinTarget($targetClass = null)
-	{
-	    if (get_class($this->targetId) !== $targetClass . 'Set') {
-    		$this->hasOne('targetId', $targetClass . 'Set');
-    		$this->join('targetId');
-	    }
-	}
-
-
-
-	public function sourceIsA($recordClass)
-	{
-		return $this->sourceClass->is($recordClass);
-	}
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
-	{
-		$criteria = $this->sourceId->is($object->id)
+    /**
+     * @param	string	$sourceClass
+     */
+    public function joinSource($sourceClass)
+    {
+        if (get_class($this->sourceId) !== $sourceClass . 'Set') {
+            $this->hasOne('sourceId', $sourceClass . 'Set');
+            $this->join('sourceId');
+        }
+    }
+
+
+    /**
+     * @param	string	$targetClass
+     */
+    public function joinTarget($targetClass = null)
+    {
+        if (get_class($this->targetId) !== $targetClass . 'Set') {
+            $this->hasOne('targetId', $targetClass . 'Set');
+            $this->join('targetId');
+        }
+    }
+
+
+
+    public function sourceIsA($recordClass)
+    {
+        return $this->sourceClass->is($recordClass);
+    }
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
+    {
+        $criteria = $this->sourceId->is($object->id)
             ->_AND_($this->sourceClass->is(get_class($object)));
 
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		if (is_a($this->targetId, 'app_TraceableRecordSet')) {
-			$criteria = $criteria->_AND_($this->targetId->deleted->is(false));
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSources($objects, $targetClass, $linkType = null)
-	{
-		$sourceClass = null;
-		$sourceIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($sourceClass)) {
-				$sourceClass = get_class($obj);
-			}
-			$sourceIds[] = $obj->id;
-		}
-		$criteria = $this->sourceId->in($sourceIds)
-			->_AND_($this->sourceClass->is($sourceClass));
-
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
-	{
-		$criteria = $this->targetId->is($object->id)
-			->_AND_($this->targetClass->is(get_class($object)));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTargets($objects, $sourceClass = null, $linkType = null)
-	{
-		$targetClass = null;
-		$targetIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($targetClass)) {
-				$targetClass = get_class($obj);
-			}
-			$targetIds[] = $obj->id;
-		}
-		$criteria = $this->targetId->in($targetIds)
-			->_AND_($this->targetClass->is($targetClass));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-
-	/**
-	 * delete all links to an object
-	 *
-	 * @param	app_Record		$object
-	 * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
-	 * @param	bool			$deleteTarget	if set to true, the target will be deleted to
-	 */
-	public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
-	{
-		$set = clone $this;
-		$App = $object->App();
-
-		$criteria = $set->sourceId->is($object->id)->_AND_(
-			$set->sourceClass->is(get_class($object))
-		);
-
-		if (null !== $targetClass) {
-			$criteria = $criteria->_AND_(
-				$set->targetClass->is($targetClass)
-			);
-		}
-		if (null !== $linkType) {
-			$criteria = $criteria->_AND_(
-				$set->type->is($linkType)
-			);
-		}
-
-		if ($deleteTarget) {
-			foreach($set->select($criteria) as $link) {
-
-				$className = $link->targetClass.'Set';
-
-				// remove prefix
-
-				$className = mb_substr($className, 1 + mb_strpos($className, '_'));
-				$targetSet = $App->$className();
-
-				$targetSet->delete($targetSet->id->is($link->targetId));
-			}
-		}
-
-		return $set->delete($criteria);
-	}
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        if (is_a($this->targetId, 'app_TraceableRecordSet')) {
+            $criteria = $criteria->_AND_($this->targetId->deleted->is(false));
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSources($objects, $targetClass, $linkType = null)
+    {
+        $sourceClass = null;
+        $sourceIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($sourceClass)) {
+                $sourceClass = get_class($obj);
+            }
+            $sourceIds[] = $obj->id;
+        }
+        $criteria = $this->sourceId->in($sourceIds)
+            ->_AND_($this->sourceClass->is($sourceClass));
+
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
+    {
+        $criteria = $this->targetId->is($object->id)
+            ->_AND_($this->targetClass->is(get_class($object)));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTargets($objects, $sourceClass = null, $linkType = null)
+    {
+        $targetClass = null;
+        $targetIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($targetClass)) {
+                $targetClass = get_class($obj);
+            }
+            $targetIds[] = $obj->id;
+        }
+        $criteria = $this->targetId->in($targetIds)
+            ->_AND_($this->targetClass->is($targetClass));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+
+    /**
+     * delete all links to an object
+     *
+     * @param	app_Record		$object
+     * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
+     * @param	bool			$deleteTarget	if set to true, the target will be deleted to
+     */
+    public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
+    {
+        $set = clone $this;
+        $App = $object->App();
+
+        $criteria = $set->sourceId->is($object->id)->_AND_(
+            $set->sourceClass->is(get_class($object))
+        );
+
+        if (null !== $targetClass) {
+            $criteria = $criteria->_AND_(
+                $set->targetClass->is($targetClass)
+            );
+        }
+        if (null !== $linkType) {
+            $criteria = $criteria->_AND_(
+                $set->type->is($linkType)
+            );
+        }
+
+        if ($deleteTarget) {
+            foreach($set->select($criteria) as $link) {
+
+                $className = $link->targetClass.'Set';
+
+                // remove prefix
+
+                $className = mb_substr($className, 1 + mb_strpos($className, '_'));
+                $targetSet = $App->$className();
+
+                $targetSet->delete($targetSet->id->is($link->targetId));
+            }
+        }
+
+        return $set->delete($criteria);
+    }
 
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -74,8 +74,8 @@ 
 	 */
 	public function joinSource($sourceClass)
 	{
-	    if (get_class($this->sourceId) !== $sourceClass . 'Set') {
-    	    $this->hasOne('sourceId', $sourceClass . 'Set');
+	    if (get_class($this->sourceId) !== $sourceClass.'Set') {
+    	    $this->hasOne('sourceId', $sourceClass.'Set');
     		$this->join('sourceId');
 	    }
 	}
@@ -86,8 +86,8 @@ 
 	 */
 	public function joinTarget($targetClass = null)
 	{
-	    if (get_class($this->targetId) !== $targetClass . 'Set') {
-    		$this->hasOne('targetId', $targetClass . 'Set');
+	    if (get_class($this->targetId) !== $targetClass.'Set') {
+    		$this->hasOne('targetId', $targetClass.'Set');
     		$this->join('targetId');
 	    }
 	}
@@ -253,7 +253,7 @@ 
 		}
 
 		if ($deleteTarget) {
-			foreach($set->select($criteria) as $link) {
+			foreach ($set->select($criteria) as $link) {
 
 				$className = $link->targetClass.'Set';