capwelton / libapp

programs/define.php

Spacing +8 added lines, -8 removed lines

@@ -21,16 +21,16 @@
  * @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_WIDGETS_PATH', APP_UI_PATH . 'widgets/');

-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_WIDGETS_PATH', APP_UI_PATH.'widgets/');

+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/component.class.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2019 by CapWelton ({@link http://www.capwelton.com})

  */

 

-require_once dirname(__FILE__). '/record.ctrl.php';

+require_once dirname(__FILE__).'/record.ctrl.php';

 

 class app_Component 

 {

@@ -56,15 +56,15 @@ 
     {

         $main = new ReflectionClass($this->set);

         $dependencies = array();

-        if($main->hasMethod('getRequiredComponents')){

+        if ($main->hasMethod('getRequiredComponents')) {

             $requiredComponents = $this->recordSet()->getRequiredComponents();

-            foreach ($requiredComponents as $requiredComponent){

+            foreach ($requiredComponents as $requiredComponent) {

                 $dependencies['requiredComponents'][] = $requiredComponent;

             }

         }

-        if($main->hasMethod('getOptionalComponents')){

+        if ($main->hasMethod('getOptionalComponents')) {

             $optionalComponents = $this->recordSet()->getOptionalComponents();

-            foreach ($optionalComponents as $optionalComponent){

+            foreach ($optionalComponents as $optionalComponent) {

                 $dependencies['optionalComponents'][] = $optionalComponent;

             }

         }

@@ -79,7 +79,7 @@ 
     public function onUpdate()

     {

         $main = new ReflectionClass($this->set);

-        if($main->hasMethod('onUpdate')){

+        if ($main->hasMethod('onUpdate')) {

             $this->recordSet()->onUpdate();

         }

     }

@@ -89,12 +89,12 @@ 
      */

     public function controller($proxy = true)

     {

-        if(!isset($this->controllerObject)){

+        if (!isset($this->controllerObject)) {

             $this->app->includeRecordController();

             $ctrl = $this->controller;

             $this->controllerObject = new $ctrl($this->app, $this);

         }

-        if($proxy){

+        if ($proxy) {

             return $this->controllerObject->proxy();

         }

         return $this->controllerObject;

@@ -113,7 +113,7 @@ 
      */

     public function ui()

     {

-        if(!isset($this->uiObject)){

+        if (!isset($this->uiObject)) {

             $ui = $this->ui;

             $this->uiObject = new $ui($this->app);

         }

@@ -129,7 +129,7 @@ 
     public function getSetClassName()

     {

         $reflectionClass = new ReflectionClass($this->set);

-        return $this->app->classPrefix . $reflectionClass->getShortName();

+        return $this->app->classPrefix.$reflectionClass->getShortName();

     }

     

     public function getRecordClassName()

programs/ui/ui.class.php

Spacing +7 added lines, -7 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,25 +77,25 @@ 
      */
     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);
     }
     
     public function Chip($label, $labelIcon = null, $action = null, $actionIcon = null, $id = null)
     {
-        require_once APP_WIDGETS_PATH . 'chip.class.php';
+        require_once APP_WIDGETS_PATH.'chip.class.php';
         return new app_Chip($this->App(), $label, $labelIcon, $action, $actionIcon, $id);
     }
     
     public function CustomFieldTableView($id = null)
     {
-        require_once APP_UI_PATH . 'customfield.ui.php';
+        require_once APP_UI_PATH.'customfield.ui.php';
         return new app_CustomFieldTableView($this->App(), $id);
     }
     
     public function CustomFieldEditor(app_CustomField $customField = null, $id = null, $layout = null)
     {
-        require_once APP_UI_PATH . 'customfield.ui.php';
+        require_once APP_UI_PATH.'customfield.ui.php';
         return new app_CustomFieldEditor($this->App(), $customField, $id, $layout);
     }
 }
\ No newline at end of file

programs/ui/base.ui.php

Spacing +20 added lines, -20 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
@@ -676,7 +676,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -704,7 +704,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);
@@ -762,7 +762,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);
@@ -1047,7 +1047,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);
@@ -1074,7 +1074,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);
@@ -1176,7 +1176,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');
             }
@@ -1237,7 +1237,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]';
         }
@@ -1342,7 +1342,7 @@ 
 
             $values = $set->select();
             foreach ($values as $record) {
-                $widget->addOption($record->id, (string)$record->name);
+                $widget->addOption($record->id, (string) $record->name);
             }
 
             return $widget;
@@ -1434,11 +1434,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;
             }
 
@@ -1453,7 +1453,7 @@ 
                 $input->addClass('widget-100pc');
 
                 $formItem = $this->handleFilterLabel($label, $input);
-                $formItem->addClass('field_' . $fieldName);
+                $formItem->addClass('field_'.$fieldName);
 
                 $mainSearch = (method_exists($column, 'isMainSearch') && $column->isMainSearch());
 
@@ -1486,7 +1486,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Apply filter'));
         }
@@ -1525,7 +1525,7 @@ 
 
 
                 foreach ($filterNames as $filterName) {
-                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
 
 //                     $this->select->addItem(
 //                         $W->Link(
@@ -1639,7 +1639,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]';
         }
@@ -1737,7 +1737,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']);
@@ -2038,7 +2038,7 @@ 
                 continue;
             }
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -2089,7 +2089,7 @@ 
                 $label = isset($parameters['label']) ? $parameters['label'] : null;
                 $sizePolicy = isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
 
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $label);
                 } else {
@@ -2120,7 +2120,7 @@ 
             }
         }
 
