capwelton / libapp

programs/customfield.class.php

Indentation +143 added lines, -143 removed lines

@@ -46,72 +46,72 @@ 
     /**
      * @param Func_App $App
      */
-	public function __construct(Func_App $App)
-	{
-		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')
-		);
-	}
-
-
-
-	/**
-	 * 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)
+    {
+        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')
+        );
+    }
+
+
+
+    /**
+     * 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
@@ -175,7 +175,7 @@ 
             case 'Bool':
                 $field = ORM_BoolField($this->fieldname);
                 $field->setOutputOptions(
-                       $this->App()->translate('No'),
+                        $this->App()->translate('No'),
                     $this->App()->translate('Yes')
                 );
                 break;
@@ -192,80 +192,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/customsection.ctrl.php

Spacing +11 added lines, -11 removed lines

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

 

 

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

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

 

 

 /**

@@ -58,7 +58,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;

             }

         }

 

@@ -81,7 +81,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]);

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

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

 

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

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

 

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

 

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

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

 

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

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

 

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

 

@@ -536,17 +536,17 @@ 
         $nbCol = 0;

         foreach ($customSections as $customSection) {

 

-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);

+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);

 

             $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))

             );

             $sectionSection->addClass('app-custom-section');

             $sectionSection->addClass($customSection->classname);

-            $sectionSection->setSizePolicy($customSection->sizePolicy . ' widget-sameheight');

+            $sectionSection->setSizePolicy($customSection->sizePolicy.' widget-sameheight');

 

             $row->addItem($sectionSection);

 

@@ -588,7 +588,7 @@ 
                 $fieldItem = $W->HBoxItems(

                     $W->Label($fieldDescription)->setSizePolicy('maximum')->addClass('icon', Func_Icons::ACTIONS_ZOOM_FIT_HEIGHT),

                     $W->HBoxItems(

-                        $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($field['name']),

+                        $W->Hidden()->setName($customSection->id.'.'.$fieldId)->setValue($field['name']),

                         $W->Link('', $customSectionCtrl->editDisplayField($customSection->id, $field['name']))

                             ->addClass('icon', Func_Icons::ACTIONS_DOCUMENT_EDIT)

                             ->setOpenMode(Widget_Link::OPEN_DIALOG),

@@ -665,7 +665,7 @@ 
         }

 

         header('Content-type: application/json');

-        header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n");

+        header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n");

 

         $json = bab_json_encode($sectionsValues);

         $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8);

programs/ui/base.ui.php

Indentation +11 added lines, -11 removed lines

@@ -115,7 +115,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();
 
         $this->buttonsLayout = $this->buttonsLayout();
@@ -322,9 +322,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)
             );
         }
     }
@@ -1170,21 +1170,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 +18 added lines, -18 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
@@ -674,7 +674,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -702,7 +702,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, $label);
@@ -760,7 +760,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, $label);
@@ -1042,7 +1042,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);
@@ -1069,7 +1069,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, $label);
@@ -1161,7 +1161,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');
             }
@@ -1222,7 +1222,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]';
         }
@@ -1373,11 +1373,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;
             }
 
@@ -1394,7 +1394,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());
 
@@ -1407,7 +1407,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Filter'));
         }
@@ -1480,7 +1480,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]';
         }
@@ -1545,7 +1545,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']);
@@ -1844,7 +1844,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1886,7 +1886,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 {
@@ -1916,7 +1916,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -2030,7 +2030,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/accessmanager.class.php

Spacing +1 added lines, -1 removed lines

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

programs/init.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)

programs/app.php

Spacing +40 added lines, -40 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';
 
 
 
@@ -55,14 +55,14 @@ 
         $this->addonName = 'libapp';
         $this->addonPrefix = 'app';
 
-        $this->classPrefix = $this->addonPrefix . '_';
-        $this->controllerTg = 'addon/' . $this->addonName . '/main';
+        $this->classPrefix = $this->addonPrefix.'_';
+        $this->controllerTg = 'addon/'.$this->addonName.'/main';
 
         $addon = bab_getAddonInfosInstance($this->addonName);
         $this->phpPath = $addon->getPhpPath();
         $this->recordSetPath = $this->phpPath;
         $this->ctrlPath = $this->phpPath;
-        $this->uiPath = $this->phpPath . 'ui/';
+        $this->uiPath = $this->phpPath.'ui/';
 
         $babDB = bab_getDB();
 
@@ -109,8 +109,8 @@ 
     public function getRecordSetPathname($class)
     {
         // $App->MyRecordSet() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -122,8 +122,8 @@ 
     public function getRecordPathname($class)
     {
         // $App->MyRecord() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -224,7 +224,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();
@@ -246,7 +246,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -277,7 +277,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();
 
@@ -291,7 +291,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -305,7 +305,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -313,7 +313,7 @@ 
      */
     public function includeRecordSet()
     {
-        require_once APP_SET_PATH . 'record.class.php';
+        require_once APP_SET_PATH.'record.class.php';
     }
 
 
