capwelton / libapp

programs/Ctrl/AppController.php

Spacing +115 added lines, -115 removed lines

@@ -55,7 +55,7 @@ 
 use function Cofy\Utilities\User\bab_isUserAdministrator;
 use function Cofy\Utilities\User\bab_isUserLogged;
 
-require_once dirname(__FILE__) . '/../functions.php';
+require_once dirname(__FILE__).'/../functions.php';
 
 /**
  * @method self proxy()
@@ -89,7 +89,7 @@ 
     public function addReloadSelector($reloadSelector, $withSSE = false, $for = null)
     {
         $this->reloadSelectors[$reloadSelector] = $reloadSelector;
-        if($withSSE){
+        if ($withSSE) {
             $sseRecordSet = $this->getSSERecordSet();
             $sseRecordSet->newReloadSelector($reloadSelector, $for);
         }
@@ -106,7 +106,7 @@ 
     
     public function getSSERecordSet()
     {
-        if(isset($this->SSERecordSet)){
+        if (isset($this->SSERecordSet)) {
             return $this->SSERecordSet;
         }
         
@@ -151,7 +151,7 @@ 
     public function __call($name, $arguments = array())
     {
         $component = $this->App()->getComponentByName($name);
-        if($component){
+        if ($component) {
             return call_user_func_array(array(
                 $component,
                 'controller'
@@ -194,7 +194,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;
@@ -206,14 +206,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.');
         }
         
@@ -237,10 +237,10 @@ 
         list ($prefix) = explode('_', __CLASS__);
         $functionalityName = ucwords($prefix);
         /** @var FuncApp */
-        $App = BabFunctionality::get('App/' . $functionalityName);
+        $App = BabFunctionality::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);
@@ -258,47 +258,47 @@ 
     static function getProxyInstance(BabFunctionality $App = null, $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) {
                     $reference = "";
-                    if($parameter->isPassedByReference()){
+                    if ($parameter->isPassedByReference()) {
                         $reference = "&"; 
                     }
-                    if($parameter->isDefaultValueAvailable()){
-                        $parametersStr[] = $reference. '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
+                    if ($parameter->isDefaultValueAvailable()) {
+                        $parametersStr[] = $reference.'$'.$parameter->name.' = '.var_export($parameter->getDefaultValue(), true);
                     }
-                    else{
-                        $parametersStr[] = $reference. '$' . $parameter->name;
+                    else {
+                        $parametersStr[] = $reference.'$'.$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);
         }
@@ -336,14 +336,14 @@ 
     protected function getObjectName($classname)
     {
         list ($objectname) = explode('Controller', $classname);
-        if($this->App()->getComponentByName($objectname)){
+        if ($this->App()->getComponentByName($objectname)) {
             return strtolower($objectname);
         }
         $field = explode('Ctrl', $classname);
-        if(count($field) == 1){
-            $objectname= $field[0];
-        }else{
-            $objectname= $field[1];
+        if (count($field) == 1) {
+            $objectname = $field[0];
+        } else {
+            $objectname = $field[1];
         }
         return strtolower($objectname);
     }
@@ -363,18 +363,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 BabInvalidActionException($fullClassName . '::' . $methodName);
+        if (!$rc->hasMethod($methodName)) {
+            throw new BabInvalidActionException($fullClassName.'::'.$methodName);
         }
         $method = new \ReflectionMethod($fullClassName, $methodName);
         
@@ -383,32 +383,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);
         }
         
@@ -437,9 +437,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;
@@ -457,44 +457,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',
@@ -505,10 +505,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');
@@ -520,32 +520,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)
@@ -555,18 +555,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);
@@ -574,15 +574,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;
                 }
             }
@@ -591,9 +591,9 @@ 
             header('Content-type: application/json');
             die(bab_convertStringFromDatabase(bab_json_encode($returnedArray), BabCharset::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();
@@ -601,24 +601,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);
@@ -631,8 +631,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');
@@ -644,7 +644,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();
@@ -666,7 +666,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());
         }
         