-        if ($currentColumn + $nbCol> 0) {
+        if ($currentColumn + $nbCol > 0) {
             $this->addItem($row);
         }
     }
@@ -2241,7 +2241,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/ui/widgets/chip.class.php

Spacing +2 added lines, -2 removed lines

@@ -70,14 +70,14 @@
         
         $html = "<div class='chip'>";
         
-        if(isset($this->labelIcon)){
+        if (isset($this->labelIcon)) {
             $icon = $W->Label('')->setIconFormat(16, 'left')->setIcon($this->labelIcon);
             $html .= $icon->display($W->HtmlCanvas());
         }
         
         $html .= $this->label;
         
-        if(isset($this->action)){
+        if (isset($this->action)) {
             $icon = $W->Link('', $this->action)->setIconFormat(16, 'left')->setOpenMode(Widget_Link::OPEN_DIALOG_AND_RELOAD);
             $icon->setIcon(isset($this->actionIcon) ? $this->actionIcon : Func_Icons::ACTIONS_DIALOG_CANCEL);
             $icon->addClass('chip-right-action');

programs/app.php

Braces +1 added lines, -2 removed lines

@@ -355,8 +355,7 @@
                 $sql .= $mysqlbackend->setToSql($set) . "\n";
                 
                 $component->onUpdate();
-            }
-            catch (Exception $e){
+            } catch (Exception $e){
                 
             }
         }

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

programs/record.ctrl.php

Spacing +59 added lines, -59 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';
 
 
 
@@ -37,7 +37,7 @@ 
     protected function getRecordClassName()
     {
         $App = $this->App();
-        if($currentComponent = $App->getCurrentComponent()){
+        if ($currentComponent = $App->getCurrentComponent()) {
             return $currentComponent->getRecordClassName();
         }
         list(, $recordClassname) = explode('_Ctrl', $this->getClass());
@@ -55,11 +55,11 @@ 
     protected function getRecordSet()
     {
         $App = $this->App();
-        if($currentComponent = $App->getCurrentComponent()){
+        if ($currentComponent = $App->getCurrentComponent()) {
             return $currentComponent->recordSet();
         }
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -111,9 +111,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'];
@@ -126,10 +126,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>';
             }
@@ -152,7 +152,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname =  $recordClassname . 'TableView';
+        $viewClassname = $recordClassname.'TableView';
         if (method_exists($Ui, $viewClassname)) {
             $types['table'] = array(
                 'classname' => $viewClassname,
@@ -161,7 +161,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CardsView';
+        $viewClassname = $recordClassname.'CardsView';
         if (method_exists($Ui, $viewClassname)) {
             $types['cards'] = array(
                 'classname' => $viewClassname,
@@ -170,7 +170,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'MapView';
+        $viewClassname = $recordClassname.'MapView';
         if (method_exists($Ui, $viewClassname)) {
             $types['map'] = array(
                 'classname' => $viewClassname,
@@ -179,7 +179,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CalendarView';
+        $viewClassname = $recordClassname.'CalendarView';
         if (method_exists($Ui, $viewClassname)) {
             $types['calendar'] = array(
                 'classname' => $viewClassname,
@@ -258,11 +258,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);
@@ -305,7 +305,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_modelView';
+            $itemId = $this->getClass().'_modelView';
         }
 
         return $itemId;
@@ -323,10 +323,10 @@ 
     protected function modelView($filter = null, $type = null, $columns = null, $itemId = null)
     {
         $App = $this->App();
-        if($currentComponent = $App->getCurrentComponent()){
+        if ($currentComponent = $App->getCurrentComponent()) {
             $Ui = $currentComponent->ui();
         }
-        else{
+        else {
             $Ui = $App->Ui();
         }
 
@@ -344,20 +344,20 @@ 
 
         switch ($type) {
             case 'cards':
-                $tableviewClassname =  $currentComponent ? 'cardsView' : $recordClassname . 'CardsView';
+                $tableviewClassname = $currentComponent ? 'cardsView' : $recordClassname.'CardsView';
                 break;
 
             case 'map':
-                $tableviewClassname =  $currentComponent ? 'mapView' : $recordClassname . 'MapView';
+                $tableviewClassname = $currentComponent ? 'mapView' : $recordClassname.'MapView';
                 break;
 
             case 'calendar':
-                $tableviewClassname =  $currentComponent ? 'calendarView' : $recordClassname . 'CalendarView';
+                $tableviewClassname = $currentComponent ? 'calendarView' : $recordClassname.'CalendarView';
                 break;
 
             case 'table':
             default:
-                $tableviewClassname =  $currentComponent ? 'tableView' : $recordClassname . 'TableView';
+                $tableviewClassname = $currentComponent ? 'tableView' : $recordClassname.'TableView';
                 break;
         }
 
@@ -422,18 +422,18 @@ 
     {
         $App = $this->App();
         $Ui = $App->Ui();
-        if($currentComponent = $App->getCurrentComponent()){
+        if ($currentComponent = $App->getCurrentComponent()) {
             $editor = $currentComponent->ui()->editor();
         }
-        else{
+        else {
 
             $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);
@@ -478,7 +478,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()
@@ -522,7 +522,7 @@ 
 
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -535,10 +535,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;
     }
@@ -552,7 +552,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -568,7 +568,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -716,17 +716,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;
         }
     }
@@ -755,7 +755,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname.'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);
 
 
@@ -918,7 +918,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;
     }
 
@@ -1016,7 +1016,7 @@ 
                 $this->addMessage($message);
             }
 
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
 
@@ -1048,7 +1048,7 @@ 
             $this->addMessage($deletedMessage);
         }
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1088,7 +1088,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));
@@ -1147,7 +1147,7 @@ 
             }
         }
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1176,7 +1176,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));
@@ -1220,7 +1220,7 @@ 
         $record = null;
         foreach ($records as $record) {
         }
-        if (! isset($record)) {
+        if (!isset($record)) {
             throw new app_AccessException('Sorry, You are not allowed to perform this operation');
         }
         if (!$record->isRestorable()) {
@@ -1234,7 +1234,7 @@ 
         $record->save();
         $this->addMessage($deletedMessage);
 
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
 
         return true;
     }
@@ -1256,7 +1256,7 @@ 
         $record = null;
         foreach ($records as $record) {
         }
-        if (! isset($record)) {
+        if (!isset($record)) {
             throw new app_AccessException('Sorry, You are not allowed to perform this operation');
         }
 
@@ -1269,7 +1269,7 @@ 
 
         $recordTitle = $record->getRecordTitle();
 
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
 
         $confirmedAction = $this->proxy()->restore($id);
@@ -1385,14 +1385,14 @@ 
         $registry = bab_getRegistryInstance();
 
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id. '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
 
         while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
 
         $userId = bab_getUserId();
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id. '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
 
         while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
@@ -1413,15 +1413,15 @@ 
     {
         $W = bab_Widgets();
         $tableview = $this->modelView(null, 'table');
-        $W->setUserConfiguration($tableview->getId(). '/currentFilterName', $filterName, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/currentFilterName', $filterName, 'widgets', false);
 
         $registry = bab_getRegistryInstance();
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $tableview->getId() . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$tableview->getId().'/filters');
         $filterValues = $registry->getValue($filterName);
 
         if (!$filterValues) {
-            $filterValues = $W->getUserConfiguration($tableview->getId() . '/filters/' . $filterName, 'widgets', false);
+            $filterValues = $W->getUserConfiguration($tableview->getId().'/filters/'.$filterName, 'widgets', false);
         }
 
         $tableview = $this->modelView($filterValues, 'table');
@@ -1440,7 +1440,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id. '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
 
         return $filter;
     }
@@ -1454,7 +1454,7 @@ 
     {
         if (isset($name)) {
             $W = bab_Widgets();
-            $filter = $W->getUserConfiguration($tableview->getId(). '/filters/' . $name, 'widgets', false);
+            $filter = $W->getUserConfiguration($tableview->getId().'/filters/'.$name, 'widgets', false);
             $filterValues = $filter['values'];
         } else {
             $filterValues = null;
@@ -1485,7 +1485,7 @@ 
             'values' => $filterValues,
         );
 
-        $W->setUserConfiguration($tableview->getId(). '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
 
         return true;
     }
@@ -1503,7 +1503,7 @@ 
         $Ui = $App->Ui();
 
         $currentFilterName = $this->getCurrentFilterName();
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $currentFilterName, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$currentFilterName, 'widgets', false);
 
         $page = $Ui->Page();
 
@@ -1556,7 +1556,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
 
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
 
         $page = $Ui->Page();
 
@@ -1608,7 +1608,7 @@ 
 
         $filterNames = $this->getFilterNames();
         foreach ($filterNames as $filterName) {
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
 
             $filterBox = $W->FlowItems()
                 ->setVerticalAlign('top')
@@ -1653,7 +1653,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
 
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
 
         $page = $Ui->Page();
 
@@ -1690,7 +1690,7 @@ 
         $this->requireDeleteMethod();
 
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
 
         return true;
     }

Braces +2 added lines, -4 removed lines

@@ -325,8 +325,7 @@ 
         $App = $this->App();
         if($currentComponent = $App->getCurrentComponent()){
             $Ui = $currentComponent->ui();
-        }
-        else{
+        } else{
             $Ui = $App->Ui();
         }
 
@@ -424,8 +423,7 @@ 
         $Ui = $App->Ui();
         if($currentComponent = $App->getCurrentComponent()){
             $editor = $currentComponent->ui()->editor();
-        }
-        else{
+        } else{
 
             $recordClassname = $this->getRecordClassName();
             $editorClassname =  $recordClassname . 'Editor';

programs/traceablerecord.class.php

Spacing +11 added lines, -11 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));
     }
 
     /**
@@ -384,10 +384,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()
     {

programs/controller.class.php

Spacing +40 added lines, -40 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();
 if ($App) {
@@ -36,7 +36,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);
 	}
 }
@@ -201,11 +201,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);
@@ -224,9 +224,9 @@ 
     static function getProxyInstance(Func_App $App, $classname)
     {
         $class = new ReflectionClass($classname);
-        $proxyClassname = $class->getShortName() . self::PROXY_CLASS_SUFFIX;
+        $proxyClassname = $class->getShortName().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) {
@@ -239,24 +239,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);
@@ -297,7 +297,7 @@ 
     protected function getObjectName($classname)
     {
         list($objectname) = explode('Controller', $classname);
-        if($this->App()->getComponentByName($objectname)){
+        if ($this->App()->getComponentByName($objectname)) {
             return strtolower($objectname);
         }
         list(, $objectname) = explode('_Ctrl', $classname);
@@ -319,7 +319,7 @@ 
 
         $reflector = new ReflectionClass(get_class($this));
         $parent = $reflector->getParentClass();
-        if($parent){
+        if ($parent) {
             $parentMethod = $parent->getMethod('__construct');
             $docComment = $parentMethod->getDocComment();
             if (strpos($docComment, '@isComponentController') !== false) {
@@ -330,7 +330,7 @@ 
         $rc = new ReflectionClass($fullClassName);
 
         if (!$rc->hasMethod($methodName)) {
-            throw new bab_InvalidActionException($fullClassName . '::' . $methodName);
+            throw new bab_InvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new ReflectionMethod($fullClassName, $methodName);
 
@@ -353,7 +353,7 @@ 
 
         $action = new Widget_Action();
 
-        $action->setMethod($this->getControllerTg(), $objectName . '.' . $methodName, $actionParams);
+        $action->setMethod($this->getControllerTg(), $objectName.'.'.$methodName, $actionParams);
 
         $docComment = $method->getDocComment();
         if (strpos($docComment, '@ajax') !== false) {
@@ -394,7 +394,7 @@ 
         $action->setParameters($actionParams);
 
 
-        list(,,$file) = explode('/', $App->controllerTg);
+        list(,, $file) = explode('/', $App->controllerTg);
 
         $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
@@ -420,24 +420,24 @@ 
             return false;
         }
 
-        list($objectName, ) = explode('.', $method);
+        list($objectName,) = explode('.', $method);
 
         if (!method_exists($this, $objectName)) {
             /* @var $component app_Component */
             $component = $this->app->getComponentByName(ucfirst($objectName));
-            if($component){
+            if ($component) {
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
             }
-            else{
+            else {
                 header('HTTP/1.0 400 Bad Request');
                 throw new app_UnknownActionException($action);
             }
         }
 
-        if(!isset($component)){
+        if (!isset($component)) {
             $objectController = $this->{$objectName}(false);
-            if ( ! ($objectController instanceof app_Controller)) {
+            if (!($objectController instanceof app_Controller)) {
                 return false;
             }
         }
@@ -451,7 +451,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(
@@ -472,7 +472,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');
@@ -527,7 +527,7 @@ 
                         if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         } else {
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -586,7 +586,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');
@@ -603,7 +603,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();
@@ -637,7 +637,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(
@@ -649,7 +649,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');
 
@@ -669,14 +669,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>'
             );
 
 
@@ -721,7 +721,7 @@ 
      */
     public function CustomField($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'customfield.ctrl.php';
+        require_once APP_CTRL_PATH.'customfield.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlCustomField', $proxy);
     }
 
@@ -732,7 +732,7 @@ 
      */
     public function CustomSection($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'customsection.ctrl.php';
+        require_once APP_CTRL_PATH.'customsection.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlCustomSection', $proxy);
     }
 }

Braces +1 added lines, -2 removed lines

@@ -428,8 +428,7 @@
             if($component){
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
-            }
-            else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 throw new app_UnknownActionException($action);
             }