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/record.ctrl.php

Indentation +1 added lines, -1 removed lines

@@ -1642,7 +1642,7 @@
             $W->SubmitButton()
                 ->setAjaxAction($confirmedAction)
                 ->setLabel($App->translate('Delete'))
-         );
+            );
         $form->addButton($W->SubmitButton()->setLabel($App->translate('Cancel'))->addClass('widget-close-dialog'));
         $page->addItem($form);
 

Spacing +34 added lines, -34 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/controller.class.php';
+require_once dirname(__FILE__).'/controller.class.php';
 
 
 
@@ -52,7 +52,7 @@ 
     {
         $App = $this->App();
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
 
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -104,9 +104,9 @@ 
             if ($showLabel) {
                 $text = $actions->getTitle();
             }
-            $html = '<li><a class="icon ' . $actions->getIcon() .  '" href="' . $actions->url() . '">' . $text . '</a></li>';
+            $html = '<li><a class="icon '.$actions->getIcon().'" href="'.$actions->url().'">'.$text.'</a></li>';
         } elseif ($actions instanceof Widget_Link) {
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+            $html = '<li>'.$actions->display($canvas).'</li>';
         } elseif (is_array($actions)) {
             if (isset($actions['items'])) {
                 $items = $actions['items'];
@@ -119,10 +119,10 @@ 
             if (isset($actions['icon'])) {
 
                 $html = '<li class="dropdown">'
-                    . '<a href="#" class="' . $actions['icon'] . ' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
+                    . '<a href="#" class="'.$actions['icon'].' icon dropdown-toogle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">'
                     . ($actions['icon'] === 'actions-context-menu'/*Func_Icons::ACTIONS_CONTEXT_MENU*/ ? '' : '<span class="caret"></span>')
                     . '</a>'
-                    . '<ul class="dropdown-menu dropdown-menu-right ' . Func_Icons::ICON_LEFT_SYMBOLIC . '">'
+                    . '<ul class="dropdown-menu dropdown-menu-right '.Func_Icons::ICON_LEFT_SYMBOLIC.'">'
                     . $html
                     . '</ul>';
             }
@@ -145,7 +145,7 @@ 
 
         $recordClassname = $this->getRecordClassName();
 
-        $viewClassname =  $recordClassname . 'TableView';
+        $viewClassname = $recordClassname.'TableView';
         if (method_exists($Ui, $viewClassname)) {
             $types['table'] = array(
                 'classname' => $viewClassname,
@@ -154,7 +154,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CardsView';
+        $viewClassname = $recordClassname.'CardsView';
         if (method_exists($Ui, $viewClassname)) {
             $types['cards'] = array(
                 'classname' => $viewClassname,
@@ -163,7 +163,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'MapView';
+        $viewClassname = $recordClassname.'MapView';
         if (method_exists($Ui, $viewClassname)) {
             $types['map'] = array(
                 'classname' => $viewClassname,
@@ -172,7 +172,7 @@ 
             );
         }
 
-        $viewClassname =  $recordClassname . 'CalendarView';
+        $viewClassname = $recordClassname.'CalendarView';
         if (method_exists($Ui, $viewClassname)) {
             $types['calendar'] = array(
                 'classname' => $viewClassname,
@@ -246,11 +246,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);
@@ -293,7 +293,7 @@ 
     public function getModelViewDefaultId($itemId = null)
     {
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_modelView';
+            $itemId = $this->getClass().'_modelView';
         }
 
         return $itemId;
@@ -327,20 +327,20 @@ 
 
         switch ($type) {
             case 'cards':
-                $tableviewClassname =  $recordClassname . 'CardsView';
+                $tableviewClassname = $recordClassname.'CardsView';
                 break;
 
             case 'map':
-                $tableviewClassname =  $recordClassname . 'MapView';
+                $tableviewClassname = $recordClassname.'MapView';
                 break;
 
             case 'calendar':
-                $tableviewClassname =  $recordClassname . 'CalendarView';
+                $tableviewClassname = $recordClassname.'CalendarView';
                 break;
 
             case 'table':
             default:
-                $tableviewClassname =  $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
 
@@ -406,10 +406,10 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $editorClassname =  $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         if (!isset($itemId)) {
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -454,7 +454,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()
@@ -498,7 +498,7 @@ 
 
         $filterVisibility = $this->getFilterVisibility($itemId);
         $filterVisibility = !$filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
 
         return true;
     }
@@ -511,10 +511,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;
     }
@@ -528,7 +528,7 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
+        $type = $W->getUserConfiguration($itemId.'/viewType');
         if (!isset($type)) {
             $type = 'table';
         }
@@ -544,7 +544,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
 
         return true;
     }
@@ -686,17 +686,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;
         }
     }
@@ -725,7 +725,7 @@ 
         $Ui = $App->Ui();
 
         $recordClassname = $this->getRecordClassName();
-        $fullFrameClassname =  $recordClassname . 'FullFrame';
+        $fullFrameClassname = $recordClassname.'FullFrame';
         $fullFrame = $Ui->$fullFrameClassname($record, $view);
 
 
@@ -888,7 +888,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;
     }
 
@@ -987,7 +987,7 @@ 
                 $this->addMessage($message);
             }
 
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
 
@@ -1019,7 +1019,7 @@ 
             $this->addMessage($deletedMessage);
         }
 
-        $this->addReloadSelector('.depends-' . strtolower($record->getClassName()));
+        $this->addReloadSelector('.depends-'.strtolower($record->getClassName()));
 
         return true;
     }
