capwelton / libapp

programs/ui/page.class.php

Spacing +2 added lines, -2 removed lines

@@ -286,7 +286,7 @@ 
 
             // all widget have static id to not change id of others widgets in page
 
-            $infoMessages =  $_SESSION['app_msginfo'];
+            $infoMessages = $_SESSION['app_msginfo'];
             foreach ($infoMessages as $infoLine) {
                 $this->App()->Controller()->addMessage($infoLine);
             }
@@ -304,6 +304,6 @@ 
          * @see	app.jquery.js#window.babAddonLibApp.numberFormat
          */
         $this->setMetadata('numberFormatSeparator', mb_substr($str, 1, 1));
-        $this->setMetadata('numberFormatPrecision', mb_strlen($str) -2);
+        $this->setMetadata('numberFormatPrecision', mb_strlen($str) - 2);
     }
 }

programs/controller.class.php

Indentation +5 added lines, -5 removed lines

@@ -30,11 +30,11 @@
 
 class app_UnknownActionException extends Exception
 {
-	public function __construct($action, $code = 0)
-	{
-		$message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
-		parent::__construct($message, $code);
-	}
+    public function __construct($action, $code = 0)
+    {
+        $message = 'Unknown method "' . $action->getController() . '::' . $action->getMethod() . '"';
+        parent::__construct($message, $code);
+    }
 }
 
 

Spacing +53 added lines, -53 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);
 	}
 }
@@ -71,7 +71,7 @@ 
     public function addReloadSelector($reloadSelector, $withSSE = false, $for = null)
     {
         $this->reloadSelectors[$reloadSelector] = $reloadSelector;
-        if($withSSE){
+        if ($withSSE) {
             $sseRecordSet = $this->getSSERecordSet();
             $sseRecordSet->newReloadSelector($reloadSelector, $for);
         }
@@ -88,7 +88,7 @@ 
     
     public function getSSERecordSet()
     {
-        if(isset($this->SSERecordSet)){
+        if (isset($this->SSERecordSet)) {
             return $this->SSERecordSet;
         }
         
@@ -129,7 +129,7 @@ 
     public function __call($name, $arguments = array())
     {
         $component = $this->App()->getComponentByName($name);
-        if($component){
+        if ($component) {
             return call_user_func_array(array($component, 'controller'), $arguments);
         }
         throw new \app_Exception(sprintf($this->App()->translate('Unknown action %s'), $name));
@@ -219,11 +219,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);
@@ -242,9 +242,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) {
@@ -257,24 +257,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);
@@ -315,7 +315,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);
@@ -337,7 +337,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) {
@@ -348,7 +348,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);
 
@@ -371,7 +371,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) {
@@ -412,7 +412,7 @@ 
         $action->setParameters($actionParams);
 
 
-        list(,,$file) = explode('/', $App->controllerTg);
+        list(,, $file) = explode('/', $App->controllerTg);
 
         $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
@@ -438,24 +438,24 @@ 
             return false;
         }
 
-        list($objectName, ) = explode('.', $method);
+        list($objectName,) = explode('.', $method);
 
         if (!method_exists($this, $objectName)) {
             /* @var $component app_Component */
             $component = $this->app->getComponentByName($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;
             }
         }
@@ -469,7 +469,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(
@@ -487,7 +487,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');
@@ -544,7 +544,7 @@ 
                         if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         } else {
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -608,7 +608,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');
@@ -625,7 +625,7 @@ 
             );
 
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         
         $App = app_App();
         $W = bab_Widgets();
@@ -665,7 +665,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(
@@ -677,7 +677,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');
 
@@ -723,7 +723,7 @@ 
             echo bab_json_encode($json);
             die;
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 
@@ -761,7 +761,7 @@ 
             $W->Label(sprintf($App->translate('It has been logged with the following error code : %s'), $logCode))
         );
         
-        if(bab_isUserAdministrator()){
+        if (bab_isUserAdministrator()) {
             $contentBox->addItem(
                 $W->Section(
                     'Stack trace',
@@ -771,13 +771,13 @@ 
                 )->setFoldable(true, true)
             );
             $traces = explode("\n", $e->getTraceAsString());
-            foreach ($traces as $trace){
+            foreach ($traces as $trace) {
                 $stackTraceBox->addItem(
                     $W->Label($trace)
                 );
             }
         }
-        else{
+        else {
             $section->addItem(
                 $W->Label($App->translate('Please contact the administrator'))
             );
@@ -801,7 +801,7 @@ 
             echo bab_json_encode($json);
             die;
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal server error', true, 500);
+        header($_SERVER['SERVER_PROTOCOL'].' 500 Internal server error', true, 500);
         header('Cache-Control: no-cache, must-revalidate');
         header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 
@@ -839,7 +839,7 @@ 
             $W->Label(sprintf($App->translate('It has been logged with the following error code : %s'), $logCode))
         );
         
-        if(bab_isUserAdministrator()){
+        if (bab_isUserAdministrator()) {
             $contentBox->addItem(
                 $W->Section(
                     'Stack trace',
@@ -849,13 +849,13 @@ 
                 )->setFoldable(true, true)
             );
             $traces = explode("\n", $e->getTraceAsString());
-            foreach ($traces as $trace){
+            foreach ($traces as $trace) {
                 $stackTraceBox->addItem(
                     $W->Label($trace)
                 );
             }
         }
-        else{
+        else {
             $section->addItem(
                 $W->Label($App->translate('Please contact the administrator'))
             );
@@ -879,7 +879,7 @@ 
             echo bab_json_encode($json);
             die;
         }
-        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');
 
@@ -961,7 +961,7 @@ 
             'position' => $position
         );
         $babBody = bab_getBody();
-        if(!isset($babBody->messages['toasts'])){
+        if (!isset($babBody->messages['toasts'])) {
             $babBody->messages['toasts'] = array();
         }
         $babBody->messages['toasts'][] = $toast;
@@ -980,7 +980,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);
     }
 
@@ -991,7 +991,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);
     }
     
@@ -1002,7 +1002,7 @@ 
      */
     public function CustomContainer($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'customcontainer.ctrl.php';
+        require_once APP_CTRL_PATH.'customcontainer.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlCustomContainer', $proxy);
     }
 
@@ -1012,7 +1012,7 @@ 
      */
     public function Notification($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'notification.ctrl.php';
+        require_once APP_CTRL_PATH.'notification.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlNotification', $proxy);
     }
 
@@ -1022,7 +1022,7 @@ 
      */
     public function SSE($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'sse.ctrl.php';
+        require_once APP_CTRL_PATH.'sse.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlSSE', $proxy);
     }
     
