capwelton / libapp

programs/define.php

Spacing +7 added lines, -7 removed lines

@@ -21,15 +21,15 @@
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-define('APP_PHP_PATH', dirname(__FILE__) . '/');
-define('APP_SET_PATH', dirname(__FILE__) . '/');
-define('APP_UI_PATH', dirname(__FILE__) . '/ui/');
-define('APP_CTRL_PATH', dirname(__FILE__) . '/');
+define('APP_PHP_PATH', dirname(__FILE__).'/');
+define('APP_SET_PATH', dirname(__FILE__).'/');
+define('APP_UI_PATH', dirname(__FILE__).'/ui/');
+define('APP_CTRL_PATH', dirname(__FILE__).'/');
 
-require_once APP_PHP_PATH . 'base.class.php';
-require_once APP_UI_PATH . 'base.ui.php';
+require_once APP_PHP_PATH.'base.class.php';
+require_once APP_UI_PATH.'base.ui.php';
 
-require_once $GLOBALS['babInstallPath'] . 'utilit/dateTime.php';
+require_once $GLOBALS['babInstallPath'].'utilit/dateTime.php';
 
 
 

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

Spacing +44 added lines, -44 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) {
@@ -807,7 +807,7 @@ 
                 return null;
 
                 echo $name;
-                $r = method_exists($this, $name . 'Set');
+                $r = method_exists($this, $name.'Set');
                 var_dump($r);
                 die;
         }

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']);