capwelton / libapp

programs/customsection.ctrl.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  */

 

 

-require_once APP_CTRL_PATH . '/record.ctrl.php';

+require_once APP_CTRL_PATH.'/record.ctrl.php';

 

 

 /**

@@ -74,7 +74,7 @@ 
         $box = $W->VBoxItems();

 

         foreach ($availableFields as $field) {

-            $fieldName =  $field['name'];

+            $fieldName = $field['name'];

             $fieldDescription = $field['description'];

             if (substr($fieldName, 0, 1) !== '_') {

                 $fieldDescription = $App->translate($fieldDescription);

@@ -280,7 +280,7 @@ 
         $recordSet = $this->getRecordSet();

         $record = $recordSet->request($id);

 

-        $object = $record->object . 'Set';

+        $object = $record->object.'Set';

 

         $objectRecordSet = $App->$object();

 

@@ -354,7 +354,7 @@ 
         $recordSet = $this->getRecordSet();

         $record = $recordSet->request($data['id']);

 

-        $object = $record->object . 'Set';

+        $object = $record->object.'Set';

 

         $objectRecordSet = $App->$object();

 

programs/ui/ui.helpers.php

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

Indentation +260 added lines, -260 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,108 +236,108 @@ 
 
 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_DatetimeField) {
-	    $widget = $W->DateTimePicker(); //->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_DatetimeField) {
+        $widget = $W->DateTimePicker(); //->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);
 }
 
 
@@ -353,16 +353,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
+    );
 
 }
 
@@ -376,24 +376,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/ui/ui.class.php

Spacing +4 added lines, -4 removed lines

@@ -34,13 +34,13 @@ 
      */
     public function includeBase()
     {
-        require_once APP_UI_PATH . 'base.ui.php';
-        require_once APP_UI_PATH . 'ui.helpers.php';
+        require_once APP_UI_PATH.'base.ui.php';
+        require_once APP_UI_PATH.'ui.helpers.php';
     }
 
     public function includePage()
     {
-        require_once APP_UI_PATH . 'page.class.php';
+        require_once APP_UI_PATH.'page.class.php';
     }
 
     /**
@@ -77,7 +77,7 @@ 
      */
     public function ExportSelectEditor($id, app_TableModelView $tableview, $filter = null)
     {
-        require_once dirname(__FILE__) . '/exportselect.ui.php';
+        require_once dirname(__FILE__).'/exportselect.ui.php';
         return new app_ExportSelectEditor($this->App(), $id, $tableview, $filter);
     }
 }
\ No newline at end of file

programs/init.php

Spacing +2 added lines, -2 removed lines

