capwelton / libapp

programs/Ctrl/AppCtrlConfiguration.php

Spacing +12 added lines, -12 removed lines

@@ -40,10 +40,10 @@ 
     public function __construct(Func_App $app = null)
     {
         parent::__construct($app);
-        if(! bab_isUserAdministrator()){
+        if (!bab_isUserAdministrator()) {
             $action = WidgetAction::fromRequest();
             list (, $method) = explode('.', $action->getMethod());
-            if($method !== 'accessDenied'){
+            if ($method !== 'accessDenied') {
                 /**
                  * @var WidgetAction
                  */
@@ -101,7 +101,7 @@ 
         $box->addClass('reload-configuration-page');
         $box->addClass('widget-100pc');
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $this->resetCurrentTab();
         }
         
@@ -111,16 +111,16 @@ 
         $navBoxHtml = '<ul class="nav nav-tabs">';
         $htmlCanvas = $W->HtmlCanvas();
         
-        foreach ($configurationItems as $tabId => $tab){
+        foreach ($configurationItems as $tabId => $tab) {
             $tabLink = $W->Link($tab['tabTitle'], $this->proxy()
                 ->setDisplayTab($tabId))
                 ->setOpenMode(WidgetLink::OPEN_DIALOG);
             $tabLinkHtml = '<li role="configuration"';
-            if($tabId == $currentTab){
+            if ($tabId == $currentTab) {
                 $tabLinkHtml .= ' class="active"';
             }
             $tabLinkHtml .= '>';
-            $tabLinkHtml .= $tabLink->display($htmlCanvas) . '</li>';
+            $tabLinkHtml .= $tabLink->display($htmlCanvas).'</li>';
             $navBoxHtml .= $tabLinkHtml;
         }
         
@@ -149,19 +149,19 @@ 
             ->addClass('icon-left icon-48x48 icon-left-48');
         $box->addItem($configBox);
         
-        if(! isset($configurationItems[$currentTab])){
+        if (!isset($configurationItems[$currentTab])) {
             return $box;
         }
         
         $tab = $configurationItems[$currentTab];
         
-        foreach ($tab['tabContent'] as $tabSection){
-            if(! isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])){
+        foreach ($tab['tabContent'] as $tabSection) {
+            if (!isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])) {
                 continue;
             }
             $configBox->addItem($W->Section($tabSection['sectionName'], $sectionContentBox = $W->HBoxItems())
                 ->setFoldable(true));
-            foreach ($tabSection['sectionContent'] as $tabSection){
+            foreach ($tabSection['sectionContent'] as $tabSection) {
                 $sectionContentBox->addItem($tabSection);
             }
         }
@@ -186,9 +186,9 @@ 
         );
         
         $definitions = $App->getComponentDefinitions();
-        foreach ($definitions as $packageName => $definition){
+        foreach ($definitions as $packageName => $definition) {
             /* @var $definition AppComponentDefinition */
-            if(! method_exists($definition, 'getConfiguration')){
+            if (!method_exists($definition, 'getConfiguration')) {
                 continue;
             }
             $configurationItems[$packageName] = array(

programs/Ctrl/AppController.php

Spacing +112 added lines, -112 removed lines

@@ -39,10 +39,10 @@ 
 use Capwelton\LibApp\Func_App;
 use Capwelton\LibApp\AppComponent;
 use Capwelton\LibOrm\Exceptions\ORMException;
-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';
 
 /**
  * @method self proxy()
@@ -76,7 +76,7 @@ 
     public function addReloadSelector($reloadSelector, $withSSE = false, $for = null)
     {
         $this->reloadSelectors[$reloadSelector] = $reloadSelector;
-        if($withSSE){
+        if ($withSSE) {
             $sseRecordSet = $this->getSSERecordSet();
             $sseRecordSet->newReloadSelector($reloadSelector, $for);
         }
@@ -93,7 +93,7 @@ 
     
     public function getSSERecordSet()
     {
-        if(isset($this->SSERecordSet)){
+        if (isset($this->SSERecordSet)) {
             return $this->SSERecordSet;
         }
         
@@ -138,7 +138,7 @@ 
     public function __call($name, $arguments = array())
     {
         $component = $this->App()->getComponentByName($name);
-        if($component){
+        if ($component) {
             return call_user_func_array(array(
                 $component,
                 'controller'
@@ -181,7 +181,7 @@ 
      */
     public function isAjaxRequest()
     {
-        if(! isset($this->isAjaxRequest)){
+        if (!isset($this->isAjaxRequest)) {
             $this->isAjaxRequest = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
         }
         return $this->isAjaxRequest;
@@ -193,14 +193,14 @@ 
      */
     public function requireCredential($message = null)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $authType = 'Basic';
         }
-        else{
+        else {
             $authType = '';
         }
         
-        if(! isset($message)){
+        if (!isset($message)) {
             $message = $this->App()->translate('You must be logged in to access this page.');
         }
         
@@ -224,10 +224,10 @@ 
         list ($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
         /** @var Func_App */
-        $App = @\bab_functionality::get('App/' . $functionalityName);
+        $App = @\bab_functionality::get('App/'.$functionalityName);
         
-        if(!$App){
-            throw new AppException('Faild to autodetect functionality App/' . $functionalityName . ', the getInstance method is deprecated, use $App->ControllerProxy() instead');
+        if (!$App) {
+            throw new AppException('Faild to autodetect functionality App/'.$functionalityName.', the getInstance method is deprecated, use $App->ControllerProxy() instead');
         }
         
         $controller = $App->ControllerProxy($classname, $proxy);
@@ -245,44 +245,44 @@ 
     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;
         $finalProxyClassname = $class->getNamespaceName()."\\".$proxyClassname;
-        if(! class_exists($finalProxyClassname)){
+        if (!class_exists($finalProxyClassname)) {
             $classStr = "";
-            if($class->getNamespaceName() != ""){
+            if ($class->getNamespaceName() != "") {
                 $classStr .= " namespace ".$class->getNamespaceName()."; ";
             }
-            $classStr .= 'class ' . $proxyClassname . ' extends ' . $class->getShortName() . ' {' . "\n";
+            $classStr .= 'class '.$proxyClassname.' extends '.$class->getShortName().' {'."\n";
             $methods = $class->getMethods();
             
             $classStr .= '	public function __construct($App) {
                 $this->setApp($App);
             }' . "\n";
             
-            foreach ($methods as $method){
-                if($method->name === '__construct' || ! $method->isPublic() || $method->isStatic() || $method->isFinal() || $method->name === 'setApp' || $method->name === 'App' || $method->name === 'setCrm' || $method->name === 'Crm'){
+            foreach ($methods as $method) {
+                if ($method->name === '__construct' || !$method->isPublic() || $method->isStatic() || $method->isFinal() || $method->name === 'setApp' || $method->name === 'App' || $method->name === 'setCrm' || $method->name === 'Crm') {
                     continue;
                 }
                 
-                $classStr .= '	public function ' . $method->name . '(';
+                $classStr .= '	public function '.$method->name.'(';
                 $parameters = $method->getParameters();
                 $parametersStr = array();
-                foreach ($parameters as $parameter){
+                foreach ($parameters as $parameter) {
                     
-                    if($parameter->isDefaultValueAvailable()){
-                        $parametersStr[] = '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                    if ($parameter->isDefaultValueAvailable()) {
+                        $parametersStr[] = '$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     }
-                    else{
-                        $parametersStr[] = '$' . $parameter->name;
+                    else {
+                        $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);
         }
@@ -320,7 +320,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);
@@ -342,18 +342,18 @@ 
         
         $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){
+            if (strpos($docComment, '@isComponentController') !== false) {
                 $fullClassName = $parent->getName();
             }
         }
         
         $rc = new \ReflectionClass($fullClassName);
         
-        if(! $rc->hasMethod($methodName)){
-            throw new \bab_InvalidActionException($fullClassName . '::' . $methodName);
+        if (!$rc->hasMethod($methodName)) {
+            throw new \bab_InvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new \ReflectionMethod($fullClassName, $methodName);
         
@@ -362,32 +362,32 @@ 
         $parameters = $method->getParameters();
         $actionParams = array();
         $argNumber = 0;
-        foreach ($parameters as $parameter){
+        foreach ($parameters as $parameter) {
             $parameterName = $parameter->getName();
-            if(isset($args[$argNumber])){
+            if (isset($args[$argNumber])) {
                 $actionParams[$parameterName] = $args[$argNumber];
             }
-            elseif($parameter->isDefaultValueAvailable()){
+            elseif ($parameter->isDefaultValueAvailable()) {
                 $actionParams[$parameterName] = $parameter->getDefaultValue();
             }
-            else{
+            else {
                 $actionParams[$parameterName] = null;
             }
-            $argNumber ++;
+            $argNumber++;
         }
         
         $action = new WidgetAction();
         
-        $action->setMethod($this->getControllerTg(), $objectName . '.' . $methodName, $actionParams);
+        $action->setMethod($this->getControllerTg(), $objectName.'.'.$methodName, $actionParams);
         
         $docComment = $method->getDocComment();
-        if(strpos($docComment, '@ajax') !== false){
+        if (strpos($docComment, '@ajax') !== false) {
             $action->setAjax(true);
         }
-        if(strpos($docComment, '@requireSaveMethod') !== false && method_exists($action, 'setRequireSaveMethod')){
+        if (strpos($docComment, '@requireSaveMethod') !== false && method_exists($action, 'setRequireSaveMethod')) {
             $action->setRequireSaveMethod(true);
         }
-        if(strpos($docComment, '@requireDeleteMethod') !== false && method_exists($action, 'setRequireDeleteMethod')){
+        if (strpos($docComment, '@requireDeleteMethod') !== false && method_exists($action, 'setRequireDeleteMethod')) {
             $action->setRequireDeleteMethod(true);
         }
         
@@ -416,9 +416,9 @@ 
         
         $action->setParameters($actionParams);
         
-        list (, , $file) = explode('/', $App->controllerTg);
+        list (,, $file) = explode('/', $App->controllerTg);
         
-        $action->setParameter('addon', $App->getAddonName() . '.' . $file);
+        $action->setParameter('addon', $App->getAddonName().'.'.$file);
         $action->setParameter('idx', $idx);
         
         return $action;
@@ -436,44 +436,44 @@ 
         
         $method = $action->getMethod();
         
-        if(! isset($method) || '' === $method){
+        if (!isset($method) || '' === $method) {
             return false;
         }
         
         list ($objectName,) = explode('.', $method);
         
-        if(! method_exists($this, $objectName)){
+        if (!method_exists($this, $objectName)) {
             /* @var $component AppComponent */
             $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 AppUnknownActionException($action);
             }
         }
         
-        if(! isset($component)){
+        if (!isset($component)) {
             $objectController = $this->{$objectName}(false);
-            if(! ($objectController instanceof AppController)){
+            if (!($objectController instanceof AppController)) {
                 return false;
             }
         }
         
-        try{
+        try {
             $returnedValue = $objectController->execAction($action);
         }
-        catch (AppAccessException $e){
+        catch (AppAccessException $e) {
             
-            if(! bab_isUserLogged() && $e->requireCredential){
+            if (!bab_isUserLogged() && $e->requireCredential) {
                 bab_requireCredential($e->getMessage());
             }
-            else{
-                if($this->isAjaxRequest()){
+            else {
+                if ($this->isAjaxRequest()) {
                     
-                    header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+                    header($_SERVER['SERVER_PROTOCOL'].' 403 Forbidden', true, 403);
                     
                     die(bab_json_encode(array(
                         'exception' => 'app_AccessException',
@@ -484,10 +484,10 @@ 
                 $this->accessPage($e);
             }
         }
-        catch (AppSaveException $e){
+        catch (AppSaveException $e) {
             
-            if($this->isAjaxRequest()){
-                header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+            if ($this->isAjaxRequest()) {
+                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');
@@ -499,32 +499,32 @@ 
                 )));
             }
         }
-        catch (AppDeletedRecordException $e){
+        catch (AppDeletedRecordException $e) {
             $this->deletedItemPage($action, $e);
         }
-        catch (AppNotFoundException $e){
+        catch (AppNotFoundException $e) {
             $this->notFoundPage($action, $e);
         }
-        catch (ORMException $e){
+        catch (ORMException $e) {
             $this->errorPage($e);
         }
-        catch (\Exception $e){
+        catch (\Exception $e) {
             $this->unexpectedErrorPage($e);
         }
         
         $W = bab_Widgets();
         
-        if($returnedValue instanceof WidgetDisplayableInterface){
+        if ($returnedValue instanceof WidgetDisplayableInterface) {
             
-            if($returnedValue instanceof WidgetBabPage && ! $this->isAjaxRequest()){
+            if ($returnedValue instanceof WidgetBabPage && !$this->isAjaxRequest()) {
                 
                 // If the action returned a page, we display it.
                 $returnedValue->displayHtml();
             }
-            else{
+            else {
                 
                 $htmlCanvas = $W->HtmlCanvas();
-                if(self::$acceptJson){
+                if (self::$acceptJson) {
                     $itemId = $returnedValue->getId();
                     $returnArray = array(
                         $itemId => $returnedValue->display($htmlCanvas)
@@ -534,18 +534,18 @@ 
                     header('Content-type: application/json');
                     die(bab_json_encode($returnArray));
                 }
-                else{
+                else {
                     header('Cache-Control: no-cache, must-revalidate');
                     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                     header('Content-type: text/html');
-                    if($returnedValue instanceof WidgetPage && method_exists($returnedValue, 'getPageTitle')){
+                    if ($returnedValue instanceof WidgetPage && method_exists($returnedValue, 'getPageTitle')) {
                         $pageTitle = $returnedValue->getPageTitle();
                         
-                        if(method_exists($htmlCanvas, 'sendPageTitle')){
+                        if (method_exists($htmlCanvas, 'sendPageTitle')) {
                             $htmlCanvas->sendPageTitle($pageTitle);
                         }
-                        else{
-                            header('X-Cto-PageTitle: ' . $pageTitle);
+                        else {
+                            header('X-Cto-PageTitle: '.$pageTitle);
                         }
                     }
                     $html = $returnedValue->display($htmlCanvas);
@@ -553,15 +553,15 @@ 
                 }
             }
         }
-        elseif(is_array($returnedValue)){
+        elseif (is_array($returnedValue)) {
             
             $htmlCanvas = $W->HtmlCanvas();
             $returnedArray = array();
-            foreach ($returnedValue as $key => &$item){
-                if($item instanceof WidgetDisplayableInterface){
+            foreach ($returnedValue as $key => &$item) {
+                if ($item instanceof WidgetDisplayableInterface) {
                     $returnedArray[$item->getId()] = $item->display($htmlCanvas);
                 }
-                else{
+                else {
                     $returnedArray[$key] = $item;
                 }
             }
@@ -570,9 +570,9 @@ 
             header('Content-type: application/json');
             die(bab_convertStringFromDatabase(bab_json_encode($returnedArray), \bab_charset::UTF_8));
         }
-        elseif(true === $returnedValue || is_string($returnedValue)){
+        elseif (true === $returnedValue || is_string($returnedValue)) {
             
-            if($this->isAjaxRequest()){
+            if ($this->isAjaxRequest()) {
                 $body = bab_getBody();
                 $json = array();
                 $json['messages'] = array();
@@ -580,24 +580,24 @@ 
                 unset($body->messages['toasts']);
                 $messages = $body->messages;
                 $errors = $body->errors;
-                foreach ($messages as $message){
+                foreach ($messages as $message) {
                     $json['messages'][] = array(
                         'level' => 'info',
                         'content' => $message,
                         'time' => 4000
                     );
                 }
-                foreach ($errors as $message){
+                foreach ($errors as $message) {
                     $json['messages'][] = array(
                         'level' => 'danger',
                         'content' => $message
                     );
                 }
                 $json['toasts'] = $toasts;
-                if($objectController->getReloadSelectors()){
+                if ($objectController->getReloadSelectors()) {
                     $json['reloadSelector'] = implode(',', $objectController->getReloadSelectors());
                 }
-                if($objectController->keepDialogOpened){
+                if ($objectController->keepDialogOpened) {
                     $json['keepDialogOpened'] = true;
                 }
                 echo bab_json_encode($json);
@@ -610,8 +610,8 @@ 
     
     protected function deletedItemPage(WidgetAction $action, AppDeletedRecordException $e)
     {
-        if($this->isAjaxRequest()){
-            header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
+        if ($this->isAjaxRequest()) {
+            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');
@@ -623,7 +623,7 @@ 
                 'errorMessage' => bab_convertStringFromDatabase($e->getMessage(), 'UTF-8')
             )));
         }
-        header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found', true, 404);
+        header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found', true, 404);
         
         $App = app_App();
         $W = bab_Widgets();
@@ -645,7 +645,7 @@ 
             ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_CENTER));
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title(sprintf($App->translate('This %s has been deleted'), $e->getObjectTitle())));
         
-        if($e instanceof AppDeletedRecordException){
+        if ($e instanceof AppDeletedRecordException) {
             $section->addItems($e->getDeletedBy(), $e->getDeletedOn());
         }
         
@@ -654,8 +654,8 @@ 
     
     protected function notFoundPage(WidgetAction $action, AppNotFoundException $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle() . ' (' . $e->getId() . ')');
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('This %s does not exists'), $e->getObjectTitle().' ('.$e->getId().')');
             $json = array(
                 'messages' => array(
                     array(
@@ -667,7 +667,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');
         
@@ -696,8 +696,8 @@ 
     
     protected function unexpectedErrorPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -709,7 +709,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');
         
@@ -733,25 +733,25 @@ 
             ->addClass('widget-50pc alert alert-danger')
             ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL));
         
-        $logCode = '#' . hrtime(true);
+        $logCode = '#'.hrtime(true);
         $message = addcslashes($e->getMessage(), "\000..\037\177..\377\\");
         $trace = addcslashes($e->getTraceAsString(), "\000..\037\177..\377\\");
         
-        error_log(sprintf('Error %s : %s', $logCode, $message) . PHP_EOL . $trace);
+        error_log(sprintf('Error %s : %s', $logCode, $message).PHP_EOL.$trace);
         
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title($App->translate('An unexpected error occured')), $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', $stackTraceBox = $W->FlexItems($W->Label($message)
                 ->addClass('widget-description'))
                 ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL))
                 ->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')));
         }
         
@@ -760,8 +760,8 @@ 
     
     protected function errorPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
-            $message = sprintf(app_translate('An unexpected error occured') . ':' . '%s', $e->getMessage());
+        if ($this->isAjaxRequest()) {
+            $message = sprintf(app_translate('An unexpected error occured').':'.'%s', $e->getMessage());
             $json = array(
                 'messages' => array(
                     array(
@@ -773,7 +773,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');
         
@@ -797,25 +797,25 @@ 
             ->addClass('widget-50pc alert alert-danger')
             ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL));
         
-        $logCode = '#' . hrtime(true);
+        $logCode = '#'.hrtime(true);
         $message = addcslashes($e->getMessage(), "\000..\037\177..\377\\");
         $trace = addcslashes($e->getTraceAsString(), "\000..\037\177..\377\\");
         
-        error_log(sprintf('Error %s : %s', $logCode, $message) . PHP_EOL . $trace);
+        error_log(sprintf('Error %s : %s', $logCode, $message).PHP_EOL.$trace);
         
         $section->addItems($W->Title($App->translate('Error'), 1), $W->Title($App->translate('An unexpected error occured')), $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', $stackTraceBox = $W->FlexItems($W->Label($message)
                 ->addClass('widget-description'))
                 ->setDirection(WidgetFlexLayout::FLEX_DIRECTION_COL))
                 ->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')));
         }
         
@@ -824,7 +824,7 @@ 
     
     protected function accessPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $message = $e->getMessage();
             $json = array(
                 'messages' => array(
@@ -837,7 +837,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');
         
@@ -874,7 +874,7 @@ 
      */
     public function requireSaveMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -889,7 +889,7 @@ 
      */
     public function requireDeleteMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -921,7 +921,7 @@ 
             'position' => $position
         );
         $babBody = bab_getBody();
-        if(! isset($babBody->messages['toasts'])){
+        if (!isset($babBody->messages['toasts'])) {
             $babBody->messages['toasts'] = array();
         }
         $babBody->messages['toasts'][] = $toast;

programs/Ctrl/AppCtrlRecord.php

Indentation +2 added lines, -2 removed lines

@@ -2141,7 +2141,7 @@
         }
     
         header("Content-type: application/json; charset=utf-8");
-	    echo $collection->output();
-	    die();
+        echo $collection->output();
+        die();
     }
 }

Spacing +189 added lines, -189 removed lines

@@ -59,16 +59,16 @@ 
     protected function getRecordClassName()
     {
         $class = $this->getClass();
-        if(strpos($class, 'Controller') !== false){
+        if (strpos($class, 'Controller') !== false) {
             $App = $this->App();
             $componentName = strtoupper(str_replace('Controller', '', $class));
             $component = $App->getComponentByName($componentName);
-            if($component){
+            if ($component) {
                 list (, $recordClassname) = explode($App->classPrefix, $component->getRecordClassName());
                 return $recordClassname;
             }
         }
-        if(strpos($class, '_Ctrl')){
+        if (strpos($class, '_Ctrl')) {
             list (, $recordClassname) = explode('_Ctrl', $class);
             return $recordClassname;
         }
@@ -89,7 +89,7 @@ 
         
         
         $recordClassname = $this->getRecordClassName();
-        $recordSetClassname = $recordClassname . 'Set';
+        $recordSetClassname = $recordClassname.'Set';
         
         $recordSet = $App->$recordSetClassname();
         return $recordSet;
@@ -132,29 +132,29 @@ 
     {
         $canvas = bab_Widgets()->HtmlCanvas();
         $html = '';
-        if($actions instanceof WidgetAction){
+        if ($actions instanceof WidgetAction) {
             $text = '';
-            if($showLabel){
+            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 WidgetLink){
-            $html = '<li>' . $actions->display($canvas) . '</li>';
+        elseif ($actions instanceof WidgetLink) {
+            $html = '<li>'.$actions->display($canvas).'</li>';
         }
-        elseif(is_array($actions)){
-            if(isset($actions['items'])){
+        elseif (is_array($actions)) {
+            if (isset($actions['items'])) {
                 $items = $actions['items'];
             }
-            else{
+            else {
                 $items = $actions;
             }
-            foreach ($items as $action){
+            foreach ($items as $action) {
                 $html .= $this->createMenu($action, true, true);
             }
-            if(isset($actions['icon'])){
+            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">' . ($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 . '">' . $html . '</ul>';
+                $html = '<li class="dropdown">'.'<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.'">'.$html.'</ul>';
             }
         }
         
@@ -200,10 +200,10 @@ 
             'label' => $App->translate('Statistics')
         );
         
-        foreach ($methods as $index => $method){
-            try{
-                $methodName = $recordClassname . $method['method'];
-                if($Ui->$methodName()){
+        foreach ($methods as $index => $method) {
+            try {
+                $methodName = $recordClassname.$method['method'];
+                if ($Ui->$methodName()) {
                     $types[$index] = array(
                         'classname' => $methodName,
                         'icon' => $method['icon'],
@@ -211,7 +211,7 @@ 
                     );
                 }
             }
-            catch (\Exception $e){
+            catch (\Exception $e) {
                 unset($types[$index]);
                 continue;
             }
@@ -232,13 +232,13 @@ 
         
         $availableFields = array();
         
-        foreach ($recordSet->getFields() as $name => $field){
+        foreach ($recordSet->getFields() as $name => $field) {
             $fieldName = $field->getName();
             $fieldDescription = $field->getDescription();
-            if(substr($fieldName, 0, 1) !== '_'){
+            if (substr($fieldName, 0, 1) !== '_') {
                 $fieldDescription = $App->translate($fieldDescription);
             }
-            if(empty($fieldDescription)){
+            if (empty($fieldDescription)) {
                 $fieldDescription = $fieldName;
             }
             $availableFields[$name] = array(
@@ -287,14 +287,14 @@ 
         
         $recordSet = $this->getEditRecordSet();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -322,12 +322,12 @@ 
         $W = bab_Widgets();
         
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'SectionEditor';
+        $editorClassname = $recordClassname.'SectionEditor';
         
         /* @var $editor AppRecordEditor */
         $editor = $Ui->$editorClassname($record);
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setController($this);
@@ -356,8 +356,8 @@ 
      */
     public function getModelViewDefaultId($itemId = null)
     {
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_modelView';
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_modelView';
         }
         
         return $itemId;
@@ -385,7 +385,7 @@ 
         
         $itemId = $this->getModelViewDefaultId($itemId);
         
-        if(! isset($type)){
+        if (!isset($type)) {
             $type = $this->getFilteredViewType($itemId);
         }
         
@@ -393,24 +393,24 @@ 
         
         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 'statistics':
-                $tableviewClassname = $recordClassname . 'StatisticsView';
+                $tableviewClassname = $recordClassname.'StatisticsView';
                 break;
             
             case 'table':
             default:
-                $tableviewClassname = $recordClassname . 'TableView';
+                $tableviewClassname = $recordClassname.'TableView';
                 break;
         }
         
@@ -423,12 +423,12 @@ 
         
         $tableview->setRecordSet($recordSet);
         $tableview->addDefaultColumns($recordSet);
-        if(isset($filter)){
+        if (isset($filter)) {
             $tableview->setFilterValues($filter);
         }
         $filter = $tableview->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $tableview->displaySubTotalRow(true);
         }
         
@@ -442,13 +442,13 @@ 
         
         $tableview->setDataSource($records);
         
-        if(isset($columns)){
+        if (isset($columns)) {
             $availableColumns = $tableview->getVisibleColumns();
             
             $remainingColumns = array();
-            foreach ($availableColumns as $availableColumn){
+            foreach ($availableColumns as $availableColumn) {
                 $colPath = $availableColumn->getFieldPath();
-                if(isset($columns[$colPath]) && $columns[$colPath] == '1'){
+                if (isset($columns[$colPath]) && $columns[$colPath] == '1') {
                     $remainingColumns[] = $availableColumn;
                 }
             }
@@ -468,11 +468,11 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         $recordClassname = $this->getRecordClassName();
-        $editorClassname = $recordClassname . 'Editor';
+        $editorClassname = $recordClassname.'Editor';
         $editor = $Ui->$editorClassname();
         
-        if(! isset($itemId)){
-            $itemId = $this->getClass() . '_' . __FUNCTION__;
+        if (!isset($itemId)) {
+            $itemId = $this->getClass().'_'.__FUNCTION__;
         }
         $editor->setId($itemId);
         $editor->setHiddenValue('tg', $App->controllerTg);
@@ -515,7 +515,7 @@ 
         
         $viewTypes = $this->getAvailableModelViewTypes();
         
-        if(count($viewTypes) > 1){
+        if (count($viewTypes) > 1) {
             $viewsBox = $W->Items();
             $viewsBox->setSizePolicy('pull-right');
             // $viewsBox->addClass('btn-group', \Func_Icons::ICON_LEFT_16);
@@ -523,9 +523,9 @@ 
             
             $filteredViewType = $this->getFilteredViewType($tableView->getId());
             
-            foreach ($viewTypes as $viewTypeId => $viewType){
+            foreach ($viewTypes as $viewTypeId => $viewType) {
                 $viewsBox->addItem($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'])
@@ -533,14 +533,14 @@ 
             }
         }
         
-        if(method_exists($proxy, 'exportSelect')){
+        if (method_exists($proxy, 'exportSelect')) {
             $toolbar->addItem($W->Link($App->translate('Export'), $proxy->exportSelect($filter))
                 ->addClass('icon', \Func_Icons::ACTIONS_DOCUMENT_DOWNLOAD)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box gradient blue halfSizeDialog'));
         }
         
-        if(method_exists($proxy, 'printList')){
+        if (method_exists($proxy, 'printList')) {
             $toolbar->addItem($W->Link($App->translate('Print'), $proxy->printList($filter))
                 ->addClass('icon', \Func_Icons::ACTIONS_DOCUMENT_PRINT)
                 ->setOpenMode(WidgetLink::OPEN_POPUP));
@@ -558,8 +558,8 @@ 
         $W = bab_Widgets();
         
         $filterVisibility = $this->getFilterVisibility($itemId);
-        $filterVisibility = ! $filterVisibility;
-        $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+        $filterVisibility = !$filterVisibility;
+        $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         
         return true;
     }
@@ -571,10 +571,10 @@ 
     protected function getFilterVisibility($itemId)
     {
         $W = bab_Widgets();
-        $filterVisibility = $W->getUserConfiguration($itemId . '/filterVisibility');
-        if(! isset($filterVisibility)){
+        $filterVisibility = $W->getUserConfiguration($itemId.'/filterVisibility');
+        if (!isset($filterVisibility)) {
             $filterVisibility = false;
-            $W->setUserConfiguration($itemId . '/filterVisibility', $filterVisibility);
+            $W->setUserConfiguration($itemId.'/filterVisibility', $filterVisibility);
         }
         return $filterVisibility;
     }
@@ -589,8 +589,8 @@ 
     protected function getFilteredViewType($itemId)
     {
         $W = bab_Widgets();
-        $type = $W->getUserConfiguration($itemId . '/viewType');
-        if(! isset($type)){
+        $type = $W->getUserConfiguration($itemId.'/viewType');
+        if (!isset($type)) {
             $type = 'table';
         }
         return $type;
@@ -607,7 +607,7 @@ 
     public function setFilteredViewType($itemId, $type = null)
     {
         $W = bab_Widgets();
-        $W->setUserConfiguration($itemId . '/viewType', $type);
+        $W->setUserConfiguration($itemId.'/viewType', $type);
         
         return true;
     }
@@ -628,17 +628,17 @@ 
         
         $filterPanel = $view->advancedFilterPanel($filter);
         
-        if($this->getFilterVisibility($itemId)){
+        if ($this->getFilterVisibility($itemId)) {
             $filterPanel->addClass('show-filter');
         }
-        else{
+        else {
             $filterPanel->addClass('hide-filter');
         }
         
         $toolbar = $this->toolbar($view);
         $listToolbar = $this->listToolbar($view);
         
-        if($view->isColumnSelectionAllowed()){
+        if ($view->isColumnSelectionAllowed()) {
             $App = $this->App();
             $columnSelectionMenu = $W->Link($App->translate('Table configuration'), $this->proxy()
                 ->modelViewColumnSettings($type, $itemId))
@@ -665,7 +665,7 @@ 
         $page->setTitle($App->translate('Table configuration'));
         $W = bab_Widgets();
         
-        $currentFilter = $W->getUserConfiguration($itemId . '/filter', 'widgets', false);
+        $currentFilter = $W->getUserConfiguration($itemId.'/filter', 'widgets', false);
         
         $view = $this->modelView(array(), $type, null, $itemId);
         
@@ -697,21 +697,21 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        if(isset($data['pageLength'])){
-            $W->setUserConfiguration($tableModelViewId . '/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
+        if (isset($data['pageLength'])) {
+            $W->setUserConfiguration($tableModelViewId.'/pageLength', $data['pageLength'], 'widgets', $sessionOnly);
         }
-        if(isset($data['displaySubTotalRow'])){
-            $W->setUserConfiguration($tableModelViewId . '/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
+        if (isset($data['displaySubTotalRow'])) {
+            $W->setUserConfiguration($tableModelViewId.'/displaySubTotalRow', $data['displaySubTotalRow'], 'widgets', $sessionOnly);
         }
-        if(isset($data['columns'])){
-            $W->setUserConfiguration($tableModelViewId . '/columns', $data['columns'], 'widgets', $sessionOnly);
+        if (isset($data['columns'])) {
+            $W->setUserConfiguration($tableModelViewId.'/columns', $data['columns'], 'widgets', $sessionOnly);
         }
-        if(isset($data['currentFilter'])){
+        if (isset($data['currentFilter'])) {
             $filter = json_decode($data['currentFilter'], true);
-            $W->setUserConfiguration($tableModelViewId . '/filter', $filter, 'widgets', $sessionOnly);
+            $W->setUserConfiguration($tableModelViewId.'/filter', $filter, 'widgets', $sessionOnly);
         }
         
-        $this->addReloadSelector('.depends-' . $tableModelViewId);
+        $this->addReloadSelector('.depends-'.$tableModelViewId);
         return true;
     }
     
@@ -723,7 +723,7 @@ 
         $tableModelViewId = $data['tableModelViewId'];
         $sessionOnly = isset($data['inSession']) ? $data['inSession'] : false;
         
-        $W->deleteUserConfiguration($data['tableModelViewId'] . '/columns', 'widgets', $sessionOnly);
+        $W->deleteUserConfiguration($data['tableModelViewId'].'/columns', 'widgets', $sessionOnly);
         
         $this->addReloadSelector("#{$tableModelViewId}");
         return true;
@@ -772,7 +772,7 @@ 
         
         $itemMenus = $this->getListItemMenus();
         
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         
@@ -811,7 +811,7 @@ 
         $columns = $tableview->getVisibleColumns();
         $column = isset($columns[$col]) ? $columns[$col] : null;
         
-        if(! isset($column)){
+        if (!isset($column)) {
             return true;
         }
         
@@ -825,8 +825,8 @@ 
             $col
         )));
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($filter[$col])){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($filter[$col])) {
             $widget->setValue($filter[$col]);
         }
         
@@ -842,21 +842,21 @@ 
         
         $key = $data['key'];
         
-        $filter = $W->getUserConfiguration($key . '/filter', 'widgets', false);
-        if(isset($data['moreCriteria']) && $data['moreCriteria']){
+        $filter = $W->getUserConfiguration($key.'/filter', 'widgets', false);
+        if (isset($data['moreCriteria']) && $data['moreCriteria']) {
             $filter = array();
         }
-        foreach ($data['filter'] as $filterName => $filterValue){
+        foreach ($data['filter'] as $filterName => $filterValue) {
             $filter[$filterName] = $filterValue;
         }
-        $W->setUserConfiguration($key . '/filter', $filter, 'widgets', false);
+        $W->setUserConfiguration($key.'/filter', $filter, 'widgets', false);
         
         session_start();
         $_SESSION['modelViewMoreCriterias'][$key] = array();
         unset($_SESSION['modelViewMoreCriterias'][$key]);
         session_write_close();
         
-        $this->addReloadSelector('.depends-' . $key);
+        $this->addReloadSelector('.depends-'.$key);
         
         return true;
     }
@@ -867,7 +867,7 @@ 
         $Ui = $App->Ui();
         
         $page = $Ui->Page();
-        $page->addClass('depends-modelViewMoreCriterias-' . $key);
+        $page->addClass('depends-modelViewMoreCriterias-'.$key);
         
         $page->setTitle($App->translate('Search'));
         
@@ -887,7 +887,7 @@ 
         $editor = $Ui->BasicEditor($itemId, $W->VBoxLayout());
         $editor->setReloadAction($this->proxy()
             ->getDisplayListMoreCriteriaEditor($key, $editor->getId()));
-        $editor->addClass('depends-modelViewMoreCriterias-' . $key);
+        $editor->addClass('depends-modelViewMoreCriterias-'.$key);
         $editor->addClass('widget-no-close');
         $editor->setIconFormat();
         $editor->isAjax = true;
@@ -902,24 +902,24 @@ 
         $columns = $tableview->getVisibleColumns();
         $filter = $tableview->getFilterValues();
         
-        if(! isset($itemId)){
+        if (!isset($itemId)) {
             $editor->setSaveAction($this->proxy()
                 ->saveDisplayListFilter(), $App->translate('Search'));
             $editor->setCancelAction($this->proxy()
                 ->cancel());
             
             $fields = array();
-            foreach ($filter as $fieldName => $value){
-                if(empty($value)){
+            foreach ($filter as $fieldName => $value) {
+                if (empty($value)) {
                     continue;
                 }
-                if(! isset($columns[$fieldName])){
+                if (!isset($columns[$fieldName])) {
                     continue;
                 }
                 
                 $column = $columns[$fieldName];
                 
-                if(! $column->isSearchable()){
+                if (!$column->isSearchable()) {
                     continue;
                 }
                 
@@ -929,7 +929,7 @@ 
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
             session_write_close();
         }
-        else{
+        else {
             $fields = $_SESSION['modelViewMoreCriterias'][$key];
         }
         
@@ -937,24 +937,24 @@ 
         
         $nbAlreadyAdded = 0;
         
-        foreach ($fields as $fieldName => $fieldValue){
-            if(! isset($columns[$fieldName])){
+        foreach ($fields as $fieldName => $fieldValue) {
+            if (!isset($columns[$fieldName])) {
                 continue;
             }
             $column = $columns[$fieldName];
             
-            if(! $column->isSearchable()){
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if($nbAlreadyAdded >= 2){
+            if ($nbAlreadyAdded >= 2) {
                 $nbAlreadyAdded = 0;
                 $alreadyFilteredBox = null;
             }
             
-            if(! isset($alreadyFilteredBox)){
+            if (!isset($alreadyFilteredBox)) {
                 $editor->addItem($alreadyFilteredBox = $W->FlexItems()
                     ->setSizePolicy('customsection-field-box customsection-fieldsgroup-box'));
             }
@@ -974,7 +974,7 @@ 
                 ->setJustifyContent(WidgetFlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN)
                 ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_CONTENT_CENTER))
                 ->addClass('app-customsection-groupedfield app-displaylist-morecriteria-groupedfield'));
-            $nbAlreadyAdded ++;
+            $nbAlreadyAdded++;
             
             $alreadyAddedFilters[$fieldName] = $fieldName;
         }
@@ -984,26 +984,26 @@ 
             ''
         );
         
-        foreach ($columns as $fieldName => $column){
-            if(! $column->isSearchable()){
+        foreach ($columns as $fieldName => $column) {
+            if (!$column->isSearchable()) {
                 continue;
             }
             
             $field = $column->getField();
             
-            if(isset($alreadyAddedFilters[$fieldName])){
+            if (isset($alreadyAddedFilters[$fieldName])) {
                 continue;
             }
             
             $label = $tableview->getFilterLabelWidget($fieldName, $field);
             $label = trim($label->getText());
-            if(empty($label)){
+            if (empty($label)) {
                 continue;
             }
             $options[$fieldName] = $label;
         }
         
-        if(count($options) > 1){
+        if (count($options) > 1) {
             $editor->addItem($W->Html('<hr/>'));
             $editor->addItem($W->FlexItems($W->LabelledWidget($App->translate('Add a new criteria'), $W->Select2()
                 ->setOptions($options), 'newField')
@@ -1020,12 +1020,12 @@ 
     {
         session_start();
         $fields = isset($data['filter']) ? $data['filter'] : array();
-        if(isset($data['newField']) && ! empty($data['newField'])){
+        if (isset($data['newField']) && !empty($data['newField'])) {
             $newField = $data['newField'];
             unset($data['key']);
             unset($data['moreCriteria']);
             $fields[$newField] = '';
-            $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+            $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         }
         $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         return true;
@@ -1034,12 +1034,12 @@ 
     public function removeMoreCriteriaField($key, $field)
     {
         $fields = $_SESSION['modelViewMoreCriterias'][$key];
-        if(isset($fields[$field])){
+        if (isset($fields[$field])) {
             unset($fields[$field]);
             session_start();
             $_SESSION['modelViewMoreCriterias'][$key] = $fields;
         }
-        $this->addReloadSelector('.depends-modelViewMoreCriterias-' . $key);
+        $this->addReloadSelector('.depends-modelViewMoreCriterias-'.$key);
         return true;
     }
     
@@ -1095,17 +1095,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;
         }
     }
@@ -1171,7 +1171,7 @@ 
         $recordSet = $this->getRecordSet();
         
         $record = $recordSet->request($id);
-        if(! $record->isReadable()){
+        if (!$record->isReadable()) {
             throw new AppAccessException($App->translate('You do not have access to this page'));
         }
         
@@ -1179,7 +1179,7 @@ 
         
         $recordClassname = $this->getRecordClassName();
         
-        $viewClassname = $recordClassname . 'FullFrame';
+        $viewClassname = $recordClassname.'FullFrame';
         
         $fullFrame = $Ui->$viewClassname($record);
         $fullFrame->setView($view);
@@ -1191,10 +1191,10 @@ 
         $mainMenu->setSizePolicy(\Func_Icons::ICON_LEFT_24);
         
         $page = $Ui->Page();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $page->setId($itemId);
         }
-        $page->addClass('depends-' . $this->getRecordClassName());
+        $page->addClass('depends-'.$this->getRecordClassName());
         
         $page->addToolbar($mainMenu);
         
@@ -1233,14 +1233,14 @@ 
         
         $editor = $this->recordEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1275,15 +1275,15 @@ 
         
         $editor = $Ui->TagsEditor();
         
-        if(isset($id)){
+        if (isset($id)) {
             $record = $recordSet->request($id);
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $editor->setRecord($record);
         }
-        else{
-            if(! $recordSet->isCreatable()){
+        else {
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException($App->translate('You do not have access to this page'));
             }
             $record = $recordSet->newRecord();
@@ -1334,7 +1334,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;
     }
     
@@ -1393,45 +1393,45 @@ 
         $pk = $recordSet->getPrimaryKey();
         $message = null;
         
-        if(! empty($data[$pk])){
+        if (!empty($data[$pk])) {
             $record = $recordSet->request($data[$pk]);
             unset($data[$pk]);
             
-            if(! $record->isUpdatable()){
+            if (!$record->isUpdatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getModifedMessage($record);
         }
-        else{
+        else {
             
             $record = $recordSet->newRecord();
             
-            if(! $recordSet->isCreatable()){
+            if (!$recordSet->isCreatable()) {
                 throw new AppAccessException('Access denied');
             }
             
             $message = $this->getCreatedMessage();
         }
         
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppSaveException($App->translate('The record does not exists'));
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             throw new AppSaveException($App->translate('Nothing to save'));
         }
         
         $record->setFormInputValues($data);
         
         $this->preSave($record, $data);
-        if($record->save()){
+        if ($record->save()) {
             $this->postSave($record, $data);
-            if(is_string($message)){
+            if (is_string($message)) {
                 $this->addToast($message);
             }
             
-            $this->addReloadSelector('.depends-' . $this->getRecordClassName());
+            $this->addReloadSelector('.depends-'.$this->getRecordClassName());
             return true;
         }
         
@@ -1454,16 +1454,16 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isDeletable()){
+        if (!$record->isDeletable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         $deletedMessage = $this->getDeletedMessage($record);
         
-        if($record->delete()){
+        if ($record->delete()) {
             $this->addToast($deletedMessage);
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1487,7 +1487,7 @@ 
         $page->addClass('app-page-editor');
         $page->setTitle($App->translate('Deletion'));
         
-        if(! isset($record)){
+        if (!isset($record)) {
             $page->addItem($W->Label($App->translate('This element does not exists.')));
             $page->addClass('alert', 'alert-warning');
             return $page;
@@ -1500,7 +1500,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));
@@ -1509,7 +1509,7 @@ 
         
         $confirmedAction = $this->proxy()->delete($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1539,20 +1539,20 @@ 
         
         $record = $recordSet->request($id);
         
-        if(! $record->isRemovable()){
+        if (!$record->isRemovable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
         $App = $this->App();
         $deletedMessage = $App->translate('The element has been moved to the trash');
         
-        if($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)){
-            if(is_string($deletedMessage)){
+        if ($recordSet->delete($recordSet->id->is($record->id), AppTraceableRecord::DELETED_STATUS_IN_TRASH)) {
+            if (is_string($deletedMessage)) {
                 $this->addToast($deletedMessage);
             }
         }
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1580,7 +1580,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));
@@ -1589,7 +1589,7 @@ 
         
         $confirmedAction = $this->proxy()->remove($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1620,12 +1620,12 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
-        if(! $record->isRestorable()){
+        if (!$record->isRestorable()) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1636,7 +1636,7 @@ 
         $record->save();
         $this->addToast($deletedMessage);
         
-        $this->addReloadSelector('.depends-' . $record->getClassName());
+        $this->addReloadSelector('.depends-'.$record->getClassName());
         
         return true;
     }
@@ -1656,9 +1656,9 @@ 
         $records = $recordSet->select($recordSet->id->is($id), true);
         
         $record = null;
-        foreach ($records as $record){
+        foreach ($records as $record) {
         }
-        if(! isset($record)){
+        if (!isset($record)) {
             throw new AppAccessException('Sorry, You are not allowed to perform this operation');
         }
         
@@ -1671,12 +1671,12 @@ 
         
         $recordTitle = $record->getRecordTitle();
         
-        $subTitle = $App->translate($recordSet->getDescription()) . ' "' . $recordTitle . '"';
+        $subTitle = $App->translate($recordSet->getDescription()).' "'.$recordTitle.'"';
         $form->addItem($W->Title($subTitle, 5));
         
         $confirmedAction = $this->proxy()->restore($id);
         $parameters = $confirmedAction->getParameters();
-        foreach ($parameters as $key => $value){
+        foreach ($parameters as $key => $value) {
             $form->setHiddenValue($key, $value);
         }
         $form->addButton($W->SubmitButton()
@@ -1702,12 +1702,12 @@ 
         $view = $this->modelView($filter, $type, null, $itemId);
         $view->setAjaxAction();
         
-        if(isset($filter)){
+        if (isset($filter)) {
             $view->setFilterValues($filter);
         }
         $filter = $view->getFilterValues();
         
-        if(isset($filter['showTotal']) && $filter['showTotal']){
+        if (isset($filter['showTotal']) && $filter['showTotal']) {
             $view->displaySubTotalRow(true);
         }
         
@@ -1753,7 +1753,7 @@ 
         $page->addItem($trashView);
         
         $itemMenus = $this->getListItemMenus();
-        foreach ($itemMenus as $itemMenuId => $itemMenu){
+        foreach ($itemMenus as $itemMenuId => $itemMenu) {
             $page->addItemMenu($itemMenuId, $itemMenu['label'], $itemMenu['action']);
         }
         $page->setCurrentItemMenu('displayTrash');
@@ -1779,16 +1779,16 @@ 
         $registry = bab_getRegistryInstance();
         
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
         $userId = bab_getUserId();
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $id . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$id.'/filters');
         
-        while ($filterName = $registry->fetchChildKey()){
+        while ($filterName = $registry->fetchChildKey()) {
             $filters[] = $filterName;
         }
         
@@ -1805,15 +1805,15 @@ 
     {
         $W = bab_Widgets();
         $tableview = $this->modelView(null, 'table');
-        $W->setUserConfiguration($tableview->getId() . '/currentFilterName', $filterName, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/currentFilterName', $filterName, 'widgets', false);
         
         $registry = bab_getRegistryInstance();
         $userId = '0';
-        $registry->changeDirectory('/widgets/user/' . $userId . '/' . $tableview->getId() . '/filters');
+        $registry->changeDirectory('/widgets/user/'.$userId.'/'.$tableview->getId().'/filters');
         $filterValues = $registry->getValue($filterName);
         
-        if(! $filterValues){
-            $filterValues = $W->getUserConfiguration($tableview->getId() . '/filters/' . $filterName, 'widgets', false);
+        if (!$filterValues) {
+            $filterValues = $W->getUserConfiguration($tableview->getId().'/filters/'.$filterName, 'widgets', false);
         }
         
         $tableview = $this->modelView($filterValues, 'table');
@@ -1829,7 +1829,7 @@ 
     {
         $W = bab_Widgets();
         $id = $this->getModelViewDefaultId();
-        $filter = $W->getUserConfiguration($id . '/currentFilterName', 'widgets', false);
+        $filter = $W->getUserConfiguration($id.'/currentFilterName', 'widgets', false);
         
         return $filter;
     }
@@ -1839,12 +1839,12 @@ 
      */
     public function resetFilters($name = null)
     {
-        if(isset($name)){
+        if (isset($name)) {
             $W = bab_Widgets();
-            $filter = $W->getUserConfiguration($tableview->getId() . '/filters/' . $name, 'widgets', false);
+            $filter = $W->getUserConfiguration($tableview->getId().'/filters/'.$name, 'widgets', false);
             $filterValues = $filter['values'];
         }
-        else{
+        else {
             $filterValues = null;
         }
         
@@ -1871,7 +1871,7 @@ 
             'values' => $filterValues
         );
         
-        $W->setUserConfiguration($tableview->getId() . '/filters/' . $name, $data, 'widgets', false);
+        $W->setUserConfiguration($tableview->getId().'/filters/'.$name, $data, 'widgets', false);
         
         return true;
     }
@@ -1888,7 +1888,7 @@ 
         $Ui = $App->Ui();
         
         $currentFilterName = $this->getCurrentFilterName();
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $currentFilterName, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$currentFilterName, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1925,7 +1925,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -1963,8 +1963,8 @@ 
         $page->addItem($filtersBox);
         
         $filterNames = $this->getFilterNames();
-        foreach ($filterNames as $filterName){
-            $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+        foreach ($filterNames as $filterName) {
+            $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
             
             $filterBox = $W->HBoxItems()
                 ->setVerticalAlign('middle')
@@ -2003,7 +2003,7 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        $filter = $W->getUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $filter = $W->getUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         $page = $Ui->Page();
         
@@ -2034,7 +2034,7 @@ 
         $this->requireDeleteMethod();
         
         $W = bab_Widgets();
-        $W->deleteUserConfiguration($this->getModelViewDefaultId() . '/filters/' . $name, 'widgets', false);
+        $W->deleteUserConfiguration($this->getModelViewDefaultId().'/filters/'.$name, 'widgets', false);
         
         return true;
     }
@@ -2044,7 +2044,7 @@ 
         $modelView = $this->modelView();
         $modelView->setHighlightedRows($ids);
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2054,7 +2054,7 @@ 
         $modelView = $this->modelView();
         $modelView->clearHighlightedRows();
         
-        $this->addReloadSelector('.depends-' . $modelView->getId() . '-HighlightedRecords');
+        $this->addReloadSelector('.depends-'.$modelView->getId().'-HighlightedRecords');
         
         return true;
     }
@@ -2073,34 +2073,34 @@ 
         $box = $W->VBoxItems();
         
         $isComponent = false;
-        if($component = $App->getCurrentComponent()){
+        if ($component = $App->getCurrentComponent()) {
             $Ui = $component->ui();
             $viewClassname = 'FullFrame';
             $isComponent = true;
         }
-        else{
+        else {
             $Ui = $App->Ui();
             $recordClassname = $this->getRecordClassName();
-            $viewClassname = $recordClassname . 'FullFrame';
+            $viewClassname = $recordClassname.'FullFrame';
         }
         
-        if($records->count() > 0){
+        if ($records->count() > 0) {
             $box->addItem($W->Link('', $this->proxy()
                 ->clearHighlightedRecords())
                 ->setAjaxAction(null, false)
                 ->addClass('icon', \Func_Icons::ACTIONS_ARROW_RIGHT_DOUBLE, "app_closeHighlightButton")
-                ->setSizePolicy(\Func_Icons::ICON_LEFT_32 . ' pull-right'));
+                ->setSizePolicy(\Func_Icons::ICON_LEFT_32.' pull-right'));
             
-            foreach ($records as $record){
+            foreach ($records as $record) {
                 
-                if($isComponent){
+                if ($isComponent) {
                     $fullFrame = $Ui->$viewClassname($record);
-                    if(method_exists($record, "getBlueprint")){
+                    if (method_exists($record, "getBlueprint")) {
                         $view = $record->getBlueprint();
                     }
                     $fullFrame->setView($view);
                 }
-                else{
+                else {
                     $fullFrame = $Ui->$viewClassname($record->id, $view);
                 }
                 
@@ -2109,19 +2109,19 @@ 
             $box->addClass('box', 'shadow');
         }
         
-        $box->addClass('depends-' . $modelView->getId() . '-HighlightedRecords');
+        $box->addClass('depends-'.$modelView->getId().'-HighlightedRecords');
         $box->setReloadAction($this->proxy()
             ->previewHighlightedRecords($view));
         return $box;
     }
 
-    public function search($q = null){
+    public function search($q = null) {
         session_write_close();
         $set = $this->getRecordSet();
         $collection = new WidgetSelect2OptionsCollection();
-        if($q == null || strlen($q) <= 1){
+        if ($q == null || strlen($q) <= 1) {
             $collection->addOption(
-                new WidgetSelect2Option(0,$this->App()->translate("Keyword too small"))
+                new WidgetSelect2Option(0, $this->App()->translate("Keyword too small"))
             );
             header("Content-type: application/json; charset=utf-8");
             echo $collection->output();
@@ -2134,7 +2134,7 @@ 
                 $set->$field->contains($q)
             )
         );
-        foreach($records as $r){
+        foreach ($records as $r) {
             $collection->addOption(
                 new WidgetSelect2Option($r->id, $r->$field)
             );

programs/Ui/AppHelpers.php

Indentation +208 added lines, -208 removed lines

@@ -59,50 +59,50 @@ 
 
 function app_genericSetEditor(ORMRecordSet $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 ORMDateField) {
-			$widget = $W->DatePicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $W->TextEdit()->setColumns(80)->setLines(5);
-		} else if ($field instanceof ORMRecordSet) {
-				$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 ORMDateField) {
+            $widget = $W->DatePicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->LineEdit()->setMaxSize(5)->setSize(5)->addClass('widget-timepicker');
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(80, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $W->TextEdit()->setColumns(80)->setLines(5);
+        } else if ($field instanceof ORMRecordSet) {
+                $widget = app_genericSetEditor($field);
+                $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -115,50 +115,50 @@ 
  */
 function app_genericSetFilterForm(ORMRecordSet $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 ORMDateField) {
-			$widget = $W->PeriodPicker();
-		} else if ($field instanceof ORMTimeField) {
-			$widget = $W->TimePicker();
-		} else if ($field instanceof ORMStringField) {
-			$widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
-		} else if ($field instanceof ORMEnumField) {
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($field->getValues() as $key => $text) {
-				$widget->addOption($key, $text);
-			}
-		} else if ($field instanceof ORMIntField) {
-			$widget = $W->LineEdit()->setSize(9);
-		} else if ($field instanceof ORMTextField) {
-			$widget = $widget = $W->LineEdit()->setSize(15);
-		} else if ($field instanceof ORMRecordSet) {
-			$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 ORMDateField) {
+            $widget = $W->PeriodPicker();
+        } else if ($field instanceof ORMTimeField) {
+            $widget = $W->TimePicker();
+        } else if ($field instanceof ORMStringField) {
+            $widget = $W->LineEdit()->setSize(min(array(15, $field->getMaxLength())));
+        } else if ($field instanceof ORMEnumField) {
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($field->getValues() as $key => $text) {
+                $widget->addOption($key, $text);
+            }
+        } else if ($field instanceof ORMIntField) {
+            $widget = $W->LineEdit()->setSize(9);
+        } else if ($field instanceof ORMTextField) {
+            $widget = $widget = $W->LineEdit()->setSize(15);
+        } else if ($field instanceof ORMRecordSet) {
+            $widget = app_genericSetFilterForm($field);
+            $widget->addClass('sub-form');
+        } else {
+            $widget = null;
+        }
+        if (isset($widget)) {
+            $layout->addItem($W->VBoxLayout()->addItem($fieldLabel)->addItem($widget));
+        }
+    }
+
+    return $layout;
 }
 
 
@@ -171,47 +171,47 @@ 
  */
 function app_LabelledWidget($labelText, WidgetDisplayableInterface $widget)
 {
-	$W = \bab_Widgets();
-
-	$label = $W->Label($labelText);
-	if ($widget instanceof WidgetInputWidget) {
-		$label->setAssociatedWidget($widget);
-	}
-
-	if ($widget instanceof WidgetCheckBox) {
-		$layout = $W->HBoxItems(
-			$widget->setSizePolicy(WidgetSizePolicy::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 WidgetInputWidget) {
+        $label->setAssociatedWidget($widget);
+    }
+
+    if ($widget instanceof WidgetCheckBox) {
+        $layout = $W->HBoxItems(
+            $widget->setSizePolicy(WidgetSizePolicy::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(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
-	}
+    $label = $W->Label($labelText)->colon(false);
+    $checkbox = $W->Checkbox()->setName($checkboxName);
+    $label->setAssociatedWidget($checkbox);
+    if (isset($options)) {
+        $label->setSizePolicy(WidgetSizePolicy::FIXED)->setCanvasOptions($options);
+    }
 
-	$layout = $W->HBoxItems(
-					$checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
-					$label
-				)->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
+    $layout = $W->HBoxItems(
+                    $checkbox->setSizePolicy(WidgetSizePolicy::MINIMUM),
+                    $label
+                )->setVerticalAlign('middle')->setHorizontalSpacing(0.5, 'em');
 
-	return $layout;
+    return $layout;
 }
 
 
@@ -219,42 +219,42 @@ 
 
 function app_LabelledOrmSelect(ORMMySqlIterator $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);
 }
 
 
@@ -302,36 +302,36 @@ 
             ->setMaxSize($field->getMaxLength());
     } else if ($field instanceof ORMTextField) {
         $widget = $W->TextEdit()
-          ->addClass('widget-autoresize');
+            ->addClass('widget-autoresize');
     } else if ($field instanceof ORMPkField) {
         $widget = $W->Hidden();
     } else if ($field instanceof ORMFkField) {
 
         $fieldName = $field->getName();
         /** @var AppRecordSet $parentSet */
-		$parentSet = clone $field->getParentSet();
+        $parentSet = clone $field->getParentSet();
         $parentSet->join($fieldName);
         $set = $parentSet->$fieldName;
         $records = $set->select();
-		$pkName = $set->getPrimaryKey();
-		if($set->fieldExist("name")){
-			$displayField = $set->name->getName();
-		}else if(method_exists($set,"getDisplayNameField")){
-			$displayField = $set->getDisplayNameField()->getName();
-		}else{
-			$displayField = $pkName;
-		}
-		$records->orderAsc($set->$displayField);
-		if($records->count() > 50){
-			$widget = bab_Widgets()->select2();
-			$widget->setDataSource($set->getController()->search());
-		}else{
-			$widget = $W->Select();
-			$widget->addOption('', '');
-			foreach ($records as $record) {
-				$widget->addOption($record->$pkName, $record->$displayField);
-			}
-		}
+        $pkName = $set->getPrimaryKey();
+        if($set->fieldExist("name")){
+            $displayField = $set->name->getName();
+        }else if(method_exists($set,"getDisplayNameField")){
+            $displayField = $set->getDisplayNameField()->getName();
+        }else{
+            $displayField = $pkName;
+        }
+        $records->orderAsc($set->$displayField);
+        if($records->count() > 50){
+            $widget = bab_Widgets()->select2();
+            $widget->setDataSource($set->getController()->search());
+        }else{
+            $widget = $W->Select();
+            $widget->addOption('', '');
+            foreach ($records as $record) {
+                $widget->addOption($record->$pkName, $record->$displayField);
+            }
+        }
     } else if ($field instanceof ORMRecordSet) {
         $widget = $W->Select();
 ////        $widget = $W->MultiSelect()->setSingleSelect();
@@ -357,21 +357,21 @@ 
 
 function app_LabelledOrmWidget(ORMField $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);
 }
 
 
@@ -387,16 +387,16 @@ 
  */
 function app_dateTime(ORMField $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
+    );
 
 }
 
@@ -410,24 +410,24 @@ 
  */
 function app_dateTimeField($fieldName, WidgetLabel $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;
 }
 
 

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->DatePicker();
@@ -129,7 +129,7 @@ 
 		if (empty($description)) {
 			$description = $field->getName();
 		}
-		$fieldLabel = $W->Label($description . ':');
+		$fieldLabel = $W->Label($description.':');
 
 		if ($field instanceof ORMDateField) {
 			$widget = $W->PeriodPicker();
@@ -232,7 +232,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;
 		}
@@ -314,18 +314,18 @@ 
         $set = $parentSet->$fieldName;
         $records = $set->select();
 		$pkName = $set->getPrimaryKey();
-		if($set->fieldExist("name")){
+		if ($set->fieldExist("name")) {
 			$displayField = $set->name->getName();
-		}else if(method_exists($set,"getDisplayNameField")){
+		} else if (method_exists($set, "getDisplayNameField")) {
 			$displayField = $set->getDisplayNameField()->getName();
-		}else{
+		} else {
 			$displayField = $pkName;
 		}
 		$records->orderAsc($set->$displayField);
-		if($records->count() > 50){
+		if ($records->count() > 50) {
 			$widget = bab_Widgets()->select2();
 			$widget->setDataSource($set->getController()->search());
-		}else{
+		} else {
 			$widget = $W->Select();
 			$widget->addOption('', '');
 			foreach ($records as $record) {

Braces +3 added lines, -3 removed lines

@@ -316,16 +316,16 @@
 		$pkName = $set->getPrimaryKey();
 		if($set->fieldExist("name")){
 			$displayField = $set->name->getName();
-		}else if(method_exists($set,"getDisplayNameField")){
+		} else if(method_exists($set,"getDisplayNameField")){
 			$displayField = $set->getDisplayNameField()->getName();
-		}else{
+		} else{
 			$displayField = $pkName;
 		}
 		$records->orderAsc($set->$displayField);
 		if($records->count() > 50){
 			$widget = bab_Widgets()->select2();
 			$widget->setDataSource($set->getController()->search());
-		}else{
+		} else{
 			$widget = $W->Select();
 			$widget->addOption('', '');
 			foreach ($records as $record) {

programs/Ui/AppTableModelView.php

Spacing +82 added lines, -82 removed lines

@@ -98,7 +98,7 @@ 
      */
     protected function initHeaderRow(ORMRecordSet $set)
     {
-        require_once $GLOBALS['babInstallPath'] . 'utilit/urlincl.php';
+        require_once $GLOBALS['babInstallPath'].'utilit/urlincl.php';
         
         \bab_functionality::includefile('Icons');
         
@@ -114,9 +114,9 @@ 
         
         $filterValues = $this->getFilterValues();
         
-        foreach ($this->visibleColumns as $columnPath => $column){
+        foreach ($this->visibleColumns as $columnPath => $column) {
             
-            if(! isset($this->columnsDescriptions[$columnPath])){
+            if (!isset($this->columnsDescriptions[$columnPath])) {
                 $this->columnsDescriptions[$columnPath] = $column->getDescription();
             }
             
@@ -128,61 +128,61 @@ 
             
             $sizePolicy = 'widget-actions-target';
             
-            if($this->isMultiSelect() && $columnPath === '_select_'){
+            if ($this->isMultiSelect() && $columnPath === '_select_') {
                 $this->toggleCheckAllBox = $W->CheckBox();
                 $this->toggleCheckAllBox->setName('toggleCheckAllBox');
                 $this->toggleCheckAllBox->setTitle(widget_translate('Select all on page'));
                 $this->toggleCheckAllBox->setSizePolicy('condensed');
                 $this->toggleCheckAllBox->setCheckedValue(true);
-                if(isset($_SESSION['toggleCheckAllBox'][$this->getId()]) && ! empty($_SESSION['toggleCheckAllBox'][$this->getId()]) && $_SESSION['toggleCheckAllBox'][$this->getId()] == 'on'){
+                if (isset($_SESSION['toggleCheckAllBox'][$this->getId()]) && !empty($_SESSION['toggleCheckAllBox'][$this->getId()]) && $_SESSION['toggleCheckAllBox'][$this->getId()] == 'on') {
                     $this->toggleCheckAllBox->setValue(true);
                 }
                 $isSearchable = false;
                 $isSortable = false;
                 $columnItem = $W->FlexItems($this->toggleCheckAllBox);
             }
-            elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){
-                if(! isset($this->sortBaseUrl)){
+            elseif (isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable) {
+                if (!isset($this->sortBaseUrl)) {
                     $this->sortBaseUrl = \bab_url::request_gp();
                 }
                 
-                if($this->sortField === $columnPath && $this->sortAscending){
+                if ($this->sortField === $columnPath && $this->sortAscending) {
                     $direction = ':down';
                 }
-                else{
+                else {
                     $direction = ':up';
                 }
                 
-                $url = \bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath . $direction);
-                if($anchor = $this->getAnchor()){
-                    $url .= '#' . urlencode($anchor);
+                $url = \bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath.$direction);
+                if ($anchor = $this->getAnchor()) {
+                    $url .= '#'.urlencode($anchor);
                 }
                 
                 $columnItem = $W->Link($W->FlexItems($W->Label($columnLabel), $W->Items()
                     ->addClass('widget-table-column-sorting-icons'))
                     ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_CONTENT_CENTER), $url)
                     ->addClass('widget-table-column-sorting-action');
-                if($this->sortAjaxAction){
-                    $columnItem->setAjaxAction($this->sortAjaxAction->setParameter('sort', $columnPath . $direction), '');
+                if ($this->sortAjaxAction) {
+                    $columnItem->setAjaxAction($this->sortAjaxAction->setParameter('sort', $columnPath.$direction), '');
                 }
                 $columnItem = $W->FlexItems($columnItem);
             }
-            else{
+            else {
                 $columnItem = $W->FlexItems($W->Label($columnLabel), $W->Label(''));
             }
             
             $columnItem->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_CONTENT_CENTER)->setJustifyContent(WidgetFlexLayout::FLEX_JUSTIFY_CONTENT_SPACE_BETWEEN);
             $columnItem->addClass('widget-table-column-header-item');
             
-            if(isset($columnIcon)){
+            if (isset($columnIcon)) {
                 $columnItem->addClass('icon', $columnIcon)->setSizePolicy(\Func_Icons::ICON_LEFT_16);
             }
             
-            if($isSortable){
+            if ($isSortable) {
                 $sizePolicy .= ' widget-table-column-sortable';
             }
-            if($isSearchable){
-                if(! isset($this->filterBaseUrl)){
+            if ($isSearchable) {
+                if (!isset($this->filterBaseUrl)) {
                     $this->filterBaseUrl = $this->getRecordControllerProxy()->displayListFilter();
                 }
                 $url = $this->filterBaseUrl;
@@ -193,24 +193,24 @@ 
                     ->addClass('widget-table-column-search-action')
                     ->setDialogClass('box blue'), 0);
                 $sizePolicy .= ' widget-table-column-searchable';
-                if(isset($filterValues[$columnPath]) && ! empty($filterValues[$columnPath])){
+                if (isset($filterValues[$columnPath]) && !empty($filterValues[$columnPath])) {
                     $sizePolicy .= ' widget-table-column-searched';
                 }
             }
             $items = $W->Items()->setSizePolicy($sizePolicy);
             $items->addItem($columnItem);
             
-            $this->addItem($items, 0, $col ++);
+            $this->addItem($items, 0, $col++);
         }
     }
     
     protected function initRow($record, $row)
     {
-        if($this->highlightRows == null){
+        if ($this->highlightRows == null) {
             $this->highlightRows = $this->getHighlightedRows();
         }
         
-        if(in_array($record->id, $this->highlightRows)){
+        if (in_array($record->id, $this->highlightRows)) {
             $this->addRowClass($row, "app_highlightRow");
         }
         $this->addRowClass($row, "app_highlightAvailable");
@@ -236,13 +236,13 @@ 
      */
     public function App()
     {
-        if(! isset($this->app)){
+        if (!isset($this->app)) {
             // If the app object was not specified (through the setApp() method)
             // we try to select one according to the classname prefix.
             list ($prefix) = explode('_', get_class($this));
             $functionalityName = ucwords($prefix);
-            $this->app = @\bab_functionality::get('App/' . $functionalityName);
-            if(! $this->app){
+            $this->app = @\bab_functionality::get('App/'.$functionalityName);
+            if (!$this->app) {
                 $this->app = @\bab_functionality::get('App');
             }
         }
@@ -253,7 +253,7 @@ 
     {
         $customFields = $recordSet->getCustomFields();
         
-        foreach ($customFields as $customField){
+        foreach ($customFields as $customField) {
             $fieldname = $customField->fieldname;
             $this->addColumn(app_TableModelViewColumn($recordSet->$fieldname, $customField->name)->setSortable(true)
                 ->setExportable(true)
@@ -280,39 +280,39 @@ 
         
         $filterPanel = $W->Filter();
         $filterPanel->setLayout($W->VBoxLayout());
-        if(isset($name)){
+        if (isset($name)) {
             $filterPanel->setName($name);
         }
         
         $pageLength = $this->getPageLength();
-        if(null === $pageLength){
+        if (null === $pageLength) {
             $pageLength = 15;
         }
         
         $pageNumber = $this->getCurrentPage();
-        if(null === $pageNumber){
+        if (null === $pageNumber) {
             $pageNumber = 0;
         }
         
         $this->setPageLength(isset($filter['pageSize']) ? $filter['pageSize'] : $pageLength);
         $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
         
-        if(isset($name)){
-            $this->sortParameterName = $name . '[filter][sort]';
+        if (isset($name)) {
+            $this->sortParameterName = $name.'[filter][sort]';
         }
-        else{
+        else {
             $this->sortParameterName = 'filter[sort]';
         }
         
-        if(isset($filter['sort'])){
+        if (isset($filter['sort'])) {
             $this->setSortField($filter['sort']);
         }
-        elseif(! isset($this->sortField)){
+        elseif (!isset($this->sortField)) {
             
-            if(method_exists($this, 'getDefaultSortField')){
+            if (method_exists($this, 'getDefaultSortField')) {
                 $this->setSortField($this->getDefaultSortField());
             }
-            else{
+            else {
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -321,14 +321,14 @@ 
         
         $form = $this->getFilterForm();
         
-        if(isset($filter)){
-            if(isset($name)){
+        if (isset($filter)) {
+            if (isset($name)) {
                 $path = array(
                     $name,
                     'filter'
                 );
             }
-            else{
+            else {
                 $path = array(
                     'filter'
                 );
@@ -354,19 +354,19 @@ 
     
     protected function isFilterFieldSpecified($filter, $fieldPath)
     {
-        if(isset($filter[$fieldPath])){
+        if (isset($filter[$fieldPath])) {
             $value = $filter[$fieldPath];
-            if(is_array($value)){
-                foreach ($value as $val){
+            if (is_array($value)) {
+                foreach ($value as $val) {
                     $val = trim($val);
-                    if(! empty($val)){
+                    if (!empty($val)) {
                         return true;
                     }
                 }
                 return false;
             }
             
-            if(trim($value) !== ''){
+            if (trim($value) !== '') {
                 return true;
             }
         }
@@ -376,21 +376,21 @@ 
     
     protected function handleFilterInputWidget($name, ORMField $field = null)
     {
-        if(null === $field){
+        if (null === $field) {
             return null;
         }
         
         $W = bab_Widgets();
         
-        if($field instanceof ORMFkField){            
+        if ($field instanceof ORMFkField) {            
             $App = $this->App();
             $setName = $field->getForeignSetName();
             
             $pos = strrpos($setName, '\\');
-            if($pos === false){
+            if ($pos === false) {
                 list (, $appSetName) = explode('_', $setName);
             }
-            else{
+            else {
                 list (, $appSetName) = array(
                     substr($setName, 0, $pos),
                     substr($setName, $pos + 1)
@@ -401,18 +401,18 @@ 
             $set->setName($field->getName());
             $set->setDescription($field->getDescription());
             
-            if($set === null){
+            if ($set === null) {
                 return null;
             }
             
             $values = $set->select();
-            if($values->count()>15){
+            if ($values->count() > 15) {
                 $widget = bab_Widgets()->select2();
                 $widget->setDataSource($set->getController()->search());
-            }else{
+            } else {
                 $widget = $W->Select();
                 $widget->addOption('', '');
-                foreach ($values as $record){
+                foreach ($values as $record) {
                     $widget->addOption($record->id, (string) $record->name);
                 }
                 
@@ -496,7 +496,7 @@ 
         $displayAdvancedForm = $this->isAdvancedFormDisplayed();
         $advancedFiltersFrame = $W->VBoxItems($addFilterButton)->addClass('widget-instant-container');
             
-        if($displayAdvancedForm){
+        if ($displayAdvancedForm) {
             $filterBox = $W->FlowLayout()
                 ->addClass('widget-instant-form')
                 ->setHorizontalSpacing(2, 'em')
@@ -507,20 +507,20 @@ 
         
         $columns = $this->getVisibleColumns();
         
-        foreach ($columns as $fieldName => $column){
+        foreach ($columns as $fieldName => $column) {
             $field = $column->getField();
-            if(! $column->isSearchable()){
+            if (!$column->isSearchable()) {
                 continue;
             }
             
-            if(! ($field instanceof ORMField)){
+            if (!($field instanceof ORMField)) {
                 $field = null;
             }
             
             $label = $this->handleFilterLabelWidget($fieldName, $field);
             $input = $this->handleFilterInputWidget($fieldName, $field);
             
-            if(isset($input) && isset($label)){
+            if (isset($input) && isset($label)) {
                 
                 $input->setName($fieldName);
                 $label->setAssociatedWidget($input);
@@ -530,11 +530,11 @@ 
                 $formItem = $this->handleFilterLabel($label, $input);
                 
                 // $formItem = $W->Section($label->getText(), $input, 7)->setFoldable(true, true);
-                $formItem->addClass('compact', 'field_' . $fieldName);
+                $formItem->addClass('compact', 'field_'.$fieldName);
                 
                 $mainSearch = (method_exists($column, 'isMainSearch') && $column->isMainSearch());
                 
-                if($mainSearch || $this->isFilterFieldSpecified($filter, $column->getFieldPath())){
+                if ($mainSearch || $this->isFilterFieldSpecified($filter, $column->getFieldPath())) {
                     
                     $removeColumnsAction = $W->Action();
                     $removeColumnsAction->setMethod('addon/widgets/configurationstorage', 'removeFilter', array(
@@ -550,19 +550,19 @@ 
                         ->addAttribute('data-removefor', $column->getFieldPath()))
                         ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END));
                 }
-                elseif($displayAdvancedForm){
+                elseif ($displayAdvancedForm) {
                     $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12');
                     $filterBox->addItem($formItem);
                 }
             }
         }
         
-        if(! $this->submit){
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(Widget_translate('Apply filter'));
         }
         
-        if($controller = $this->getRecordController()){
+        if ($controller = $this->getRecordController()) {
             $proxy = $controller->proxy();
             $this->reset = $W->Link($App->translate('Reset'), $proxy->resetFilters())
                 ->addClass('icon', \Func_Icons::ACTIONS_VIEW_REFRESH, 'widget-actionbutton')
@@ -584,14 +584,14 @@ 
             $this->filterMenu->addClass(\Func_Icons::ICON_LEFT_16);
             
             $filterNames = $controller->getFilterNames();
-            if(count($filterNames) > 0){
+            if (count($filterNames) > 0) {
                 // $this->select = $W->Menu(null, $W->VBoxItems());
                 // $this->select->setButtonClass('widget-link icon actions-list-filter');
                 // $this->select->setButtonLabel($App->translate('Saved filters'));
                 // $this->select->addClass(\Func_Icons::ICON_LEFT_16);
                 
-                foreach ($filterNames as $filterName){
-                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+                foreach ($filterNames as $filterName) {
+                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
                     
                     // $this->select->addItem(
                     // $W->Link(
@@ -664,39 +664,39 @@ 
         
         $filterPanel = $W->Filter();
         $filterPanel->setLayout($W->VBoxLayout());
-        if(isset($name)){
+        if (isset($name)) {
             $filterPanel->setName($name);
         }
         
         $pageLength = $this->getPageLength();
-        if(null === $pageLength){
+        if (null === $pageLength) {
             $pageLength = 15;
         }
         
         $pageNumber = $this->getCurrentPage();
-        if(null === $pageNumber){
+        if (null === $pageNumber) {
             $pageNumber = 0;
         }
         
         $this->setPageLength(isset($filter['pageSize']) ? $filter['pageSize'] : $pageLength);
         // $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
         
-        if(isset($name)){
-            $this->sortParameterName = $name . '[filter][sort]';
+        if (isset($name)) {
+            $this->sortParameterName = $name.'[filter][sort]';
         }
-        else{
+        else {
             $this->sortParameterName = 'filter[sort]';
         }
         
-        if(isset($filter['sort'])){
+        if (isset($filter['sort'])) {
             $this->setSortField($filter['sort']);
         }
-        elseif(! isset($this->sortField)){
+        elseif (!isset($this->sortField)) {
             
-            if(method_exists($this, 'getDefaultSortField')){
+            if (method_exists($this, 'getDefaultSortField')) {
                 $this->setSortField($this->getDefaultSortField());
             }
-            else{
+            else {
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -705,14 +705,14 @@ 
         
         $form = $this->getAdvancedFilterForm(null, $filter);
         
-        if(isset($filter)){
-            if(isset($name)){
+        if (isset($filter)) {
+            if (isset($name)) {
                 $path = array(
                     $name,
                     'filter'
                 );
             }
-            else{
+            else {
                 $path = array(
                     'filter'
                 );
@@ -749,7 +749,7 @@ 
      */
     public function getRecordControllerProxy()
     {
-        if(! isset($this->recordControllerProxy)){
+        if (!isset($this->recordControllerProxy)) {
             $this->recordControllerProxy = $this->getRecordController()->proxy();
         }
         return $this->recordControllerProxy;
@@ -764,11 +764,11 @@ 
  */
 function app_TableModelViewColumn($field, $description = null)
 {
-    if(null === $field){
+    if (null === $field) {
         return null;
     }
     
-    if(! isset($description) && $field instanceof ORMField){
+    if (!isset($description) && $field instanceof ORMField) {
         $App = $field->getParentSet()->App();
         $description = $App->translate($field->getDescription());
     }

Braces +14 added lines, -27 removed lines

@@ -140,16 +140,14 @@ 
                 $isSearchable = false;
                 $isSortable = false;
                 $columnItem = $W->FlexItems($this->toggleCheckAllBox);
-            }
-            elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){
+            } elseif(isset($this->sortParameterName) && self::getRecordSetField($set, $columnPath) && $isSortable){
                 if(! isset($this->sortBaseUrl)){
                     $this->sortBaseUrl = \bab_url::request_gp();
                 }
                 
                 if($this->sortField === $columnPath && $this->sortAscending){
                     $direction = ':down';
-                }
-                else{
+                } else{
                     $direction = ':up';
                 }
                 
@@ -166,8 +164,7 @@ 
                     $columnItem->setAjaxAction($this->sortAjaxAction->setParameter('sort', $columnPath . $direction), '');
                 }
                 $columnItem = $W->FlexItems($columnItem);
-            }
-            else{
+            } else{
                 $columnItem = $W->FlexItems($W->Label($columnLabel), $W->Label(''));
             }
             
@@ -299,20 +296,17 @@ 
         
         if(isset($name)){
             $this->sortParameterName = $name . '[filter][sort]';
-        }
-        else{
+        } else{
             $this->sortParameterName = 'filter[sort]';
         }
         
         if(isset($filter['sort'])){
             $this->setSortField($filter['sort']);
-        }
-        elseif(! isset($this->sortField)){
+        } elseif(! isset($this->sortField)){
             
             if(method_exists($this, 'getDefaultSortField')){
                 $this->setSortField($this->getDefaultSortField());
-            }
-            else{
+            } else{
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -327,8 +321,7 @@ 
                     $name,
                     'filter'
                 );
-            }
-            else{
+            } else{
                 $path = array(
                     'filter'
                 );
@@ -389,8 +382,7 @@ 
             $pos = strrpos($setName, '\\');
             if($pos === false){
                 list (, $appSetName) = explode('_', $setName);
-            }
-            else{
+            } else{
                 list (, $appSetName) = array(
                     substr($setName, 0, $pos),
                     substr($setName, $pos + 1)
@@ -409,7 +401,7 @@ 
             if($values->count()>15){
                 $widget = bab_Widgets()->select2();
                 $widget->setDataSource($set->getController()->search());
-            }else{
+            } else{
                 $widget = $W->Select();
                 $widget->addOption('', '');
                 foreach ($values as $record){
@@ -549,8 +541,7 @@ 
                         ->addClass('icon', \Func_Icons::STATUS_DIALOG_ERROR)
                         ->addAttribute('data-removefor', $column->getFieldPath()))
                         ->setAlignItems(WidgetFlexLayout::FLEX_ALIGN_ITEMS_FLEX_END));
-                }
-                elseif($displayAdvancedForm){
+                } elseif($displayAdvancedForm){
                     $formItem->setSizePolicy('col-lg-2 col-md-3 col-sm-6 col-xs-12');
                     $filterBox->addItem($formItem);
                 }
@@ -683,20 +674,17 @@ 
         
         if(isset($name)){
             $this->sortParameterName = $name . '[filter][sort]';
-        }
-        else{
+        } else{
             $this->sortParameterName = 'filter[sort]';
         }
         
         if(isset($filter['sort'])){
             $this->setSortField($filter['sort']);
-        }
-        elseif(! isset($this->sortField)){
+        } elseif(! isset($this->sortField)){
             
             if(method_exists($this, 'getDefaultSortField')){
                 $this->setSortField($this->getDefaultSortField());
-            }
-            else{
+            } else{
                 $columns = $this->getVisibleColumns();
                 $sortField = key($columns);
                 $this->setSortField($sortField);
@@ -711,8 +699,7 @@ 
                     $name,
                     'filter'
                 );
-            }
-            else{
+            } else{
                 $path = array(
                     'filter'
                 );

programs/Ui/AppExportSelectEditor.php

Spacing +4 added lines, -4 removed lines

@@ -42,7 +42,7 @@ 
         
         $this->tableview = $tableview;
         
-        if(isset($filter)){
+        if (isset($filter)) {
             $this->setHiddenValues('filter', $filter);
         }
         $this->setHiddenValue('tg', $App->controllerTg);
@@ -55,7 +55,7 @@ 
     {
         $W = bab_Widgets();
         $this->addItem($W->VBoxItems($W->FlexItems($this->format(), $this->charset())
-            ->addClass('customsection-field-box customsection-fieldsgroup-box'), $this->columns())->setVerticalSpacing(2,'em'));
+            ->addClass('customsection-field-box customsection-fieldsgroup-box'), $this->columns())->setVerticalSpacing(2, 'em'));
     }
     
     protected function format()
@@ -109,8 +109,8 @@ 
         
         $columns = $this->tableview->getVisibleColumns();
         
-        foreach ($columns as $path => $column){
-            if(! $column->isExportable()){
+        foreach ($columns as $path => $column) {
+            if (!$column->isExportable()) {
                 continue;
             }
             $columnList->addItem($W->FlexItems($W->LabelledWidget($column->getSelectableName(), $checkbox = $W->CheckBox()

programs/Ui/AppTableModelViewColumnSettingsEditor.php

Spacing +17 added lines, -17 removed lines

@@ -43,7 +43,7 @@ 
     {
         $this->modelView = $modelView;
         $this->modelViewId = $modelView->getId();
-        if(! isset($id) || empty($id)){
+        if (!isset($id) || empty($id)) {
             $id = $this->getDefaultEditorId();
         }
         parent::__construct($app, $id, $layout);
@@ -95,11 +95,11 @@ 
         );
         
         $select = $W->Select();
-        foreach ($pagesLengths as $pagesLength){
+        foreach ($pagesLengths as $pagesLength) {
             $select->addOption($pagesLength, $pagesLength);
         }
         $value = 15; 
-        if(($temp = $W->getUserConfiguration($this->modelViewId . '/pageLength', 'widgets')) != null){
+        if (($temp = $W->getUserConfiguration($this->modelViewId.'/pageLength', 'widgets')) != null) {
             $value = $temp;
         }
         $select->setValue($value);
@@ -114,20 +114,20 @@ 
         $W = bab_Widgets();
         $columns = $this->modelView->getVisibleColumns();
         $sum = false;
-        foreach($columns as $column){
+        foreach ($columns as $column) {
             /**
              * @var WidgetTableModelViewColumn $column 
              */
-            if($column->isSummable()){
+            if ($column->isSummable()) {
                 $sum = true;
                 break;
             }
         }
-        if(!$sum){
+        if (!$sum) {
             return null;
         }
         $checkbox = $W->CheckBox();
-        $checkbox->setValue($W->getUserConfiguration($this->modelViewId . '/displaySubTotalRow', 'widgets'));
+        $checkbox->setValue($W->getUserConfiguration($this->modelViewId.'/displaySubTotalRow', 'widgets'));
         
         return $W->LabelledWidget($this->App()
             ->translate('Display subtotal rows'), $checkbox, 'displaySubTotalRow')
@@ -142,7 +142,7 @@ 
         $columns = $this->modelView->getVisibleColumns();
         
         $columnsBox = $W->VBoxItems();
-        $columnsBox->addAttribute("style","padding-top: 2em");
+        $columnsBox->addAttribute("style", "padding-top: 2em");
         $columnsBox->setId('tableviewColumnSelectionFormTopSubmitBox');
         $columnsBox->addClass('widget-100pc');
         
@@ -158,12 +158,12 @@ 
             ->setWrap(WidgetFlexLayout::FLEX_WRAP_WRAP)));
         $col = 0;
         
-        foreach ($columns as $path => $column){
+        foreach ($columns as $path => $column) {
             
-            if(! $column->isInList()){
+            if (!$column->isInList()) {
                 continue;
             }
-            if($column->isSelectable() && $column->getSelectableName() != ''){
+            if ($column->isSelectable() && $column->getSelectableName() != '') {
                 $columnList->addItem($W->FlexItems($labelledWidget = $W->LabelledWidget($column->getSelectableName(), $W->CheckBox()
                     ->setValue($column->isVisible()), array(
                     'columns',
@@ -174,7 +174,7 @@ 
                     ->addAttribute('style', 'flex-grow: 1; width: 33%;'));
                 $labelledWidget->getLabelWidget()->addClass('columnListElementLabel');
             }
-            $col ++;
+            $col++;
         }
         
         return $columnsBox;
@@ -192,7 +192,7 @@ 
         $W = $this->widgets;
         $App = $this->App();
         
-        if(isset($this->saveAction)){
+        if (isset($this->saveAction)) {
             $saveLabel = isset($this->saveLabel) ? $this->saveLabel : $App->translate('Save');
             $submitButton = $W->SubmitButton();
             $submitButton->validate()
@@ -200,13 +200,13 @@ 
                 ->setFailedAction($this->failedAction)
                 ->setSuccessAction($this->successAction)
                 ->setLabel($saveLabel);
-            if($this->isAjax){
+            if ($this->isAjax) {
                 $submitButton->setAjaxAction();
             }
             $this->addButton($submitButton);
         }
         
-        if(isset($this->resetAction)){
+        if (isset($this->resetAction)) {
             $resetLabel = isset($this->resetLabel) ? $this->resetLabel : $App->translate('Reset default columns');
             $resetButton = $W->SubmitButton();
             $resetButton->validate()
@@ -215,13 +215,13 @@ 
                 ->setSuccessAction($this->resetAction)
                 ->addClass('resetButton')
                 ->setLabel($resetLabel);
-            if($this->isAjax){
+            if ($this->isAjax) {
                 $resetButton->setAjaxAction();
             }
             $this->addButton($resetButton);
         }
         
-        if(isset($this->cancelAction)){
+        if (isset($this->cancelAction)) {
             $cancelLabel = isset($this->cancelLabel) ? $this->cancelLabel : $App->translate('Cancel');
             $this->addButton($W->SubmitButton()
                 ->addClass('widget-close-dialog')

programs/Ui/Page/AppPage.php

Spacing +12 added lines, -12 removed lines

@@ -59,7 +59,7 @@ 
         
         /** @var \Func_Icons  $I */
         $I = \bab_Functionality::get('Icons');
-        if($I){
+        if ($I) {
             $I->includeCss();
         }
         
@@ -106,7 +106,7 @@ 
      */
     public function addItem(WidgetDisplayableInterface $item = null, $order = null)
     {
-        if(! isset($this->mainPanel)){
+        if (!isset($this->mainPanel)) {
             $W = bab_widgets();
             $this->mainPanel = $W->VBoxLayout();
         }
@@ -127,7 +127,7 @@ 
     {
         $W = bab_widgets();
         
-        if(null === $this->context){
+        if (null === $this->context) {
             
             $isAjaxRequest = (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
             $contextPanelId = $isAjaxRequest ? null : 'app_context_panel';
@@ -135,10 +135,10 @@ 
             $this->context = $W->Frame($contextPanelId, $W->VBoxLayout()
                 ->setVerticalSpacing(2, 'em'));
         }
-        if(isset($title)){
+        if (isset($title)) {
             $this->context->addItem($W->Section($title, $item, 4), $position);
         }
-        else{
+        else {
             $this->context->addItem($item, $position);
         }
         return $this;
@@ -154,7 +154,7 @@ 
     {
         $W = bab_widgets();
         
-        if(null === $this->toolbars){
+        if (null === $this->toolbars) {
             $this->toolbars = $W->Frame(null, $W->VBoxItems());
         }
         $this->toolbars->addItem($item);
@@ -167,10 +167,10 @@ 
         $W = bab_widgets();
         
         $mainPanel = $W->Frame(null, $this->mainPanel);
-        if(bab_isAjaxRequest()){
+        if (bab_isAjaxRequest()) {
             $mainPanel->addClass('app_main_panel');
         }
-        else{
+        else {
             $mainPanel->setId('app_main_panel');
         }
         
@@ -187,7 +187,7 @@ 
     {
         $mainPanel = $this->getMainPanel();
         
-        if($this->context){
+        if ($this->context) {
             
             $W = bab_widgets();
             
@@ -204,7 +204,7 @@ 
     
     protected function addToolbars(WidgetItem $mainPanel)
     {
-        if($this->toolbars){
+        if ($this->toolbars) {
             
             $W = bab_widgets();
             $this->toolbars->setSizePolicy('app-toolbars');
@@ -244,12 +244,12 @@ 
      */
     public function addMessageInfo()
     {
-        if(isset($_SESSION['app_msginfo'])){
+        if (isset($_SESSION['app_msginfo'])) {
             
             // all widget have static id to not change id of others widgets in page
             
             $infoMessages = $_SESSION['app_msginfo'];
-            foreach ($infoMessages as $infoLine){
+            foreach ($infoMessages as $infoLine) {
                 $this->App()
                     ->Controller()
                     ->addMessage($infoLine);