capwelton / libapp

programs/record.class.php

Spacing +11 added lines, -11 removed lines

@@ -191,7 +191,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));
@@ -317,7 +317,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)) {
@@ -347,7 +347,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)) {
@@ -391,7 +391,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)
         );
@@ -436,7 +436,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)
         );
@@ -673,7 +673,7 @@ 
         $App = $this->App();
         $rClass = new ReflectionClass(get_class($this));
         $component = $App->getComponentByName($rClass->getShortName());
-        if(isset($component)){
+        if (isset($component)) {
             return $component->getRecordClassName();
 //             list(, $classname) = explode('_', $component->getRecordClassName());
 //             return $classname;
@@ -694,7 +694,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;
     }
 
 
@@ -934,7 +934,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));
@@ -964,7 +964,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is(get_class($target)),
             $linkSet->targetId->is($target->id),
             $linkSet->sourceClass->is(get_class($this)),
@@ -1059,13 +1059,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 +60 added lines, -60 removed lines

@@ -21,9 +21,9 @@ 
  * @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__) . '/component.class.php';
+require_once dirname(__FILE__).'/define.php';
+require_once dirname(__FILE__).'/functions.php';
+require_once dirname(__FILE__).'/component.class.php';
 
 
 
@@ -59,14 +59,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();
 
@@ -92,7 +92,7 @@ 
      */
     public function getComponentByName($componentName)
     {
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
         }
         return null;
@@ -131,12 +131,12 @@ 
         
         $messages = array();
         