@@ -1032,7 +1032,7 @@ 
      */
     public function AddonConfiguration($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'addonconfiguration.ctrl.php';
+        require_once APP_CTRL_PATH.'addonconfiguration.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlAddonConfiguration', $proxy);
     }
     
@@ -1042,7 +1042,7 @@ 
      */
     public function Configuration($proxy = true)
     {
-        require_once APP_CTRL_PATH . 'configuration.ctrl.php';
+        require_once APP_CTRL_PATH.'configuration.ctrl.php';
         return $this->App()->ControllerProxy('app_CtrlConfiguration', $proxy);
     }
 }

Braces +3 added lines, -6 removed lines

@@ -446,8 +446,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);
             }
@@ -776,8 +775,7 @@ 
                     $W->Label($trace)
                 );
             }
-        }
-        else{
+        } else{
             $section->addItem(
                 $W->Label($App->translate('Please contact the administrator'))
             );
@@ -854,8 +852,7 @@ 
                     $W->Label($trace)
                 );
             }
-        }
-        else{
+        } else{
             $section->addItem(
                 $W->Label($App->translate('Please contact the administrator'))
             );

programs/ui/ui.helpers.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORM_DateField) {
 			$widget = $W->DatePicker();
@@ -103,7 +103,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORM_DateField) {
 			$widget = $W->PeriodPicker();
@@ -206,7 +206,7 @@ 
 	$nbOptions = 0;
 	foreach ($iterator as $record) {
 		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
+			$optionText = $record->code.' - '.$record->$fieldName;
 		} else {
 			$optionText = $record->$fieldName;
 		}

Indentation +260 added lines, -260 removed lines

@@ -33,50 +33,50 @@ 
  */
 function app_genericSetEditor(ORM_RecordSet $set)
 {
-	$O = bab_functionality::get('LibOrm');
-	$O->init();
-	$W = bab_Widgets();
-	$layout = $W->VBoxLayout();
-	$layout->setVerticalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORM_DateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORM_RecordSet) {
-				$widget = app_genericSetEditor($field);
-				$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = bab_functionality::get('LibOrm');
+    $O->init();
+    $W = bab_Widgets();
+    $layout = $W->VBoxLayout();
+    $layout->setVerticalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORM_DateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORM_RecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -89,50 +89,50 @@ 
  */
 function app_genericSetFilterForm(ORM_RecordSet $set)
 {
-	$O = bab_functionality::get('LibOrm');
-	$O->init();
-	$W = bab_Widgets();
-	$layout = $W->FlowLayout();
-	$layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
-
-
-	$fields = $set->getFields();
-
-	foreach ($fields as $field) {
-		$description = $field->getDescription();
-		if (empty($description)) {
-			$description = $field->getName();
-		}
-		$fieldLabel = $W->Label($description . ':');
-
-		if ($field instanceof ORM_DateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORM_TimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORM_StringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORM_EnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORM_IntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORM_TextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORM_RecordSet) {
-			$widget = app_genericSetFilterForm($field);
-			$widget->addClass('sub-form');
-		} else {
-			$widget = null;
-		}
-		if (isset($widget)) {
-			$layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
-		}
-	}
-
-	return $layout;
+    $O = bab_functionality::get('LibOrm');
+    $O->init();
+    $W = bab_Widgets();
+    $layout = $W->FlowLayout();
+    $layout->setVerticalSpacing(1, 'em')->setHorizontalSpacing(1, 'em');
+
+
+    $fields = $set->getFields();
+
+    foreach ($fields as $field) {
+        $description = $field->getDescription();
+        if (empty($description)) {
+            $description = $field->getName();
+        }
+        $fieldLabel = $W->Label($description . ':');
+
+        if ($field instanceof ORM_DateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORM_TimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORM_StringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORM_EnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORM_IntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORM_TextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORM_RecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -145,47 +145,47 @@ 
  */
 function app_LabelledWidget($labelText, Widget_Displayable_Interface $widget)
 {
-	$W = bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof Widget_InputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof Widget_CheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(Widget_SizePolicy::MINIMUM),
-			$label
-		)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
-	} else {
-		$layout = $W->VBoxItems(
-			$label,
-			$widget
-		)->setVerticalSpacing(0.5, 'em');
-	}
-
-	return $layout;
+    $W = bab_Widgets();
+
+    $label = $W->Label($labelText);
+    if ($widget instanceof Widget_InputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof Widget_CheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(Widget_SizePolicy::MINIMUM),
+            $label
+        )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    } else {
+        $layout = $W->VBoxItems(
+            $label,
+            $widget
+        )->setVerticalSpacing(0.5, 'em');
+    }
+
+    return $layout;
 }
 
 
 
 function app_LabelledCheckbox($labelText, $checkboxName, $options = null)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
-	$label = $W->Label($labelText)->colon(false);
-	$checkbox = $W->Checkbox()->setName($checkboxName);
-	$label->setAssociatedWidget($checkbox);
-	if (isset($options)) {
-		$label->setSizePolicy(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(Widget_SizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(Widget_SizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -193,42 +193,42 @@ 
 
 function app_LabelledOrmSelect(ORM_MysqlIterator $iterator, $fieldName, $selectName, $label, $hidden = false, $groupFieldName = null)
 {
-	$W = bab_Widgets();
-
-	if (isset($groupFieldName)) {
-		$groupPathElements = explode('/', $groupFieldName);
-	}
-
-	$select = $W->Select()->setName($selectName);
-
-	$select->addOption('', '');
-
-	$nbOptions = 0;
-	foreach ($iterator as $record) {
-		if (isset($record->code)) {
-			$optionText = $record->code . ' - ' . $record->$fieldName;
-		} else {
-			$optionText = $record->$fieldName;
-		}
-		if (isset($groupFieldName)) {
-			$group = $record;
-			foreach ($groupPathElements as $groupPathElement) {
-				$group = $group->$groupPathElement;
-			}
-			$select->addOption($record->id, $optionText, $group);
-		} else {
-			$select->addOption($record->id, $optionText);
-		}
-		$nbOptions++;
-		$lastId = $record->id;
-	}
-
-	if ($nbOptions == 1) {
-		$select->setValue($lastId);
-	}
-
-
-	return app_LabelledWidget($label, $select);
+    $W = bab_Widgets();
+
+    if (isset($groupFieldName)) {
+        $groupPathElements = explode('/', $groupFieldName);
+    }
+
+    $select = $W->Select()->setName($selectName);
+
+    $select->addOption('', '');
+
+    $nbOptions = 0;
+    foreach ($iterator as $record) {
+        if (isset($record->code)) {
+            $optionText = $record->code . ' - ' . $record->$fieldName;
+        } else {
+            $optionText = $record->$fieldName;
+        }
+        if (isset($groupFieldName)) {
+            $group = $record;
+            foreach ($groupPathElements as $groupPathElement) {
+                $group = $group->$groupPathElement;
+            }
+            $select->addOption($record->id, $optionText, $group);
+        } else {
+            $select->addOption($record->id, $optionText);
+        }
+        $nbOptions++;
+        $lastId = $record->id;
+    }
+
+    if ($nbOptions == 1) {
+        $select->setValue($lastId);
+    }
+
+
+    return app_LabelledWidget($label, $select);
 }
 
 
@@ -236,108 +236,108 @@ 
 
 function app_OrmWidget(ORM_Field $field)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
 
-	if ($field instanceof ORM_DateField) {
-		$widget = $W->DatePicker();
-	} else if ($field instanceof ORM_TimeField) {
-		$widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORM_DatetimeField) {
-	    $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-	} else if ($field instanceof ORM_EnumField) {
-		$widget = $W->Select();
+    if ($field instanceof ORM_DateField) {
+        $widget = $W->DatePicker();
+    } else if ($field instanceof ORM_TimeField) {
+        $widget = $W->TimeEdit(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORM_DatetimeField) {
+        $widget = $W->DateTimePicker(); //->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+    } else if ($field instanceof ORM_EnumField) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
-		$widget->addOption('', '');
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORM_SetField) {
-		$widget = $W->MultiSelect()->setSelectedList(2);
-		$values = $field->getValues();
-		foreach ($values as $key => $value) {
-			$widget->addOption($key, $value);
-		}
-	} else if ($field instanceof ORM_UserField) {
-	    $widget = $W->SuggestUser()
-    	    ->setMinChars(0)
-    	    ->setSizePolicy(Func_Icons::ICON_LEFT_16);
-	} else if ($field instanceof ORM_CurrencyField) {
-		$widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
-	} else if ($field instanceof ORM_BoolField) {
-		$widget = $W->CheckBox()->setCheckedValue('1');
-	} else if ($field instanceof ORM_IntField) {
-		$widget = $W->LineEdit()
-						->setSize(6)->addClass('widget-input-numeric');
-	} else if ($field instanceof ORM_EmailField) {
-		$widget = $W->EmailLineEdit()
-						->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_FileField) {
-	    $widget = $W->FilePicker();
-	} else if ($field instanceof ORM_StringField) {
-		$widget = $W->LineEdit()
-			->setMaxSize($field->getMaxLength());
-	} else if ($field instanceof ORM_TextField) {
-		$widget = $W->TextEdit()
-		  ->addClass('widget-autoresize');
-	} else if ($field instanceof ORM_PkField) {
-	    $widget = $W->Hidden();
-	} else if ($field instanceof ORM_FkField) {
-		$widget = $W->Select();
-		$fieldName = $field->getName();
-		$parentSet = clone $field->getParentSet();
-		$parentSet->join($fieldName);
-		$set = $parentSet->$fieldName;
-		$records = $set->select();
-		$records->orderAsc($set->name);
-		$pkName = $set->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else if ($field instanceof ORM_RecordSet) {
-		$widget = $W->Select();
+        $widget->addOption('', '');
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_SetField) {
+        $widget = $W->MultiSelect()->setSelectedList(2);
+        $values = $field->getValues();
+        foreach ($values as $key => $value) {
+            $widget->addOption($key, $value);
+        }
+    } else if ($field instanceof ORM_UserField) {
+        $widget = $W->SuggestUser()
+            ->setMinChars(0)
+            ->setSizePolicy(Func_Icons::ICON_LEFT_16);
+    } else if ($field instanceof ORM_CurrencyField) {
+        $widget = $W->LineEdit()->setSize(6)->addClass('widget-input-currency');
+    } else if ($field instanceof ORM_BoolField) {
+        $widget = $W->CheckBox()->setCheckedValue('1');
+    } else if ($field instanceof ORM_IntField) {
+        $widget = $W->LineEdit()
+                        ->setSize(6)->addClass('widget-input-numeric');
+    } else if ($field instanceof ORM_EmailField) {
+        $widget = $W->EmailLineEdit()
+                        ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_FileField) {
+        $widget = $W->FilePicker();
+    } else if ($field instanceof ORM_StringField) {
+        $widget = $W->LineEdit()
+            ->setMaxSize($field->getMaxLength());
+    } else if ($field instanceof ORM_TextField) {
+        $widget = $W->TextEdit()
+            ->addClass('widget-autoresize');
+    } else if ($field instanceof ORM_PkField) {
+        $widget = $W->Hidden();
+    } else if ($field instanceof ORM_FkField) {
+        $widget = $W->Select();
+        $fieldName = $field->getName();
+        $parentSet = clone $field->getParentSet();
+        $parentSet->join($fieldName);
+        $set = $parentSet->$fieldName;
+        $records = $set->select();
+        $records->orderAsc($set->name);
+        $pkName = $set->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else if ($field instanceof ORM_RecordSet) {
+        $widget = $W->Select();
 ////		$widget = $W->MultiSelect()->setSingleSelect();
 //		$fieldName = $field->getName();
 //		$parentSet = $field->getParentSet();
 //		$parentSet->join($fieldName);
 //		$set = $parentSet->$fieldName;
-		$records = $field->select();
-		$records->orderAsc($field->name);
-		$pkName = $field->getPrimaryKey();
-		$widget->addOption('', '');
-		foreach ($records as $record) {
-			$widget->addOption($record->$pkName, $record->name);
-		}
-	} else {
-		$widget = $W->LineEdit();
-	}
-
-	$widget->setName($field->getName());
-
-	return $widget;
+        $records = $field->select();
+        $records->orderAsc($field->name);
+        $pkName = $field->getPrimaryKey();
+        $widget->addOption('', '');
+        foreach ($records as $record) {
+            $widget->addOption($record->$pkName, $record->name);
+        }
+    } else {
+        $widget = $W->LineEdit();
+    }
+
+    $widget->setName($field->getName());
+
+    return $widget;
 }
 
 
 
 function app_LabelledOrmWidget(ORM_Field $field, $label = null, $hidden = false)
 {
-	$W = bab_Widgets();
+    $W = bab_Widgets();
 
-	if ($hidden) {
-		$widget = $W->Hidden();
-		$widget->setName($field->getName());
-		return $widget;
-	}
+    if ($hidden) {
+        $widget = $W->Hidden();
+        $widget->setName($field->getName());
+        return $widget;
+    }
 
-	if (is_null($label)) {
-		$label = $field->getDescription();
-	}
+    if (is_null($label)) {
+        $label = $field->getDescription();
+    }
 
-	$widget = app_OrmWidget($field);
+    $widget = app_OrmWidget($field);
 
-	return app_LabelledWidget($label, $widget);
+    return app_LabelledWidget($label, $widget);
 }
 
 
@@ -353,16 +353,16 @@ 
  */
 function app_dateTime(ORM_Field $field, $value) {
 
-	$W = bab_functionality::get('Widgets');
-	$name = $field->getName();
-	$label = $W->Label($field->getDescription());
+    $W = bab_functionality::get('Widgets');
+    $name = $field->getName();
+    $label = $W->Label($field->getDescription());
 
-	$frame = app_dateTimeField($name, $label, $value);
+    $frame = app_dateTimeField($name, $label, $value);
 
-	return $W->VBoxItems(
-		$label,
-		$frame
-	);
+    return $W->VBoxItems(
+        $label,
+        $frame
+    );
 
 }
 
@@ -376,24 +376,24 @@ 
  */
 function app_dateTimeField($fieldName, Widget_Label $label, $value = null)
 {
-	$W = bab_functionality::get('Widgets');
+    $W = bab_functionality::get('Widgets');
 
-	$datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
-	$timepart = $W->TimePicker()->setName('time');
+    $datepart = $W->DatePicker()->setAssociatedLabel($label)->setName('date');
+    $timepart = $W->TimePicker()->setName('time');
 
-	if (isset($value)) {
+    if (isset($value)) {
 
-		$value = explode(' ', $value);
+        $value = explode(' ', $value);
 
-		$datepart->setValue($value[0]);
-		$timepart->setValue($value[1]);
-	}
+        $datepart->setValue($value[0]);
+        $timepart->setValue($value[1]);
+    }
 
-	$datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
-			->addItem($datepart)
-			->addItem($timepart);
+    $datetime = $W->Frame(null, $W->HBoxLayout())->setName($fieldName)
+            ->addItem($datepart)
+            ->addItem($timepart);
 
-	return $datetime;
+    return $datetime;
 }
 
 

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

Spacing +1 added lines, -1 removed lines

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

programs/traceablerecord.class.php

Indentation +4 added lines, -4 removed lines

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

Spacing +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/ui/customfield.ui.php

Indentation +44 added lines, -44 removed lines

@@ -30,19 +30,19 @@ 
  */
 class app_CustomFieldTableView extends app_TableModelView
 {
-	/**
-	 * @param ORM_Record	$record
-	 * @param string		$fieldPath
-	 * @return Widget_Item
-	 */
-	protected function computeCellContent(ORM_Record $record, $fieldPath)
-	{
-		$W = bab_Widgets();
-		$App = $record->App();
+    /**
+     * @param ORM_Record	$record
+     * @param string		$fieldPath
+     * @return Widget_Item
+     */
+    protected function computeCellContent(ORM_Record $record, $fieldPath)
+    {
+        $W = bab_Widgets();
+        $App = $record->App();
 
-		$editAction = $App->Controller()->CustomField()->edit($record->id);
+        $editAction = $App->Controller()->CustomField()->edit($record->id);
 
-		switch ($fieldPath) {
+        switch ($fieldPath) {
 
             case '_actions_':
                 $box = $W->FlowItems();
@@ -62,19 +62,19 @@ 
                 }
                 return $box;
 
-			case 'mandatory':
-			case 'visible_in_shop':
-				if (self::getRecordFieldValue($record, $fieldPath))
-				{
-					return $W->Label($App->translate('Yes'));
-				} else {
-					return $W->Label($App->translate('No'));
-				}
-				break;
-		}
+            case 'mandatory':
+            case 'visible_in_shop':
+                if (self::getRecordFieldValue($record, $fieldPath))
+                {
+                    return $W->Label($App->translate('Yes'));
+                } else {
+                    return $W->Label($App->translate('No'));
+                }
+                break;
+        }
 
-		return parent::computeCellContent($record, $fieldPath);
-	}
+        return parent::computeCellContent($record, $fieldPath);
+    }
 
 
 
@@ -214,7 +214,7 @@ 
                 ->addClass('widget-close-dialog')
                 ->setLabel($App->translate('Cancel'))
         );
-	}
+    }
 
 
     protected function section()
@@ -371,27 +371,27 @@ 
 
 
 
-	public function mandatory()
-	{
-		$App = $this->App();
-		$W = $this->widgets;
+    public function mandatory()
+    {
+        $App = $this->App();
+        $W = $this->widgets;
 
-		return $this->labelledField(
-			$App->translate('Mandatory field'),
-			$W->Checkbox(),
-			__FUNCTION__
-		);
-	}
+        return $this->labelledField(
+            $App->translate('Mandatory field'),
+            $W->Checkbox(),
+            __FUNCTION__
+        );
+    }
 
-	public function visible_in_shop()
-	{
-		$App = $this->App();
-		$W = $this->widgets;
+    public function visible_in_shop()
+    {
+        $App = $this->App();
+        $W = $this->widgets;
 
-		return $this->labelledField(
-			$App->translate('Visible in online shop'),
-			$W->Checkbox(),
-			__FUNCTION__
-		);
-	}
+        return $this->labelledField(
+            $App->translate('Visible in online shop'),
+            $W->Checkbox(),
+            __FUNCTION__
+        );
+    }
 }

programs/customfield.ctrl.php

Indentation +92 added lines, -92 removed lines

@@ -86,122 +86,122 @@
 

 

 

-	/**

-	 * @return Widget_Page

-	 */

-	public function edit($customfield = null)

-	{

-		$W = bab_Widgets();

-		$App = $this->App();

-		$Ui = $App->Ui();

-		$page = $Ui->Page();

+    /**

+     * @return Widget_Page

+     */

+    public function edit($customfield = null)

+    {

+        $W = bab_Widgets();

+        $App = $this->App();

+        $Ui = $App->Ui();

+        $page = $Ui->Page();

 

-		$page->addClass('app-page-editor');

-		$page->setTitle($App->translate('Edit custom field'));

+        $page->addClass('app-page-editor');

+        $page->setTitle($App->translate('Edit custom field'));

 

-		if (null !== $customfield) {

-		    $set = $App->CustomFieldSet();

-			$customfield = $set->request($customfield);

-		}

+        if (null !== $customfield) {

+            $set = $App->CustomFieldSet();

+            $customfield = $set->request($customfield);

+        }

 

-		$form = $Ui->CustomFieldEditor($customfield);

+        $form = $Ui->CustomFieldEditor($customfield);

 

-		$page->addItem($form);

+        $page->addItem($form);

 

-		if ($customfield instanceof app_CustomField) {

-			$actionsFrame = $page->ActionsFrame();

-			$page->addContextItem($actionsFrame);

+        if ($customfield instanceof app_CustomField) {

+            $actionsFrame = $page->ActionsFrame();

+            $page->addContextItem($actionsFrame);

 

-			$actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));

-		}

+            $actionsFrame->addItem($W->Link($W->Icon($App->translate('Delete'), Func_Icons::ACTIONS_EDIT_DELETE), $this->proxy()->delete($customfield->id)));

+        }

 

-		return $page;

-	}

+        return $page;

+    }

 

 

-	/**

-	 * @return bool

-	 */

-	public function save($customfield = null)

-	{

-	    $App = $this->App();

+    /**

+     * @return bool

+     */

+    public function save($customfield = null)

+    {

+        $App = $this->App();

 

-	    $set = $App->CustomFieldSet();

+        $set = $App->CustomFieldSet();

 

-		if (empty($customfield['id'])) {

-			$record = $set->newRecord();

-		} else {

-			$record = $set->get($customfield['id']);

-		}

+        if (empty($customfield['id'])) {

+            $record = $set->newRecord();

+        } else {

+            $record = $set->get($customfield['id']);

+        }

 

-		if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {

-		    $enumvalues = array();

-		    foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {

-		        $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);

-		    }

-			$record->enumvalues = serialize($enumvalues);

-		} else {

-			$record->enumvalues = '';

-		}

+        if ('Enum' === $customfield['fieldtype'] || 'Set' === $customfield['fieldtype']) {

+            $enumvalues = array();

+            foreach ($customfield['enumvalues'] as $enumkey => $enumvalue) {

+                $enumvalues[$enumkey] = $set->enumvalues->input($enumvalue);

+            }

+            $record->enumvalues = serialize($enumvalues);

+        } else {

+            $record->enumvalues = '';

+        }

 

-		unset($customfield['enumvalues']);

-		$record->setFormInputValues($customfield);

+        unset($customfield['enumvalues']);

+        $record->setFormInputValues($customfield);

 

-		$record->save();

+        $record->save();

 

-		// refresh target table structure

+        // refresh target table structure

 

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

-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

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

+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

 

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

-		if (method_exists($recordSet, 'useLang')) {

-		    // This is necessary if the recordSet constructor uses a setLang().

-		    // We need to revert to multilang fields before synchronizing.

-		    $recordSet->useLang(false);

-		}

+        $recordSet = $App->$object();

+        if (method_exists($recordSet, 'useLang')) {

+            // This is necessary if the recordSet constructor uses a setLang().

+            // We need to revert to multilang fields before synchronizing.

+            $recordSet->useLang(false);

+        }

 

-		$sql = $mysqlbackend->setToSql($recordSet);

+        $sql = $mysqlbackend->setToSql($recordSet);

 

-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

-		$synchronize = new bab_synchronizeSql();

-		$synchronize->fromSqlString($sql);

+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

+        $synchronize = new bab_synchronizeSql();

+        $synchronize->fromSqlString($sql);

 

-		return true;

-	}

+        return true;

+    }

 

 

     /**

      * {@inheritDoc}

      * @see app_CtrlRecord::delete()

      */

-	public function delete($customfield)

-	{

-	    $App = $this->App();

-

-	    if (!$customfield) {

-		    throw new app_AccessException($App->translate('Access denied'));

-		}

-

-		$set = $App->CustomFieldSet();

-		$record = $set->request($customfield);

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

-		$set->delete($set->id->is($customfield));

-

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

-		if (method_exists($recordSet, 'useLang')) {

-		    // This is necessary if the recordSet constructor uses a setLang().

-		    // We need to revert to multilang fields before synchronizing.

-		    $recordSet->useLang(false);

-		}

-

-		$mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

-		$sql = $mysqlbackend->setToSql($recordSet);

-

-		require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

-		$synchronize = new bab_synchronizeSql();

-		$synchronize->fromSqlString($sql);

-

-		return true;

-	}

+    public function delete($customfield)

+    {

+        $App = $this->App();

+

+        if (!$customfield) {

+            throw new app_AccessException($App->translate('Access denied'));

+        }

+

+        $set = $App->CustomFieldSet();

+        $record = $set->request($customfield);

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

+        $set->delete($set->id->is($customfield));

+

+        $recordSet = $App->$object();

+        if (method_exists($recordSet, 'useLang')) {

+            // This is necessary if the recordSet constructor uses a setLang().

+            // We need to revert to multilang fields before synchronizing.

+            $recordSet->useLang(false);

+        }

+

+        $mysqlbackend = new ORM_MySqlBackend($GLOBALS['babDB']);

+        $sql = $mysqlbackend->setToSql($recordSet);

+

+        require_once $GLOBALS['babInstallPath'].'utilit/devtools.php';

+        $synchronize = new bab_synchronizeSql();

+        $synchronize->fromSqlString($sql);

+

+        return true;

+    }

 }

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2008 by CANTICO ({@link http://www.cantico.fr})

  */

 

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

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

 

 /**

  * This controller manages actions that can be performed on custom fields

@@ -39,7 +39,7 @@ 
             $W->Link(

                 $App->translate('Add a custom field'),

                 $this->proxy()->edit()

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

+            )->addClass('icon', Func_Icons::ACTIONS_LIST_ADD)

             ->setOpenMode(Widget_Link::OPEN_DIALOG_AND_RELOAD)

         );

 

programs/customfield.class.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
             throw new app_SaveException($this->App()->translate('The name is mandatory'));

         }

         

-        return '_' . $name;

+        return '_'.$name;

     }