@@ -675,8 +675,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(
@@ -688,7 +688,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');
         
@@ -717,8 +717,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(
@@ -730,7 +730,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');
         
@@ -754,25 +754,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')));
         }
         
@@ -781,8 +781,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(
@@ -794,7 +794,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');
         
@@ -818,25 +818,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')));
         }
         
@@ -845,7 +845,7 @@ 
     
     protected function accessPage(\Exception $e)
     {
-        if($this->isAjaxRequest()){
+        if ($this->isAjaxRequest()) {
             $message = $e->getMessage();
             $json = array(
                 'messages' => array(
@@ -858,7 +858,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');
         
@@ -895,7 +895,7 @@ 
      */
     public function requireSaveMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -910,7 +910,7 @@ 
      */
     public function requireDeleteMethod()
     {
-        if('GET' === $_SERVER['REQUEST_METHOD']){
+        if ('GET' === $_SERVER['REQUEST_METHOD']) {
             throw new AppException('Method not allowed');
         }
         
@@ -942,7 +942,7 @@ 
             'position' => $position
         );
         $babBody = bab_getBody();
-        if(! isset($babBody->messages['toasts'])){
+        if (!isset($babBody->messages['toasts'])) {
             $babBody->messages['toasts'] = array();
         }
         $babBody->messages['toasts'][] = $toast;

Braces +21 added lines, -41 removed lines

@@ -208,8 +208,7 @@ 
     {
         if($this->isAjaxRequest()){
             $authType = 'Basic';
-        }
-        else{
+        } else{
             $authType = '';
         }
         
@@ -287,8 +286,7 @@ 
                     }
                     if($parameter->isDefaultValueAvailable()){
                         $parametersStr[] = $reference. '$' . $parameter->name . ' = ' . var_export($parameter->getDefaultValue(), true);
-                    }
-                    else{
+                    } else{
                         $parametersStr[] = $reference. '$' . $parameter->name;
                     }
                 }
@@ -342,7 +340,7 @@ 
         $field = explode('Ctrl', $classname);
         if(count($field) == 1){
             $objectname= $field[0];
-        }else{
+        } else{
             $objectname= $field[1];
         }
         return strtolower($objectname);
@@ -387,11 +385,9 @@ 
             $parameterName = $parameter->getName();
             if(isset($args[$argNumber])){
                 $actionParams[$parameterName] = $args[$argNumber];
-            }
-            elseif($parameter->isDefaultValueAvailable()){
+            } elseif($parameter->isDefaultValueAvailable()){
                 $actionParams[$parameterName] = $parameter->getDefaultValue();
-            }
-            else{
+            } else{
                 $actionParams[$parameterName] = null;
             }
             $argNumber ++;
@@ -469,8 +465,7 @@ 
             if($component){
                 $this->app->setCurrentComponent($component);
                 $objectController = $component->controller(false);
-            }
-            else{
+            } else{
                 header('HTTP/1.0 400 Bad Request');
                 throw new AppUnknownActionException($action);
             }
@@ -485,13 +480,11 @@ 
         
         try{
             $returnedValue = $objectController->execAction($action);
-        }
-        catch (AppAccessException $e){
+        } catch (AppAccessException $e){
             
             if(! bab_isUserLogged() && $e->requireCredential){
                 bab_requireCredential($e->getMessage());
-            }
-            else{
+            } else{
                 if($this->isAjaxRequest()){
                     
                     header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
@@ -504,8 +497,7 @@ 
                 }
                 $this->accessPage($e);
             }
-        }
-        catch (AppSaveException $e){
+        } catch (AppSaveException $e){
             
             if($this->isAjaxRequest()){
                 header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden', true, 403);
@@ -519,17 +511,13 @@ 
                     'errorMessage' => bab_convertStringFromDatabase($e->getMessage(), 'UTF-8')
                 )));
             }
-        }
-        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);
         }
         
@@ -541,8 +529,7 @@ 
                 
                 // If the action returned a page, we display it.
                 $returnedValue->displayHtml();
-            }
-            else{
+            } else{
                 
                 $htmlCanvas = $W->HtmlCanvas();
                 if(self::$acceptJson){
@@ -554,8 +541,7 @@ 
                     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                     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');
@@ -564,8 +550,7 @@ 
                         
                         if(method_exists($htmlCanvas, 'sendPageTitle')){
                             $htmlCanvas->sendPageTitle($pageTitle);
-                        }
-                        else{
+                        } else{
                             header('X-Cto-PageTitle: ' . $pageTitle);
                         }
                     }
@@ -573,16 +558,14 @@ 
                     die($html);
                 }
             }
