capwelton / libapp

programs/functions.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
     if (null === $url) {
         $script = '<script type="text/javascript">';
         if (isset($message)) {
-            $script .= 'alert("' . bab_toHtml($message, BAB_HTML_JS) . '");';
+            $script .= 'alert("'.bab_toHtml($message, BAB_HTML_JS).'");';
         }
         $script .= 'history.back();';
         $script .= '</script>';
@@ -124,7 +124,7 @@ 
         $url = $url->url();
     }
     if (!empty($babBody->msgerror)) {
-        $url .=  '&msgerror=' . urlencode($babBody->msgerror);
+        $url .= '&msgerror='.urlencode($babBody->msgerror);
     }
     if (isset($message)) {
         $lines = explode("\n", $message);
@@ -133,7 +133,7 @@ 
         }
     }
 
-    header('Location: ' . $url);
+    header('Location: '.$url);
     die;
 }
 
@@ -165,7 +165,7 @@ 
  */
 function app_fileUploadError($error)
 {
-    switch($error) {
+    switch ($error) {
         case UPLOAD_ERR_OK:
             return null;
 

programs/app.php

Spacing +41 added lines, -41 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;
     }
 
     /**
@@ -227,7 +227,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();
@@ -249,7 +249,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -280,7 +280,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();
 
@@ -294,7 +294,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -308,7 +308,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -316,7 +316,7 @@ 
      */
     public function includeRecordSet()
     {
-        require_once APP_SET_PATH . 'record.class.php';
+        require_once APP_SET_PATH.'record.class.php';
     }
 
 
@@ -325,7 +325,7 @@ 
      */
     public function includeTraceableRecordSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
     }
 
 
@@ -341,7 +341,7 @@ 
      */
     public function includeLogSet()
     {
-        require_once APP_SET_PATH . 'log.class.php';
+        require_once APP_SET_PATH.'log.class.php';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function LogSetClassName()
     {
-        return $this->LogClassName() . 'Set';
+        return $this->LogClassName().'Set';
     }
 
     /**
@@ -379,7 +379,7 @@ 
      */
     public function includeLinkSet()
     {
-        require_once APP_SET_PATH . 'link.class.php';
+        require_once APP_SET_PATH.'link.class.php';
     }
 
     /**
@@ -395,7 +395,7 @@ 
      */
     public function LinkSetClassName()
     {
-        return $this->LinkClassName() . 'Set';
+        return $this->LinkClassName().'Set';
     }
 
     /**
@@ -429,7 +429,7 @@ 
             return null;
         }
         list($classname, $id) = $refParts;
-        $classSet = $classname . 'Set';
+        $classSet = $classname.'Set';
         $set = $this->$classSet();
         if (isset($set)) {
             return $set->get($id);
@@ -448,7 +448,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -475,7 +475,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 */
@@ -526,16 +526,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;
@@ -586,7 +586,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -606,7 +606,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();
 
@@ -627,7 +627,7 @@ 
      */
     public function includeController()
     {
-        require_once APP_PHP_PATH . '/controller.class.php';
+        require_once APP_PHP_PATH.'/controller.class.php';
     }
 
 
@@ -636,7 +636,7 @@ 
      */
     public function includeRecordController()
     {
-        require_once APP_CTRL_PATH . '/record.ctrl.php';
+        require_once APP_CTRL_PATH.'/record.ctrl.php';
     }
 
 
@@ -676,7 +676,7 @@ 
      */
     public function includeUi()
     {
-        require_once APP_UI_PATH . 'ui.class.php';
+        require_once APP_UI_PATH.'ui.class.php';
     }
 
 
@@ -688,14 +688,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';
     }
 
 
@@ -727,29 +727,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) {

programs/customsection.class.php

Spacing +3 added lines, -3 removed lines

@@ -318,9 +318,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);
@@ -339,7 +339,7 @@ 
             if (empty($rawField)) {
                 continue;
             }