@@ -322,7 +322,7 @@ 
      */
     public function includeTraceableRecordSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
     }
 
 
@@ -334,7 +334,7 @@ 
     {
         static $accessManager = null;
         if (!isset($accessManager)) {
-            require_once APP_SET_PATH . 'accessmanager.class.php';
+            require_once APP_SET_PATH.'accessmanager.class.php';
             $accessManager = new app_AccessManager($this);
         }
 
@@ -352,7 +352,7 @@ 
      */
     public function includeLogSet()
     {
-        require_once APP_SET_PATH . 'log.class.php';
+        require_once APP_SET_PATH.'log.class.php';
     }
 
     /**
@@ -368,7 +368,7 @@ 
      */
     public function LogSetClassName()
     {
-        return $this->LogClassName() . 'Set';
+        return $this->LogClassName().'Set';
     }
 
     /**
@@ -390,7 +390,7 @@ 
      */
     public function includeLinkSet()
     {
-        require_once APP_SET_PATH . 'link.class.php';
+        require_once APP_SET_PATH.'link.class.php';
     }
 
     /**
@@ -406,7 +406,7 @@ 
      */
     public function LinkSetClassName()
     {
-        return $this->LinkClassName() . 'Set';
+        return $this->LinkClassName().'Set';
     }
 
     /**
@@ -429,7 +429,7 @@ 
      */
     public function getRecordSetByRef($recordClassname)
     {
-        $classSet = $recordClassname . 'Set';
+        $classSet = $recordClassname.'Set';
         $set = $this->$classSet();
         return $set;
     }
@@ -466,7 +466,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -557,16 +557,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;
@@ -617,7 +617,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -637,7 +637,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();
 
@@ -658,7 +658,7 @@ 
      */
     public function includeController()
     {
-        require_once APP_PHP_PATH . '/controller.class.php';
+        require_once APP_PHP_PATH.'/controller.class.php';
     }
 
 
@@ -667,7 +667,7 @@ 
      */
     public function includeRecordController()
     {
-        require_once APP_CTRL_PATH . '/record.ctrl.php';
+        require_once APP_CTRL_PATH.'/record.ctrl.php';
     }
 
 
@@ -707,7 +707,7 @@ 
      */
     public function includeUi()
     {
-        require_once APP_UI_PATH . 'ui.class.php';
+        require_once APP_UI_PATH.'ui.class.php';
     }
 
 
@@ -719,7 +719,7 @@ 
     public function Ui()
     {
         $this->includeUi();
-        return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this);
+        return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this);
     }
 
     /**
@@ -747,29 +747,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 APP_SET_PATH . $fileNameBase . '.class.php';
+                require_once APP_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) {

programs/traceablerecord.class.php

Indentation +4 added lines, -4 removed lines

@@ -540,10 +540,10 @@
     /**
      * Match records created by the specified user or the current connected user if none specified.
      *
-	 * @param int|null $userId
-	 *
-	 * @return ORM_IsCriterion
-	 */
+     * @param int|null $userId
+     *
+     * @return ORM_IsCriterion
+     */
     public function isOwn($userId = null)
     {
         if (!isset($userId)) {

Spacing +17 added lines, -17 removed lines

@@ -243,7 +243,7 @@ 
             return parent::delete($criteria);
         }
 
-        require_once $GLOBALS['babInstallPath'] . '/utilit/dateTime.php';
+        require_once $GLOBALS['babInstallPath'].'/utilit/dateTime.php';
         $now = BAB_DateTime::now()->getIsoDateTime();
 
         $records = $this->select($criteria);
@@ -279,7 +279,7 @@ 
             return parent::save($record);
         }
 