@@ -23,12 +23,12 @@
 
 
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)
 {
-    require_once dirname(__FILE__) . '/app.php';
+    require_once dirname(__FILE__).'/app.php';
     Func_App::register();
 
     $App = app_App();

programs/customsection.class.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  */
 
 
-require_once APP_SET_PATH . 'traceablerecord.class.php';
+require_once APP_SET_PATH.'traceablerecord.class.php';
 
 
 /**
@@ -317,9 +317,9 @@ 
         if (is_array($parameters)) {
             $params = array();
             foreach ($parameters as $key => $value) {
-                $params[] = $key . '=' . $value;
+                $params[] = $key.'='.$value;
             }
-            $rawField .= ':' . implode(';', $params);
+            $rawField .= ':'.implode(';', $params);
         }
         array_push($rawFields, $rawField);
         $this->fields = implode(',', $rawFields);
@@ -338,7 +338,7 @@ 
             if (empty($rawField)) {
                 continue;
             }
-            list($fieldName, ) = explode(':', $rawField);
+            list($fieldName,) = explode(':', $rawField);
 
             if ($removedFieldName == $fieldName) {
                 continue;

programs/record.class.php

Spacing +4 added lines, -4 removed lines

@@ -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));
@@ -390,7 +390,7 @@ 
             throw new app_Exception('Trying to get the reference string of a record without an id.');
         }
         $classname = $this->getClassName();
-        return $classname . ':' . $this->id;
+        return $classname.':'.$this->id;
     }
 
 
@@ -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/app.php

Spacing +43 added lines, -43 removed lines

@@ -21,8 +21,8 @@ 
  * @copyright Copyright (c) 2018 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/define.php';
-require_once dirname(__FILE__) . '/functions.php';
+require_once dirname(__FILE__).'/define.php';
+require_once dirname(__FILE__).'/functions.php';
 
 /**
  * Provides extensible functionalities to manage an application.
@@ -45,8 +45,8 @@ 
         $this->addonPrefix = 'libapp';
         $this->addonName = 'libapp';
 
-        $this->classPrefix = $this->addonPrefix . '_';
-        $this->controllerTg = 'addon/' . $this->addonName . '/main';
+        $this->classPrefix = $this->addonPrefix.'_';
+        $this->controllerTg = 'addon/'.$this->addonName.'/main';
 
         $babDB = bab_getDB();
 
@@ -158,7 +158,7 @@ 
 
             if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
 
                 $classname = $this->$classNameMethod();
@@ -180,7 +180,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -211,7 +211,7 @@ 
 
             if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
                 $classname = $this->$classNameMethod();
 
@@ -225,7 +225,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -239,7 +239,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -247,7 +247,7 @@ 
      */
     public function includeRecordSet()
     {
-        require_once APP_SET_PATH . 'record.class.php';
+        require_once APP_SET_PATH.'record.class.php';
     }
 
 
@@ -256,7 +256,7 @@ 
      */
     public function includeTraceableRecordSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
     }
 
 
@@ -272,7 +272,7 @@ 
      */
     public function includeLogSet()
     {
-        require_once APP_SET_PATH . 'log.class.php';
+        require_once APP_SET_PATH.'log.class.php';
     }
 
     /**
@@ -288,7 +288,7 @@ 
      */
     public function LogSetClassName()
     {
-        return $this->LogClassName() . 'Set';
+        return $this->LogClassName().'Set';
     }
 
     /**
@@ -310,7 +310,7 @@ 
      */
     public function includeLinkSet()
     {
-        require_once APP_SET_PATH . 'link.class.php';
+        require_once APP_SET_PATH.'link.class.php';
     }
 
     /**
@@ -326,7 +326,7 @@ 
      */
     public function LinkSetClassName()
     {
-        return $this->LinkClassName() . 'Set';
+        return $this->LinkClassName().'Set';
     }
 
     /**
@@ -347,7 +347,7 @@ 
      */
     public function includeCustomFieldSet()
     {
-        require_once APP_SET_PATH . 'customfield.class.php';
+        require_once APP_SET_PATH.'customfield.class.php';
     }
 
     /**
@@ -363,7 +363,7 @@ 
      */
     public function CustomFieldSetClassName()
     {
-        return $this->CustomFieldClassName() . 'Set';
+        return $this->CustomFieldClassName().'Set';
     }
 
     /**
@@ -385,8 +385,8 @@ 
      */
     public function includeCustomSectionSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