-            list($fieldName, ) = explode(':', $rawField);
+            list($fieldName,) = explode(':', $rawField);
 
             if ($removedFieldName == $fieldName) {
                 continue;

programs/ui/base.ui.php

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
@@ -680,7 +680,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -708,7 +708,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);
@@ -766,7 +766,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);
@@ -1036,7 +1036,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);
@@ -1063,7 +1063,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);
@@ -1154,7 +1154,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');
             }
@@ -1215,7 +1215,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]';
         }
@@ -1366,11 +1366,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;
             }
 
@@ -1387,7 +1387,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());
 
@@ -1400,7 +1400,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Filter'));
         }
@@ -1473,7 +1473,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]';
         }
@@ -1538,7 +1538,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']);
@@ -1837,7 +1837,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1879,7 +1879,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 {
@@ -1908,7 +1908,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -2022,7 +2022,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/controller.class.php

Spacing +31 added lines, -31 removed lines

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

programs/record.ctrl.php

Spacing +42 added lines, -42 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/controller.class.php';
+require_once dirname(__FILE__).'/controller.class.php';
 
 
 
@@ -52,7 +52,7 @@ 
     {
         $App = $this->App();
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -104,9 +104,9 @@ 
             if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() .  '"href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon '.$actions->getIcon().'"href="'.$actions->url().'">'.$text.'</a></li>';
         } elseif ($actions instanceof Widget_Link) {
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+            $html = '<li>'.$actions->display($canvas).'</li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -119,10 +119,10 @@ 
             if (isset($actions['icon'])) {
 
                 $html = '<li class="dropdown">'
-                    . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
+                    . '<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
                     . ($actions['icon'] === 'actions-context-menu'/*Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>')
                     . '</a>'
-                    . '<ul class="dropdown-menu dropdown-menu-right ' . Func_Icons::ICON_LEFT_SYMBOLIC . '">'
+                    . '<ul class="dropdown-menu dropdown-menu-right '.Func_Icons::ICON_LEFT_SYMBOLIC.'">'
                     . $html
                     . '</ul>';
             }
@@ -145,7 +145,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname =  $recordClassname . 'TableView';
+        $viewClassname = $recordClassname.'TableView';
         if (method_exists($Ui, $viewClassname)) {
             $types['table'] = array(
                 'classname' => $viewClassname,
@@ -154,7 +154,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CardsView';
+        $viewClassname = $recordClassname.'CardsView';
         if (method_exists($Ui, $viewClassname)) {
             $types['cards'] = array(
                 'classname' => $viewClassname,
@@ -163,7 +163,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'MapView';
+        $viewClassname = $recordClassname.'MapView';
         if (method_exists($Ui, $viewClassname)) {
             $types['map'] = array(
                 'classname' => $viewClassname,
@@ -172,7 +172,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CalendarView';
+        $viewClassname = $recordClassname.'CalendarView';
         if (method_exists($Ui, $viewClassname)) {
             $types['calendar'] = array(
                 'classname' => $viewClassname,
@@ -244,7 +244,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;
             }
         }
 
@@ -268,7 +268,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]);
@@ -465,7 +465,7 @@ 
         $nbCol = 0;
         foreach ($customSections as $customSection) {
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
 //             if ($currentColumn + $nbCol > 12) {
 //                 $sectionsSection->addItem($row);
@@ -476,8 +476,8 @@ 
             $currentColumn += $nbCol;
 
             $sectionSection = $W->Section(
-                $customSection->name . ' (' . $customSection->rank . ')',
-                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#' . $customSection->id))
+                $customSection->name.' ('.$customSection->rank.')',
+                $sectionBox = $W->VBoxItems($W->Hidden()->setName('#'.$customSection->id))
 //                     ->addClass('widget-dockable-content')
             );
             $sectionSection->addClass('crm-custom-section');
@@ -522,16 +522,16 @@ 
                 }
 
                 $fieldItem = $W->FlowItems(
-                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-80pc' ),
+                    $W->Label($fieldDescription)->setSizePolicy(Func_Icons::ICON_LEFT_16.' widget-80pc'),
                     $W->FlowItems(
-                        $W->Hidden()->setName($customSection->id . '.' . $fieldId)->setValue($field['name']),
+                        $W->Hidden()->setName($customSection->id.'.'.$fieldId)->setValue($field['name']),
                         $W->Link('', $this->proxy()->editDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_DOCUMENT_EDIT)
                             ->setOpenMode(Widget_Link::OPEN_DIALOG),
                         $W->Link('', $this->proxy()->removeDisplayField($customSection->id, $field['name']))
                             ->addClass('icon', Func_Icons::ACTIONS_LIST_REMOVE)
                             ->setAjaxAction()
-                    )->setSizePolicy(Func_Icons::ICON_LEFT_16 . ' widget-20pc widget-align-right widget-actions' )
+                    )->setSizePolicy(Func_Icons::ICON_LEFT_16.' widget-20pc widget-align-right widget-actions')
                 )->setSizePolicy('widget-list-element  widget-actions-target');
 
                 $sectionBox->addItem($fieldItem);
@@ -603,7 +603,7 @@ 
         }
 
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $objectName . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n");
+        header('Content-Disposition: attachment; filename="'.$objectName.'.'.($view === '' ? 'default' : $view).'.json"'."\n");
 
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8);
@@ -854,11 +854,11 @@ 
         $recordSet = $this->getEditRecordSet();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         /* @var $editor app_RecordEditor */
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -901,7 +901,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '.modelView';
+            $itemId = $this->getClass().'.modelView';
         }
 
         return $itemId;
@@ -935,20 +935,20 @@ 
 
         switch ($type) {
             case 'cards':
-                $tableviewClassname =  $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname.'CardsView';
                 break;
 
             case 'map':
-                $tableviewClassname =  $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname.'MapView';
                 break;
 
             case 'calendar':
-                $tableviewClassname =  $recordClassname . 'CalendarView';
+                $tableviewClassname = $recordClassname.'CalendarView';
                 break;
 
             case 'table':
             default:
-                $tableviewClassname =  $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
 
@@ -1014,10 +1014,10 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -1062,7 +1062,7 @@ 
                     $W->Link(
                         '',
                         $proxy->setFilteredViewType($tableView->getId(), $viewTypeId)
-                    )->addClass('icon', $viewType['icon'] . ($filteredViewType=== $viewTypeId ? ' active' : ''))
+                    )->addClass('icon', $viewType['icon'].($filteredViewType === $viewTypeId ? ' active' : ''))
 //                    ->setSizePolicy('btn btn-xs btn-default ' . ($filteredViewType === $viewTypeId ? 'active' : ''))
                     ->setTitle($viewType['label'])
                     ->setAjaxAction()
@@ -1106,7 +1106,7 @@ 
 
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -1119,10 +1119,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
         if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -1136,7 +1136,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -1152,7 +1152,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -1294,17 +1294,17 @@ 
 
         switch ($format) {
             case 'xlsx':
-                $tableview->downloadXlsx($filename . '.xlsx');
+                $tableview->downloadXlsx($filename.'.xlsx');
                 break;
             case 'xls':
-                $tableview->downloadExcel($filename . '.xls');
+                $tableview->downloadExcel($filename.'.xls');
                 break;
             case 'ssv':
-                $tableview->downloadCsv($filename . '.csv', ';', $inline, 'Windows-1252');
+                $tableview->downloadCsv($filename.'.csv', ';', $inline, 'Windows-1252');
                 break;
             case 'csv':
             default:
-                $tableview->downloadCsv($filename . '.csv', ',', $inline, bab_charset::getIso());
+                $tableview->downloadCsv($filename.'.csv', ',', $inline, bab_charset::getIso());
                 break;
         }
     }
@@ -1333,7 +1333,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname.'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);
 
 
@@ -1496,7 +1496,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"');
+        $message = sprintf($App->translate('%s has been deleted'), $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"');
         return $message;
     }
 
@@ -1623,7 +1623,7 @@ 
             $this->addMessage($deletedMessage);
         }
 
-        $this->addReloadSelector('.depends-' . strtolower($record->getClassName()));
+        $this->addReloadSelector('.depends-'.strtolower($record->getClassName()));
 
         return true;
     }
@@ -1654,7 +1654,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
 
         $form->addItem($W->Title($App->translate('Confirm delete?'), 6));