-        foreach ($components as $componentName => $component){
+        foreach ($components as $componentName => $component) {
             $dependencies = $component->checkDependencies();
-            foreach($dependencies['requiredComponents'] as $requiredComponent){
+            foreach ($dependencies['requiredComponents'] as $requiredComponent) {
                 $messages['requiredComponents'][$componentName][] = $requiredComponent;
             }
-            foreach($dependencies['optionalComponents'] as $optionalComponent){
+            foreach ($dependencies['optionalComponents'] as $optionalComponent) {
                 $messages['optionalComponents'][$componentName][] = $optionalComponent;
             }
         }
@@ -179,8 +179,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;
     }
 
     /**
@@ -192,8 +192,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;
     }
 
     /**
@@ -294,7 +294,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();
@@ -316,7 +316,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -342,9 +342,9 @@ 
         $sql = 'SET FOREIGN_KEY_CHECKS=0;
             ';
 
-        foreach ($this->components as $component){
+        foreach ($this->components as $component) {
             /* @var $component app_Component */
-            try{
+            try {
                 /* @var $set ORM_RecordSet */
                 $set = $component->recordSet();
                 if (method_exists($set, 'useLang')) {
@@ -352,11 +352,11 @@ 
                     // We need to revert to multilang fields before synchronizing.
                     $set->useLang(false);
                 }
-                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                $sql .= $mysqlbackend->setToSql($set)."\n";
                 
                 $component->onUpdate();
             }
-            catch (Exception $e){
+            catch (Exception $e) {
                 
             }
         }
@@ -367,18 +367,18 @@ 
         $synchronize->fromSqlString($sql);
         
         $dependencies = $this->checkComponentsDependencies();
-        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents){
-            foreach ($requiredComponents as $requiredComponent){
+        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents) {
+            foreach ($requiredComponents as $requiredComponent) {
                 $hasComponent = $this->getComponentByName($requiredComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     bab_installWindow::message(sprintf($this->translate('The component %s is required for the component %s to work. You will encounter fatal errors'), $requiredComponent, $componentName));
                 }
             }
         }
-        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents){
-            foreach ($optionalComponents as $optionalComponent){
+        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents) {
+            foreach ($optionalComponents as $optionalComponent) {
                 $hasComponent = $this->getComponentByName($optionalComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     bab_installWindow::message(sprintf($this->translate('The optional component %s has not been added. The component %s may have reduced functionalities'), $optionalComponent, $componentName));
                 }
             }
@@ -403,7 +403,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();
 
@@ -417,7 +417,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -431,7 +431,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -439,7 +439,7 @@ 
      */
     public function includeRecordSet()
     {
-        require_once APP_SET_PATH . 'record.class.php';
+        require_once APP_SET_PATH.'record.class.php';
     }
 
 
@@ -448,7 +448,7 @@ 
      */
     public function includeTraceableRecordSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
     }
 
 
@@ -460,7 +460,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);
         }
 
@@ -478,7 +478,7 @@ 
      */
     public function includeLogSet()
     {
-        require_once APP_SET_PATH . 'log.class.php';
+        require_once APP_SET_PATH.'log.class.php';
     }
 
     /**
@@ -494,7 +494,7 @@ 
      */
     public function LogSetClassName()
     {
-        return $this->LogClassName() . 'Set';
+        return $this->LogClassName().'Set';
     }
 
     /**
@@ -516,7 +516,7 @@ 
      */
     public function includeLinkSet()
     {
-        require_once APP_SET_PATH . 'link.class.php';
+        require_once APP_SET_PATH.'link.class.php';
     }
 
     /**
@@ -532,7 +532,7 @@ 
      */
     public function LinkSetClassName()
     {
-        return $this->LinkClassName() . 'Set';
+        return $this->LinkClassName().'Set';
     }
 
     /**
@@ -556,10 +556,10 @@ 
     public function getRecordSetByRef($recordClassname)
     {
         $component = $this->getComponentByName(str_replace($this->classPrefix, '', $recordClassname));
-        if(isset($component)){
+        if (isset($component)) {
             return $component->recordSet();
         }
-        $classSet = $recordClassname . 'Set';
+        $classSet = $recordClassname.'Set';
         $set = $this->$classSet();
         return $set;
     }
@@ -596,7 +596,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -687,16 +687,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;
@@ -747,7 +747,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -767,7 +767,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();
 
@@ -788,7 +788,7 @@ 
      */
     public function includeController()
     {
-        require_once APP_PHP_PATH . '/controller.class.php';
+        require_once APP_PHP_PATH.'/controller.class.php';
     }
 
 
@@ -797,7 +797,7 @@ 
      */
     public function includeRecordController()
     {
-        require_once APP_CTRL_PATH . '/record.ctrl.php';
+        require_once APP_CTRL_PATH.'/record.ctrl.php';
     }
 
 
@@ -837,7 +837,7 @@ 
      */
     public function includeUi()
     {
-        require_once APP_UI_PATH . 'ui.class.php';
+        require_once APP_UI_PATH.'ui.class.php';
     }
 
 
@@ -849,7 +849,7 @@ 
     public function Ui()
     {
         $this->includeUi();
-        return bab_getInstance($this->classPrefix . 'Ui');//->setApp($this);
+        return bab_getInstance($this->classPrefix.'Ui'); //->setApp($this);
     }
 
     /**
@@ -877,34 +877,34 @@ 
 
             case substr($name, -strlen('SetClassName')) === 'SetClassName':
                 $className = substr($name, 0, strlen($name) - strlen('SetClassName'));
-                if($component = $this->getComponentByName(ucfirst($className))){
+                if ($component = $this->getComponentByName(ucfirst($className))) {
                     return $component->getSetClassName();
                 }
                 $setName = $className.'Set';
-                return $this->classPrefix . $setName;
+                return $this->classPrefix.$setName;
 
             case substr($name, -strlen('ClassName')) === 'ClassName':
                 $recordName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                if($component = $this->getComponentByName(ucfirst($recordName))){
+                if ($component = $this->getComponentByName(ucfirst($recordName))) {
                     return $component->getRecordClassName();
                 }
-                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')));
-                if($this->getComponentByName(ucfirst($fileNameBase))){
+                if ($this->getComponentByName(ucfirst($fileNameBase))) {
                     return;
                 }
-                require_once APP_SET_PATH . $fileNameBase . '.class.php';
+                require_once APP_SET_PATH.$fileNameBase.'.class.php';
                 return;
 
             case substr($name, -strlen('Set')) === 'Set':
-                if($component = $this->getComponentByName(ucfirst(substr($name, 0, strlen($name) -strlen('Set'))))){
+                if ($component = $this->getComponentByName(ucfirst(substr($name, 0, strlen($name) - strlen('Set'))))) {
                     return $component->recordSet();
                 }
-                $includeMethod = 'include' . $name;
+                $includeMethod = 'include'.$name;
                 $this->$includeMethod();
-                $setClassNameMethod = $name . 'ClassName';
+                $setClassNameMethod = $name.'ClassName';
                 $className = $this->$setClassNameMethod();
                 $set = new $className($this);
                 return $set;
@@ -912,8 +912,8 @@ 
             case ($component = $this->getComponentByName(ucfirst($name))) != false:
                 return $component;
             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) {