-        require_once $GLOBALS['babInstallPath'] . '/utilit/dateTime.php';
+        require_once $GLOBALS['babInstallPath'].'/utilit/dateTime.php';
 
         $now = BAB_DateTime::now()->getIsoDateTime();
 
@@ -309,11 +309,11 @@ 
      */
     private function uuid()
     {
-        return sprintf( '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ),
-            mt_rand( 0, 0x0fff ) | 0x4000,
-            mt_rand( 0, 0x3fff ) | 0x8000,
-            mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ) );
+        return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+            mt_rand(0, 0x0fff) | 0x4000,
+            mt_rand(0, 0x3fff) | 0x8000,
+            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
     }
 
     /**
@@ -403,7 +403,7 @@ 
 
         $linkSet->hasOne('sourceId', get_class($this));
 
-        $criteria =	$linkSet->targetClass->is(get_class($target))
+        $criteria = $linkSet->targetClass->is(get_class($target))
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -433,7 +433,7 @@ 
 
         $linkSet->hasOne('targetId', get_class($this));
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -477,7 +477,7 @@ 
             $sourcesCriteria[] = $linkSet->sourceClass->is($sourceClass)->_AND_($linkSet->sourceId->in($sourceIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is($this->getRecordClassName()),
             $linkSet->any($sourcesCriteria)
         );
@@ -522,7 +522,7 @@ 
             $targetsCriteria[] = $linkSet->targetClass->is($targetClass)->_AND_($linkSet->targetId->in($targetIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->sourceClass->is($this->getRecordClassName()),
             $linkSet->any($targetsCriteria)
         );
@@ -575,10 +575,10 @@ 
  */
 class app_TraceableRecord extends app_Record
 {
-    const DELETED_STATUS_EXISTING = 0;      // Normal status of a record
-    const DELETED_STATUS_DELETED = 1;       // Record is deleted by retrievable by admin
-    const DELETED_STATUS_IN_TRASH = 2;      // Record is deleted by retrievable by authorized users
-    const DELETED_STATUS_DRAFT = 3;         // Status is in draft (not yet created)
+    const DELETED_STATUS_EXISTING = 0; // Normal status of a record
+    const DELETED_STATUS_DELETED = 1; // Record is deleted by retrievable by admin
+    const DELETED_STATUS_IN_TRASH = 2; // Record is deleted by retrievable by authorized users
+    const DELETED_STATUS_DRAFT = 3; // Status is in draft (not yet created)
 
     public static function getDeletedStatuses()
     {
@@ -611,7 +611,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is(get_class($this)))
             ->_AND_($linkSet->targetId->is($this->id));
@@ -641,7 +641,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->targetClass->is(get_class($target))
+        $criteria = $linkSet->targetClass->is(get_class($target))
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is(get_class($this)))
             ->_AND_($linkSet->sourceId->is($this->id));

programs/link.class.php

Indentation +197 added lines, -197 removed lines

@@ -72,205 +72,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

@@ -77,8 +77,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');

 	    }

 	}

@@ -89,8 +89,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');

 	    }

 	}

@@ -256,7 +256,7 @@ 
 		}

 

 		if ($deleteTarget) {

-			foreach($set->select($criteria) as $link) {

+			foreach ($set->select($criteria) as $link) {

 

 				$className = $link->targetClass.'Set';