-        }
-        elseif(is_array($returnedValue)){
+        } elseif(is_array($returnedValue)){
             
             $htmlCanvas = $W->HtmlCanvas();
             $returnedArray = array();
             foreach ($returnedValue as $key => &$item){
                 if($item instanceof WidgetDisplayableInterface){
                     $returnedArray[$item->getId()] = $item->display($htmlCanvas);
-                }
-                else{
+                } else{
                     $returnedArray[$key] = $item;
                 }
             }
@@ -590,8 +573,7 @@ 
             header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
             header('Content-type: application/json');
             die(bab_convertStringFromDatabase(bab_json_encode($returnedArray), BabCharset::UTF_8));
-        }
-        elseif(true === $returnedValue || is_string($returnedValue)){
+        } elseif(true === $returnedValue || is_string($returnedValue)){
             
             if($this->isAjaxRequest()){
                 $body = bab_getBody();
@@ -771,8 +753,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         
@@ -835,8 +816,7 @@ 
             foreach ($traces as $trace){
                 $stackTraceBox->addItem($W->Label($trace));
             }
-        }
-        else{
+        } else{
             $section->addItem($W->Label($App->translate('Please contact the administrator')));
         }
         

programs/Ctrl/AppCtrlCustomSection.php

Spacing +117 added lines, -117 removed lines

@@ -68,7 +68,7 @@ 
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         $objectCtrl = $App->Controller()->$object(false);
@@ -77,20 +77,20 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
-                if(isset($field["fields"])){
-                    foreach ($field['fields'] as $subField){
-                        $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                if (isset($field["fields"])) {
+                    foreach ($field['fields'] as $subField) {
+                        $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                     }
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -105,7 +105,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -160,7 +160,7 @@ 
         
         $field = $customSection->getField($fieldName);
         
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -177,11 +177,11 @@ 
         
         $field = $availableFields[$fieldName];
         $fieldDescription = $field['description'];
-        if(substr($fieldName, 0, 1) !== '_'){
+        if (substr($fieldName, 0, 1) !== '_') {
             $fieldDescription = $App->translate($fieldDescription);
         }
         
-        if(empty($field)){
+        if (empty($field)) {
             // continue;
         }
         
@@ -251,12 +251,12 @@ 
         
         $groupField = $customSection->getField($fieldGroupName);
         
-        if(! isset($groupField)){
+        if (!isset($groupField)) {
             return null;
         }
         
         $field = $groupField['fields'][$fieldName];
-        if(! isset($field)){
+        if (!isset($field)) {
             return null;
         }
         
@@ -272,11 +272,11 @@ 
         
         $field = $availableFields[$fieldName];
         $fieldDescription = $field['description'];
-        if(substr($fieldName, 0, 1) !== '_'){
+        if (substr($fieldName, 0, 1) !== '_') {
             $fieldDescription = $App->translate($fieldDescription);
         }
         
-        if(empty($field)){
+        if (empty($field)) {
             // continue;
         }
         
@@ -359,12 +359,12 @@ 
         
         $customSection = $customSectionSet->request($customSectionSet->id->is($section));
         $fields = $customSection->getFields();
-        if(! isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             throw new AppException($App->translate('This fields group does not seem to exist'));
         }
         
         $object = $customSection->container->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -374,20 +374,20 @@ 
             ->_AND_($customSectionSet->object->is($customSection->object)));
         
         $allViewFieldNames = array();
-        foreach ($allViewSections as $viewSection){
+        foreach ($allViewSections as $viewSection) {
             $fields = $viewSection->getFields();
-            foreach ($fields as $field){
-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
-                if(isset($field["fields"])){
-                    foreach ($field['fields'] as $subField){
-                        $allViewFieldNames[$subField['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;
+            foreach ($fields as $field) {
+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
+                if (isset($field["fields"])) {
+                    foreach ($field['fields'] as $subField) {
+                        $allViewFieldNames[$subField['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;
                     }
                 }
             }
         }
         
         $box = $W->VBoxItems();
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $box->setId($itemId);
         }
         
@@ -404,7 +404,7 @@ 
         
         BabSort::asort($availableFields, 'description', BabSort::CASE_INSENSITIVE);
         
-        foreach ($availableFields as $field){
+        foreach ($availableFields as $field) {
             $fieldName = $field['name'];
             $fieldDescription = $field['description'];
             
@@ -516,10 +516,10 @@ 
         $container = $customContainerSet->request($customContainerSet->id->is($container));
         
         $customSectionSet = $App->CustomSectionSet();
-        if(isset($id)){
+        if (isset($id)) {
             $record = $customSectionSet->request($id);
         }
-        else{
+        else {
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -531,7 +531,7 @@ 
         
         $editor = new AppEditor($App);
         $editor->setHiddenValue('tg', $App->controllerTg);
-        if($record->id){
+        if ($record->id) {
             $editor->setHiddenValue('data[id]', $record->id);
         }
         $editor->setName('data');
@@ -547,16 +547,16 @@ 
         
         $options = array();
         $rank = 1;
-        foreach ($containers as $container){
+        foreach ($containers as $container) {
             $options[$container->id] = sprintf('%d (%s)', $rank, $container->name);
-            $rank ++;
+            $rank++;
         }
         
         $containerSections = $customSectionSet->select($customSectionSet->container->is($container->id))
             ->orderDesc($customSectionSet->rank);
         
         $nbSections = 0;
-        foreach ($containerSections as $containerSection){
+        foreach ($containerSections as $containerSection) {
             $nbSections = $containerSection->rank + 1;
             break;
         }
@@ -640,10 +640,10 @@ 
         $record = $recordSet->request($id);
         
         $object = $record->object;
-        if(empty($object)){
+        if (empty($object)) {
             $object = $record->container()->object;
         }
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             $object = str_replace($App->classPrefix, '', $object);
         }
         $object .= 'Set';
@@ -658,25 +658,25 @@ 
         $manySets = $objectRecordSet->getHasManyRelations();
         $oneSets = $objectRecordSet->getHasOneRelations();
         
-        if(! empty($record->visibilityCriteria)){
+        if (!empty($record->visibilityCriteria)) {
             $arrCriteria = json_decode($record->visibilityCriteria, true);
             
             $data = array();
-            foreach ($arrCriteria as $fieldName => $operation){
+            foreach ($arrCriteria as $fieldName => $operation) {
                 $data['field'] = $fieldName;
-                foreach ($operation as $condition => $value){
+                foreach ($operation as $condition => $value) {
                     $data['condition']['default'] = $condition;
                     $data['condition']['bool'] = $condition;
-                    if(is_array($value)){
-                        foreach ($value as $key => $subValue){
-                            foreach ($manySets as $manyFieldName => $manyRelation){
-                                if($key . 'Set' == $manyRelation->getForeignSetClassName()){
-                                    foreach ($subValue as $subFieldName => $subConditions){
-                                        if($subFieldName === '_foreignField'){
+                    if (is_array($value)) {
+                        foreach ($value as $key => $subValue) {
+                            foreach ($manySets as $manyFieldName => $manyRelation) {
+                                if ($key.'Set' == $manyRelation->getForeignSetClassName()) {
+                                    foreach ($subValue as $subFieldName => $subConditions) {
+                                        if ($subFieldName === '_foreignField') {
                                             continue;
                                         }
                                         $data['field'] = "{$manyFieldName}/{$subFieldName}";
-                                        foreach ($subConditions as $subCondition => $subConditionValue){
+                                        foreach ($subConditions as $subCondition => $subConditionValue) {
                                             $data['condition']['default'] = $subCondition;
                                             $data['condition']['bool'] = $subCondition;
                                             $value = $subConditionValue;
@@ -685,14 +685,14 @@ 
                                     break;
                                 }
                             }
-                            foreach ($oneSets as $oneFieldName => $oneRelation){
-                                if($key . 'Set' == $oneRelation->getForeignSetClassName()){
-                                    foreach ($subValue as $subFieldName => $subConditions){
-                                        if($subFieldName === '_foreignField'){
+                            foreach ($oneSets as $oneFieldName => $oneRelation) {
+                                if ($key.'Set' == $oneRelation->getForeignSetClassName()) {
+                                    foreach ($subValue as $subFieldName => $subConditions) {
+                                        if ($subFieldName === '_foreignField') {
                                             continue;
                                         }
                                         $data['field'] = "{$oneFieldName}/{$subFieldName}";
-                                        foreach ($subConditions as $subCondition => $subConditionValue){
+                                        foreach ($subConditions as $subCondition => $subConditionValue) {
                                             $data['condition']['default'] = $subCondition;
                                             $data['condition']['bool'] = $subCondition;
                                             $value = $subConditionValue;
@@ -727,7 +727,7 @@ 
      */
     public function save($data = null)
     {
-        if(! isset($data['id']) && isset($data['container']) && $data['container'] != 0 && ! isset($data['rank'])){
+        if (!isset($data['id']) && isset($data['container']) && $data['container'] != 0 && !isset($data['rank'])) {
             $set = $this->getRecordSet();
             $data['rank'] = $set->select($set->container->is($data['container']))
                 ->count();
@@ -739,7 +739,7 @@ 
         return true;
     }
     
-    protected function postSave(ORMRecord &$record, $data)
+    protected function postSave(ORMRecord & $record, $data)
     {
         parent::postSave($record, $data);
         $set = $record->getParentSet();
@@ -760,11 +760,11 @@ 
             $set->rank->greaterThanOrEqual($record->rank)
         )));
         
-        $position ++;
-        foreach ($afterSections as $afterSection){
+        $position++;
+        foreach ($afterSections as $afterSection) {
             $afterSection->rank = $position;
             $afterSection->save();
-            $position ++;
+            $position++;
         }
     }
     
@@ -792,10 +792,10 @@ 
         $record = $recordSet->request($data['id']);
         
         $object = $record->object;
-        if(empty($object)){
+        if (empty($object)) {
             $object = $record->container()->object;
         }
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             $object = str_replace($App->classPrefix, '', $object);
         }
         $object .= 'Set';
@@ -805,14 +805,14 @@ 
         $field = $data['field'];
         $condition = $data['condition'];
         
-        if(strpos($field, '/') !== false){
+        if (strpos($field, '/') !== false) {
             // The selected field is a hasMany or a hasOne relation
             list ($selectedRelation, $selectedField) = explode('/', $field);
             $classPrefix = $App->classPrefix;
             
             $manyRelations = $objectRecordSet->getHasManyRelations();
-            foreach ($manyRelations as $manyRelation){
-                if($selectedRelation != $manyRelation->getOwnerSetFieldName()){
+            foreach ($manyRelations as $manyRelation) {
+                if ($selectedRelation != $manyRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetName = str_replace($classPrefix, '', $manyRelation->getForeignSetClassName());
@@ -820,13 +820,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedManyField = $foreignSet->$selectedField;
                     
-                    if($selectedManyField instanceof ORMBoolInterface){
+                    if ($selectedManyField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -838,9 +838,9 @@ 
             }
             
             $oneRelations = $objectRecordSet->getHasOneRelations();
-            foreach ($oneRelations as $oneRelation){
+            foreach ($oneRelations as $oneRelation) {
                 /* @var $oneRelation ORMOneRelation*/
-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){
+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {
                     continue;
                 }
                 $foreignSetClassName = $oneRelation->getForeignSetClassName();
@@ -849,13 +849,13 @@ 
                 
                 $visibilityCriteria = '';
                 
-                if($foreignSet){
+                if ($foreignSet) {
                     $selectedOneField = $foreignSet->$selectedField;
                     
-                    if($selectedOneField instanceof ORMBoolInterface){
+                    if ($selectedOneField instanceof ORMBoolInterface) {
                         $condition = $condition['bool'];
                     }
-                    else{
+                    else {
                         $condition = $condition['default'];
                     }
                     
@@ -865,20 +865,20 @@ 
                 break;
             }
         }
-        else{
+        else {
             
             $field = $objectRecordSet->$field;
             
-            if($field instanceof ORMBoolInterface){
+            if ($field instanceof ORMBoolInterface) {
                 $condition = $condition['bool'];
             }
-            else{
+            else {
                 $condition = $condition['default'];
             }
             
             $visibilityCriteria = '';
             
-            if(! empty($condition)){
+            if (!empty($condition)) {
                 $criteria = $field->{$condition}($data['value']);
                 $visibilityCriteria = $criteria->toJson();
             }
@@ -907,7 +907,7 @@ 
         $customContainer = $customContainerSet->request($container);
         
         $object = $customContainer->object;
-        if(strpos($object, $App->classPrefix) !== false){
+        if (strpos($object, $App->classPrefix) !== false) {
             list (, $object) = explode($App->classPrefix, $object);
         }
         
@@ -934,17 +934,17 @@ 
         
         $nbCol = 0;
         
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             
-            list (, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list (,, $nbCol) = explode('-', $customSection->sizePolicy);
             
             $currentColumn += $nbCol;
             
-            $sectionSection = $W->Section($customSection->name . ' (' . $customSection->rank . ')', $sectionBox = $W->VBoxItems($W->Hidden()
-                ->setName('#' . $customSection->id)));
+            $sectionSection = $W->Section($customSection->name.' ('.$customSection->rank.')', $sectionBox = $W->VBoxItems($W->Hidden()
+                ->setName('#'.$customSection->id)));
             $sectionSection->addClass('app-custom-section');
             $sectionSection->addClass($customSection->classname);
-            $sectionSection->setSizePolicy($customSection->sizePolicy . ' widget-sameheight');
+            $sectionSection->setSizePolicy($customSection->sizePolicy.' widget-sameheight');
             
             $row->addItem($sectionSection);
             
@@ -962,45 +962,45 @@ 
                 ->addClass('icon', FuncIcons::ACTIONS_EDIT_DELETE)
                 ->setOpenMode(WidgetLink::OPEN_DIALOG)
                 ->setDialogClass('box red')));
-            if(! empty($customSection->visibilityCriteria)){
+            if (!empty($customSection->visibilityCriteria)) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section has a visibility condition')))
                     ->setSizePolicy('alert alert-warning widget-100pc'));
             }
             $fields = $customSection->getFields();
-            if(count($fields) == 0){
+            if (count($fields) == 0) {
                 $sectionBox->addItem($W->HBoxItems($W->Label($App->translate('This section does not contain any field')))
                     ->setSizePolicy('alert alert-warning'));
             }
-            foreach ($fields as $fieldId => $field){
-                if(empty($field)){
+            foreach ($fields as $fieldId => $field) {
+                if (empty($field)) {
                     continue;
                 }
                 
                 $fieldName = $field['fieldname'];
                 
                 $isFieldsGroup = false;
-                if(strpos($fieldName, '_fieldsGroup') !== false){
+                if (strpos($fieldName, '_fieldsGroup') !== false) {
                     $fieldName = '_fieldsGroup';
                     $isFieldsGroup = true;
                 }
                 
-                if(!isset($availableFields[$fieldName])){
+                if (!isset($availableFields[$fieldName])) {
                     $field = array();
                     $fieldDescription = "";
-                }else{
+                } else {
                     $field = $availableFields[$fieldName];
                     $fieldDescription = $field['description'];
                 }
-                if(substr($fieldName, 0, 1) !== '_'){
+                if (substr($fieldName, 0, 1) !== '_') {
                     $fieldDescription = $App->translate($fieldDescription);
                 }
                 
-                if(empty($field)){
+                if (empty($field)) {
                     continue;
                 }
                 
                 $fieldName = $field['name'];
-                if($isFieldsGroup){
+                if ($isFieldsGroup) {
                     $fieldName = $fieldId;
                 }
                 
@@ -1011,21 +1011,21 @@ 
                     ->setGrowable(true)
                     ->setWrap(WidgetFlexLayout::FLEX_WRAP_WRAP))
                     ->setSizePolicy('maximum'), $btnBox = $W->HBoxItems($W->Hidden()
-                    ->setName($customSection->id . '.' . $fieldId)
+                    ->setName($customSection->id.'.'.$fieldId)
                     ->setValue($fieldName))
                     ->addClass('widget-actions'))
                     ->setSizePolicy('widget-list-element widget-actions-target')
                     ->addClass(FuncIcons::ICON_LEFT_16);
-                if(strpos($field['name'], '_fieldsGroup') !== false){
+                if (strpos($field['name'], '_fieldsGroup') !== false) {
                     $btnBox->addItem($W->Link('', $customSectionCtrl->addDisplayFieldToGroup($customSection->id, $fieldName))
                         ->addClass('icon', FuncIcons::ACTIONS_LIST_ADD)
                         ->setOpenMode(WidgetLink::OPEN_DIALOG));
-                        if(isset($fields[$fieldName]["fields"])){
+                        if (isset($fields[$fieldName]["fields"])) {
                             $groupedFields = $fields[$fieldName]['fields'];
-                            foreach ($groupedFields as $groupedField){
+                            foreach ($groupedFields as $groupedField) {
                                 $groupedFieldDetails = $availableFields[$groupedField['fieldname']];
                                 $fieldGroupBox->addItem($flexField = $W->FlowItems($W->Hidden(null, array(
-                                    $customSection->id . '.fieldsGroups',
+                                    $customSection->id.'.fieldsGroups',
                                     $fieldName,
                                     $groupedField['fieldname']
                                 ), $groupedField['fieldname']), $W->Label($groupedFieldDetails['description']), $W->FlowItems($W->Link('', $customSectionCtrl->editGroupFieldDisplayField($customSection->id, $fieldName, $groupedField['fieldname']))
@@ -1054,23 +1054,23 @@ 
             $sectionsBoxes[] = $sectionBox;
         }
         
-        if($currentColumn + $nbCol > 0){
+        if ($currentColumn + $nbCol > 0) {
             $sectionsSection->addItem($row);
         }
         
-        foreach ($sectionsBoxes as $sectionsBox){
+        foreach ($sectionsBoxes as $sectionsBox) {
             $sectionsBox->sortable(true, $sectionsBoxes);
             $sectionsBox->setMetadata('samePlaceholderSize', true);
         }
         
-        foreach ($rows as $row){
+        foreach ($rows as $row) {
             $row->sortable(true, $rows);
             $row->setMetadata('samePlaceholderSize', true);
         }
         
         $form = $W->Form();
         
-        if(isset($itemId)){
+        if (isset($itemId)) {
             $form->setId($itemId);
         }
         $form->setHiddenValue('tg', $App->controllerTg);
@@ -1097,7 +1097,7 @@ 
         $customSections = $customSectionSet->select($customSectionSet->container->is($container));
         
         $sectionsValues = array();
-        foreach ($customSections as $customSection){
+        foreach ($customSections as $customSection) {
             $values = $customSection->getValues();
             unset($values['id']);
             unset($values['createdBy']);
@@ -1111,7 +1111,7 @@ 
         }
         
         header('Content-type: application/json');
-        header('Content-Disposition: attachment; filename="' . $container->object . '.' . ($container->view === '' ? 'default' : $container->view) . '.' . $container->name . '.json"' . "\n");
+        header('Content-Disposition: attachment; filename="'.$container->object.'.'.($container->view === '' ? 'default' : $container->view).'.'.$container->name.'.json"'."\n");
         
         $json = bab_json_encode($sectionsValues);
         $json = bab_convertStringFromDatabase($json, BabCharset::UTF_8);
@@ -1163,12 +1163,12 @@ 
         $files->push($sectionsfile['uid']);
         
         $data = null;
-        foreach ($files as $f){
+        foreach ($files as $f) {
             $data = file_get_contents($f->toString());
             break;
         }
         
-        if(! isset($data)){
+        if (!isset($data)) {
             $this->addError($App->translate('Unable to get file content'));
             return true;
         }
@@ -1180,7 +1180,7 @@ 
         
         $customSectionSet->delete($customSectionSet->container->is($container));
         
-        foreach ($sectionsValues as $sectionValues){
+        foreach ($sectionsValues as $sectionValues) {
             $customSection = $customSectionSet->newRecord();
             $customSection->setValues($sectionValues);
             $customSection->container = $container;
@@ -1258,59 +1258,59 @@ 
         $ranks = array();
         $rank = 0;
         
-        foreach ($sections as $key => $value){
+        foreach ($sections as $key => $value) {
             // Sections ids start with #, while section fields start with their original section id
-            if(substr($key, 0, 1) === '#'){
+            if (substr($key, 0, 1) === '#') {
                 $currentSectionId = substr($key, 1);
                 $rawSectionData[$currentSectionId] = array();
-                if(! isset($oldSectionId)){
+                if (!isset($oldSectionId)) {
                     $oldSectionId = $currentSectionId;
                 }
-                if(isset($currentSection) && $oldSectionId != $currentSectionId){
+                if (isset($currentSection) && $oldSectionId != $currentSectionId) {
                     $oldSectionId = $currentSectionId;
                 }
                 $ranks[$currentSectionId] = $rank;
-                $rank ++;
+                $rank++;
                 $currentSection = $customSectionSet->get($customSectionSet->id->is($currentSectionId));
                 continue;
             }
-            if(! isset($currentSection)){
+            if (!isset($currentSection)) {
                 continue;
             }
             list ($fieldSectionId, $fieldName) = explode('.', $key);
-            if($fieldSectionId == $currentSectionId){
+            if ($fieldSectionId == $currentSectionId) {
                 $field = $currentSection->getField($fieldName);
-                if(strpos($fieldName, '_fieldsGroup') !== false && isset($rawSectionData[$currentSectionId][$fieldName])){
+                if (strpos($fieldName, '_fieldsGroup') !== false && isset($rawSectionData[$currentSectionId][$fieldName])) {
                     $rawSectionData[$currentSectionId][$fieldName]['block'] = $field['block'];
                     $rawSectionData[$currentSectionId][$fieldName]['fieldname'] = '_fieldsGroup';
                     $rawSectionData[$currentSectionId][$fieldName]['parameters'] = $field['parameters'];
-                    foreach ($sections[$currentSection->id . '.fieldsGroups'][$fieldName] as $subKey => $subValue){
+                    foreach ($sections[$currentSection->id.'.fieldsGroups'][$fieldName] as $subKey => $subValue) {
                         $rawSectionData[$currentSectionId][$fieldName]['fields'][$subKey] = $field['fields'][$subKey];
                     }
                 }
-                elseif($fieldName != 'fieldsGroups'){
+                elseif ($fieldName != 'fieldsGroups') {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
-            else{
+            else {
                 $field = null;
                 $tmpSection = $customSectionSet->get($customSectionSet->id->is($fieldSectionId));
-                if($tmpSection){
+                if ($tmpSection) {
                     $field = $tmpSection->getField($fieldName);
                 }
-                if(isset($field)){
+                if (isset($field)) {
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
             }
         }
         
-        foreach ($rawSectionData as $sectionId => $fields){
+        foreach ($rawSectionData as $sectionId => $fields) {
             $section = $customSectionSet->get($customSectionSet->id->is($sectionId));
-            if($section){
+            if ($section) {
                 $section->fields = json_encode($fields);
                 $section->rank = isset($ranks[$sectionId]) ? $ranks[$sectionId] : 0;
                 $section->save();
-                $rank ++;
+                $rank++;
             }
         }
         

Braces +8 added lines, -15 removed lines

@@ -518,8 +518,7 @@ 
         $customSectionSet = $App->CustomSectionSet();
         if(isset($id)){
             $record = $customSectionSet->request($id);
-        }
-        else{
+        } else{
             $record = $customSectionSet->newRecord();
             $record->container = $container->id;
         }
@@ -825,8 +824,7 @@ 
                     
                     if($selectedManyField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -854,8 +852,7 @@ 
                     
                     if($selectedOneField instanceof ORMBoolInterface){
                         $condition = $condition['bool'];
-                    }
-                    else{
+                    } else{
                         $condition = $condition['default'];
                     }
                     
@@ -864,15 +861,13 @@ 
                 }
                 break;
             }
-        }
-        else{
+        } else{
             
             $field = $objectRecordSet->$field;
             
             if($field instanceof ORMBoolInterface){
                 $condition = $condition['bool'];
-            }
-            else{
+            } else{
                 $condition = $condition['default'];
             }
             
@@ -987,7 +982,7 @@ 
                 if(!isset($availableFields[$fieldName])){
                     $field = array();
                     $fieldDescription = "";
-                }else{
+                } else{
                     $field = $availableFields[$fieldName];
                     $fieldDescription = $field['description'];
                 }
@@ -1287,12 +1282,10 @@ 
                     foreach ($sections[$currentSection->id . '.fieldsGroups'][$fieldName] as $subKey => $subValue){
                         $rawSectionData[$currentSectionId][$fieldName]['fields'][$subKey] = $field['fields'][$subKey];
                     }
-                }
-                elseif($fieldName != 'fieldsGroups'){
+                } elseif($fieldName != 'fieldsGroups'){
                     $rawSectionData[$currentSectionId][$fieldName] = $field;
                 }
-            }
-            else{
+            } else{
                 $field = null;
                 $tmpSection = $customSectionSet->get($customSectionSet->id->is($fieldSectionId));
                 if($tmpSection){

programs/init.php

Spacing +9 added lines, -9 removed lines

@@ -35,7 +35,7 @@ 
 use function Cofy\Utilities\bab_GetDatabaseInstance;
 use function Cofy\Utilities\User\bab_isUserLogged;
 
-require_once dirname(__FILE__). '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 
 function LibApp_upgrade($sVersionBase, $sVersionIni)
@@ -44,7 +44,7 @@ 
     
     $addon->unregisterFunctionality('App');
     $functionnalities = new BabFunctionalities();
-    $functionnalities->registerNamespace('App',"Capwelton\LibApp\FuncApp",$addon->getPhpPath().'FuncApp.php');
+    $functionnalities->registerNamespace('App', "Capwelton\LibApp\FuncApp", $addon->getPhpPath().'FuncApp.php');
 
     $addon->registerFunctionality('App', 'FuncApp.php');
     $addon->addEventListener('BabEventBeforePageCreated', 'libapp_onBeforePageCreated', 'init.php', -10);
@@ -92,12 +92,12 @@ 
     
     $babBody = bab_getBody();
     $addon = bab_getAddonInfosInstance('libapp');
-    $babBody->addStyleSheet($addon->getStylePath() . '/styles.css');
-    $babBody->addJavascriptFile($addon->getTemplatePath() . 'libapp.js');
+    $babBody->addStyleSheet($addon->getStylePath().'/styles.css');
+    $babBody->addJavascriptFile($addon->getTemplatePath().'libapp.js');
     $App = app_App();
-    if($App && $App->isSSEEnabled()){
-        $babBody->addJavascriptFile($addon->getTemplatePath() . 'notification.js');
-        if(bab_isUserLogged()){
+    if ($App && $App->isSSEEnabled()) {
+        $babBody->addJavascriptFile($addon->getTemplatePath().'notification.js');
+        if (bab_isUserLogged()) {
             $babBody->babecho('<script>window.libapp={"sseServerUrl": "'.$App->Controller()->SSE()->server()->url().'"}</script>');
             $babBody->addJavascriptFile($addon->getTemplatePath().'sse.js');
         }
@@ -121,8 +121,8 @@ 
     if (class_exists('FuncPortletBackend')) {
         $addon = bab_getAddonInfosInstance('libapp');
         $addonPhpPath = $addon->getPhpPath();
-        require_once dirname(__FILE__) . '/portletbackend.class.php';
+        require_once dirname(__FILE__).'/portletbackend.class.php';
         $functionalities = new BabFunctionalities();
-        $functionalities->registerClass('FuncPortletBackendApp', $addonPhpPath . 'portletbackend.class.php');
+        $functionalities->registerClass('FuncPortletBackendApp', $addonPhpPath.'portletbackend.class.php');
     }
 }
\ No newline at end of file