-        require_once APP_SET_PATH . 'customsection.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
+        require_once APP_SET_PATH.'customsection.class.php';
     }
 
     /**
@@ -402,7 +402,7 @@ 
      */
     public function CustomSectionSetClassName()
     {
-        return $this->CustomSectionClassName() . 'Set';
+        return $this->CustomSectionClassName().'Set';
     }
 
     /**
@@ -424,7 +424,7 @@ 
      */
     public function includeTagSet()
     {
-        require_once APP_SET_PATH . 'tag.class.php';
+        require_once APP_SET_PATH.'tag.class.php';
     }
 
     /**
@@ -440,7 +440,7 @@ 
      */
     public function TagSetClassName()
     {
-        return $this->TagClassName() . 'Set';
+        return $this->TagClassName().'Set';
     }
 
     /**
@@ -475,7 +475,7 @@ 
             return null;
         }
         list($classname, $id) = $refParts;
-        $classSet = $classname . 'Set';
+        $classSet = $classname.'Set';
         $set = $this->$classSet();
         if (isset($set)) {
             return $set->get($id);
@@ -494,7 +494,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -521,7 +521,7 @@ 
      */
     public function translate($str, $str_plurals = null, $number = null)
     {
-        require_once APP_PHP_PATH . 'functions.php';
+        require_once APP_PHP_PATH.'functions.php';
         $translation = $str;
         if ($translate = bab_functionality::get('Translate/Gettext')) {
             /* @var $translate Func_Translate_Gettext */
@@ -572,16 +572,16 @@ 
      */
     public function mailTo($addr, $subject = null, $body = null)
     {
-        $mailTo = 'mailto:' . $addr;
+        $mailTo = 'mailto:'.$addr;
         $parameters = array();
         if (isset($subject)) {
-            $parameters[] = 'subject=' . $subject;
+            $parameters[] = 'subject='.$subject;
         }
         if (isset($body)) {
-            $parameters[] = 'body=' . $body;
+            $parameters[] = 'body='.$body;
         }
         if (!empty($parameters)) {
-            $mailTo .= '?' . implode('&', $parameters);
+            $mailTo .= '?'.implode('&', $parameters);
         }
 
         return $mailTo;
@@ -632,7 +632,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -652,7 +652,7 @@ 
         }
 
         if (!isset($format)) {
-            $format = bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat());
+            $format = bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat());
         }
         $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil();
 
@@ -673,7 +673,7 @@ 
      */
     public function includeController()
     {
-        require_once APP_PHP_PATH . '/controller.class.php';
+        require_once APP_PHP_PATH.'/controller.class.php';
     }
 
 
@@ -682,7 +682,7 @@ 
      */
     public function includeRecordController()
     {
-        require_once APP_CTRL_PATH . '/record.ctrl.php';
+        require_once APP_CTRL_PATH.'/record.ctrl.php';
     }
 
 
@@ -722,7 +722,7 @@ 
      */
     public function includeUi()
     {
-        require_once APP_UI_PATH . 'ui.class.php';
+        require_once APP_UI_PATH.'ui.class.php';
     }
 
 
@@ -734,14 +734,14 @@ 
     public function Ui()
     {
         $this->includeUi();
-        return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this);
+        return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this);
     }
 
 
 
     protected function includeAccess()
     {
-        require_once WORKSPACE_PHP_PATH . '/access.class.php';
+        require_once WORKSPACE_PHP_PATH.'/access.class.php';
     }
 
 
@@ -773,29 +773,29 @@ 
 
             case substr($name, -strlen('SetClassName')) === 'SetClassName':
                 $setName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                return $this->classPrefix . $setName;
+                return $this->classPrefix.$setName;
 
             case substr($name, -strlen('ClassName')) === 'ClassName':
                 $recordName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                return $this->classPrefix . $recordName;
+                return $this->classPrefix.$recordName;
 
             case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set':
                 $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include')));
-                require_once PHP_SET_PATH . $fileNameBase . '.class.php';
+                require_once PHP_SET_PATH.$fileNameBase.'.class.php';
                 return;
 
             case substr($name, -strlen('Set')) === 'Set':
-                $includeMethod = 'include' . $name;
+                $includeMethod = 'include'.$name;
                 $this->$includeMethod();
-                $setClassNameMethod = $name . 'ClassName';
+                $setClassNameMethod = $name.'ClassName';
                 $className = $this->$setClassNameMethod();
                 $set = new $className($this);
                 return $set;
 
                 //case method_exists($this, $name . 'Set'):
             default:
-                $setName = $name . 'Set';
-                $recordClassNameMethod = $name . 'ClassName';
+                $setName = $name.'Set';
+                $recordClassNameMethod = $name.'ClassName';
                 $recordClassName = $this->$recordClassNameMethod();
                 if (isset($arguments[0])) {
                     if ($arguments[0] instanceof $recordClassName) {