@@ -1050,7 +1050,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));

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 +33 added lines, -33 removed lines

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

programs/link.class.php

Indentation +197 added lines, -197 removed lines

@@ -69,205 +69,205 @@
 
 
 
-	/**
-	 * @param	string	$sourceClass
-	 */
-	public function joinSource($sourceClass)
-	{
-	    if (get_class($this->sourceId) !== $sourceClass . 'Set') {
-    	    $this->hasOne('sourceId', $sourceClass . 'Set');
-    		$this->join('sourceId');
-	    }
-	}
-
-
-	/**
-	 * @param	string	$targetClass
-	 */
-	public function joinTarget($targetClass = null)
-	{
-	    if (get_class($this->targetId) !== $targetClass . 'Set') {
-    		$this->hasOne('targetId', $targetClass . 'Set');
-    		$this->join('targetId');
-	    }
-	}
-
-
-
-	public function sourceIsA($recordClass)
-	{
-		return $this->sourceClass->is($recordClass);
-	}
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
-	{
-		$criteria = $this->sourceId->is($object->id)
+    /**
+     * @param	string	$sourceClass
+     */
+    public function joinSource($sourceClass)
+    {
+        if (get_class($this->sourceId) !== $sourceClass . 'Set') {
+            $this->hasOne('sourceId', $sourceClass . 'Set');
+            $this->join('sourceId');
+        }
+    }
+
+
+    /**
+     * @param	string	$targetClass
+     */
+    public function joinTarget($targetClass = null)
+    {
+        if (get_class($this->targetId) !== $targetClass . 'Set') {
+            $this->hasOne('targetId', $targetClass . 'Set');
+            $this->join('targetId');
+        }
+    }
+
+
+
+    public function sourceIsA($recordClass)
+    {
+        return $this->sourceClass->is($recordClass);
+    }
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSource(app_Record $object, $targetClass = null, $linkType = null)
+    {
+        $criteria = $this->sourceId->is($object->id)
             ->_AND_($this->sourceClass->is(get_class($object)));
 
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		if (is_a($this->targetId, 'app_TraceableRecordSet')) {
-			$criteria = $criteria->_AND_($this->targetId->deleted->is(false));
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForSources($objects, $targetClass, $linkType = null)
-	{
-		$sourceClass = null;
-		$sourceIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($sourceClass)) {
-				$sourceClass = get_class($obj);
-			}
-			$sourceIds[] = $obj->id;
-		}
-		$criteria = $this->sourceId->in($sourceIds)
-			->_AND_($this->sourceClass->is($sourceClass));
-
-		if (isset($targetClass)) {
-		    $this->joinTarget($targetClass);
-		    $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
-	{
-		$criteria = $this->targetId->is($object->id)
-			->_AND_($this->targetClass->is(get_class($object)));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-	/**
-	 *
-	 * @return ORM_Iterator
-	 */
-	public function selectForTargets($objects, $sourceClass = null, $linkType = null)
-	{
-		$targetClass = null;
-		$targetIds = array();
-
-		foreach ($objects as $obj) {
-			if (is_null($targetClass)) {
-				$targetClass = get_class($obj);
-			}
-			$targetIds[] = $obj->id;
-		}
-		$criteria = $this->targetId->in($targetIds)
-			->_AND_($this->targetClass->is($targetClass));
-
-		if (isset($sourceClass)) {
-		    $this->joinSource($sourceClass);
-			$criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
-		}
-
-		if (isset($linkType)) {
-			if (is_array($linkType)) {
-				$criteria = $criteria->_AND_($this->type->in($linkType));
-			} else {
-				$criteria = $criteria->_AND_($this->type->is($linkType));
-			}
-		}
-
-		return $this->select($criteria);
-	}
-
-
-
-	/**
-	 * delete all links to an object
-	 *
-	 * @param	app_Record		$object
-	 * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
-	 * @param	bool			$deleteTarget	if set to true, the target will be deleted to
-	 */
-	public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
-	{
-		$set = clone $this;
-		$App = $object->App();
-
-		$criteria = $set->sourceId->is($object->id)->_AND_(
-			$set->sourceClass->is(get_class($object))
-		);
-
-		if (null !== $targetClass) {
-			$criteria = $criteria->_AND_(
-				$set->targetClass->is($targetClass)
-			);
-		}
-		if (null !== $linkType) {
-			$criteria = $criteria->_AND_(
-				$set->type->is($linkType)
-			);
-		}
-
-		if ($deleteTarget) {
-			foreach($set->select($criteria) as $link) {
-
-				$className = $link->targetClass.'Set';
-
-				// remove prefix
-
-				$className = mb_substr($className, 1 + mb_strpos($className, '_'));
-				$targetSet = $App->$className();
-
-				$targetSet->delete($targetSet->id->is($link->targetId));
-			}
-		}
-
-		return $set->delete($criteria);
-	}
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        if (is_a($this->targetId, 'app_TraceableRecordSet')) {
+            $criteria = $criteria->_AND_($this->targetId->deleted->is(false));
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForSources($objects, $targetClass, $linkType = null)
+    {
+        $sourceClass = null;
+        $sourceIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($sourceClass)) {
+                $sourceClass = get_class($obj);
+            }
+            $sourceIds[] = $obj->id;
+        }
+        $criteria = $this->sourceId->in($sourceIds)
+            ->_AND_($this->sourceClass->is($sourceClass));
+
+        if (isset($targetClass)) {
+            $this->joinTarget($targetClass);
+            $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTarget(app_Record $object, $sourceClass = null, $linkType = null)
+    {
+        $criteria = $this->targetId->is($object->id)
+            ->_AND_($this->targetClass->is(get_class($object)));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+    /**
+     *
+     * @return ORM_Iterator
+     */
+    public function selectForTargets($objects, $sourceClass = null, $linkType = null)
+    {
+        $targetClass = null;
+        $targetIds = array();
+
+        foreach ($objects as $obj) {
+            if (is_null($targetClass)) {
+                $targetClass = get_class($obj);
+            }
+            $targetIds[] = $obj->id;
+        }
+        $criteria = $this->targetId->in($targetIds)
+            ->_AND_($this->targetClass->is($targetClass));
+
+        if (isset($sourceClass)) {
+            $this->joinSource($sourceClass);
+            $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
+        }
+
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
+                $criteria = $criteria->_AND_($this->type->in($linkType));
+            } else {
+                $criteria = $criteria->_AND_($this->type->is($linkType));
+            }
+        }
+
+        return $this->select($criteria);
+    }
+
+
+
+    /**
+     * delete all links to an object
+     *
+     * @param	app_Record		$object
+     * @param	string			$targetClass 	if target class is set, links will be deleted only for target classes
+     * @param	bool			$deleteTarget	if set to true, the target will be deleted to
+     */
+    public function deleteForSource(app_Record $object, $targetClass = null, $deleteTarget = false, $linkType = null)
+    {
+        $set = clone $this;
+        $App = $object->App();
+
+        $criteria = $set->sourceId->is($object->id)->_AND_(
+            $set->sourceClass->is(get_class($object))
+        );
+
+        if (null !== $targetClass) {
+            $criteria = $criteria->_AND_(
+                $set->targetClass->is($targetClass)
+            );
+        }
+        if (null !== $linkType) {
+            $criteria = $criteria->_AND_(
+                $set->type->is($linkType)
+            );
+        }
+
+        if ($deleteTarget) {
+            foreach($set->select($criteria) as $link) {
+
+                $className = $link->targetClass.'Set';
+
+                // remove prefix
+
+                $className = mb_substr($className, 1 + mb_strpos($className, '_'));
+                $targetSet = $App->$className();
+
+                $targetSet->delete($targetSet->id->is($link->targetId));
+            }
+        }
+
+        return $set->delete($criteria);
+    }
 
 
     /**

Spacing +5 added lines, -5 removed lines

@@ -74,8 +74,8 @@ 
 	 */
 	public function joinSource($sourceClass)
 	{
-	    if (get_class($this->sourceId) !== $sourceClass . 'Set') {
-    	    $this->hasOne('sourceId', $sourceClass . 'Set');
+	    if (get_class($this->sourceId) !== $sourceClass.'Set') {
+    	    $this->hasOne('sourceId', $sourceClass.'Set');
     		$this->join('sourceId');
 	    }
 	}
@@ -86,8 +86,8 @@ 
 	 */
 	public function joinTarget($targetClass = null)
 	{
-	    if (get_class($this->targetId) !== $targetClass . 'Set') {
-    		$this->hasOne('targetId', $targetClass . 'Set');
+	    if (get_class($this->targetId) !== $targetClass.'Set') {
+    		$this->hasOne('targetId', $targetClass.'Set');
     		$this->join('targetId');
 	    }
 	}
@@ -253,7 +253,7 @@ 
 		}
 
 		if ($deleteTarget) {
-			foreach($set->select($criteria) as $link) {
+			foreach ($set->select($criteria) as $link) {
 
 				$className = $link->targetClass.'Set';
 

programs/traceablerecord.class.php

Spacing +13 added lines, -13 removed lines

@@ -239,7 +239,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);
@@ -274,7 +274,7 @@ 
             return parent::save($record);
         }
 
-        require_once $GLOBALS['babInstallPath'] . '/utilit/dateTime.php';
+        require_once $GLOBALS['babInstallPath'].'/utilit/dateTime.php';
 
         $now = BAB_DateTime::now()->getIsoDateTime();
 
@@ -304,11 +304,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));
     }
 
     /**
@@ -398,7 +398,7 @@ 
 
         $linkSet->hasOne('sourceId', get_class($this));
 
-        $criteria =	$linkSet->targetClass->is(get_class($target))
+        $criteria = $linkSet->targetClass->is(get_class($target))
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -428,7 +428,7 @@ 
 
         $linkSet->hasOne('targetId', get_class($this));
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($this->getRecordClassName()));
         if (isset($linkType)) {
@@ -472,7 +472,7 @@ 
             $sourcesCriteria[] = $linkSet->sourceClass->is($sourceClass)->_AND_($linkSet->sourceId->in($sourceIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is($this->getRecordClassName()),
             $linkSet->any($sourcesCriteria)
         );
@@ -517,7 +517,7 @@ 
             $targetsCriteria[] = $linkSet->targetClass->is($targetClass)->_AND_($linkSet->targetId->in($targetIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->sourceClass->is($this->getRecordClassName()),
             $linkSet->any($targetsCriteria)
         );
@@ -575,7 +575,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->sourceClass->is(get_class($source))
+        $criteria = $linkSet->sourceClass->is(get_class($source))
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is(get_class($this)))
             ->_AND_($linkSet->targetId->is($this->id));
@@ -605,7 +605,7 @@ 
     {
         $linkSet = $this->App()->LinkSet();
 
-        $criteria =	$linkSet->targetClass->is(get_class($target))
+        $criteria = $linkSet->targetClass->is(get_class($target))
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is(get_class($this)))
             ->_AND_($linkSet->sourceId->is($this->id));

programs/customfield.ctrl.php

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

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;
+    }
 }

programs/define.php

Spacing +7 added lines, -7 removed lines

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

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

Spacing +4 added lines, -4 removed lines

@@ -34,13 +34,13 @@ 
      */
     public function includeBase()
     {
-        require_once APP_UI_PATH . 'base.ui.php';
-        require_once APP_UI_PATH . 'ui.helpers.php';
+        require_once APP_UI_PATH.'base.ui.php';
+        require_once APP_UI_PATH.'ui.helpers.php';
     }
 
     public function includePage()
     {
-        require_once APP_UI_PATH . 'page.class.php';
+        require_once APP_UI_PATH.'page.class.php';
     }
 
     /**
@@ -77,7 +77,7 @@ 
      */
     public function ExportSelectEditor($id, app_TableModelView $tableview, $filter = null)
     {
-        require_once dirname(__FILE__) . '/exportselect.ui.php';
+        require_once dirname(__FILE__).'/exportselect.ui.php';
         return new app_ExportSelectEditor($this->App(), $id, $tableview, $filter);
     }
 }
\ No newline at end of file