capwelton / libapp

programs/sse.class.php

Spacing +18 added lines, -18 removed lines

@@ -60,7 +60,7 @@ 
     

     public function selectUserSSE($user = null)

     {

-        if(!isset($user)){

+        if (!isset($user)) {

             $App = $this->App();

             $user = $App->getCurrentUser();

         }

@@ -82,29 +82,29 @@ 
         $userSSEReloads = $this->select($this->user->is($user)->_AND_($this->type->is(app_SSE::TYPE_RELOAD_SELECTOR)));

         $reloadSelectors = array();

         $now = date('Y-m-d H:i:s');

-        foreach ($userSSEReloads as $sseMsg){

+        foreach ($userSSEReloads as $sseMsg) {

             $reloadSelectors[] = $sseMsg->data;

-            if($delete && $now > date($sseMsg->deleteOn)){

+            if ($delete && $now > date($sseMsg->deleteOn)) {

                 $sseMsg->delete();

             }

         }

         

-        if(!empty($reloadSelectors)){

+        if (!empty($reloadSelectors)) {

             $sseData .= '"reloadSelector":'.bab_json_encode($reloadSelectors);

             $hasData = true;

         }

         

         $userSSEBrowserNotifications = $this->select($this->user->is($user)->_AND_($this->type->is(app_SSE::TYPE_BROWSER_NOTIFICATION)));

         $browserNotifications = array();

-        foreach ($userSSEBrowserNotifications as $sseMsg){

+        foreach ($userSSEBrowserNotifications as $sseMsg) {

             $browserNotifications[] = $sseMsg->data;

-            if($delete){

+            if ($delete) {

                 $sseMsg->delete();

             }

         }

         

-        if(!empty($browserNotifications)){

-            if($hasData){

+        if (!empty($browserNotifications)) {

+            if ($hasData) {

                 $sseData .= ', ';

             }

             $sseData .= '"browserNotifications":'.bab_json_encode($browserNotifications);

@@ -125,20 +125,20 @@ 
     {

         $App = $this->App();

         $users = array();

-        if(!isset($for)){

+        if (!isset($for)) {

             $users[] = $App->getCurrentUser();

         }

-        else if(!is_array($for)){

-            if($for === 'all'){

+        else if (!is_array($for)) {

+            if ($for === 'all') {

                 $users = $App->getLoggedUsers();

             }

-            else{

+            else {

                 $users[] = $for;

             }

         }

         

         $deleteOn = self::getDeleteOn();

-        foreach ($users as $user){

+        foreach ($users as $user) {

             $record = $this->newRecord();

             $record->user = $user;

             $record->data = $reloadSelector;

@@ -164,20 +164,20 @@ 
     {

         $App = $this->App();

         $users = array();

-        if(!isset($for)){

+        if (!isset($for)) {

             $users[] = $App->getCurrentUser();

         }

-        else if(!is_array($for)){

-            if($for === 'all'){

+        else if (!is_array($for)) {

+            if ($for === 'all') {

                 $users = $App->getLoggedUsers();

             }

-            else{

+            else {

                 $users[] = $for;

             }

         }

         

         $deleteOn = self::getDeleteOn();

-        foreach ($users as $user){

+        foreach ($users as $user) {

             $record = $this->newRecord();

             $record->user = $user;

             $record->data = bab_json_encode($data);

Braces +4 added lines, -8 removed lines

@@ -127,12 +127,10 @@ 
         $users = array();

         if(!isset($for)){

             $users[] = $App->getCurrentUser();

-        }

-        else if(!is_array($for)){

+        } else if(!is_array($for)){

             if($for === 'all'){

                 $users = $App->getLoggedUsers();

-            }

-            else{

+            } else{

                 $users[] = $for;

             }

         }

@@ -166,12 +164,10 @@ 
         $users = array();

         if(!isset($for)){

             $users[] = $App->getCurrentUser();

-        }

-        else if(!is_array($for)){

+        } else if(!is_array($for)){

             if($for === 'all'){

                 $users = $App->getLoggedUsers();

-            }

-            else{

+            } else{

                 $users[] = $for;

             }

         }

programs/main.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  * @copyright Copyright (c) 2020 by CapWelton ({@link https://www.capwelton.com})
  */
 
-require_once dirname(__FILE__) . '/functions.php';
+require_once dirname(__FILE__).'/functions.php';
 
 $App = app_App();
 

programs/notification.ctrl.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
  */

 

 

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

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

 

 

 /**

@@ -71,7 +71,7 @@ 
     {        

         $set = $this->getRecordSet();

         $record = $set->get($id);

-        if(!$record){

+        if (!$record) {

             return true;

         }

         

@@ -121,7 +121,7 @@ 
         if (isset($itemId)) {

             $box->setId($itemId);

         }

-        $notifs =  $notifSet->selectUserNotifications();

+        $notifs = $notifSet->selectUserNotifications();

         $nbNotif = $notifs->count();

         $notifIcon = 'icon ';

         $notifClass = 'label label-default';

@@ -136,7 +136,7 @@ 
             );

             $btnWidget->addClass('notificationDisplayButton');

             $notifIcon .= 'webapp-bell-ringing-o';

-            $sizePolicy .=' hasNotification';

+            $sizePolicy .= ' hasNotification';

             

             $notificationBox = $W->FlexItems(

                 $W->Html('')->addClass('notificationListArrow'),

@@ -154,7 +154,7 @@ 
                 $notificationBoxElements = $W->FlexItems()->addClass('notificationBoxElements')->setDirection(Widget_FlexLayout::FLEX_DIRECTION_COL)

             );

             

-            foreach ($notifs as $notif){

+            foreach ($notifs as $notif) {

                 $notificationBoxElements->addItem(

                     $W->Link(

                         $el = $W->FlexItems(

@@ -164,9 +164,9 @@ 
                         $this->proxy()->display($notif->id)

                     )->addClass('notificationBoxElement')->setOpenMode(Widget_Link::OPEN_DIALOG)

                 );

-                if(!empty($notif->description)){

+                if (!empty($notif->description)) {

                     $desc = $notif->description;

-                    if(strlen($desc) > 40){

+                    if (strlen($desc) > 40) {

                         $desc = trim(substr($desc, 0, 40)).'...';

                     }

                     $el->addItem($W->Label($desc)->addClass('notificationElementDescription'), 1);

@@ -179,7 +179,7 @@ 
             

             $box->addItem($notificationBox);

         }

-        else{

+        else {

             $notifIcon .= 'webapp-bell-o';

         }

 

@@ -218,8 +218,8 @@ 
         $App = $this->App();

         

         $notifSet = $App->NotificationSet();

-        $notifs =  $notifSet->selectUserNotifications();

-        foreach ($notifs as $notif){

+        $notifs = $notifSet->selectUserNotifications();

+        foreach ($notifs as $notif) {

             $notif->markAsSeen();

         }

         

Braces +1 added lines, -2 removed lines

@@ -178,8 +178,7 @@
             );

             

             $box->addItem($notificationBox);

-        }

-        else{

+        } else{

             $notifIcon .= 'webapp-bell-o';

         }

 

programs/app.php

Spacing +76 added lines, -76 removed lines

@@ -21,9 +21,9 @@ 
  * @copyright Copyright (c) 2018 by CANTICO ({@link http://www.cantico.fr})
  */
 
-require_once dirname(__FILE__) . '/define.php';
-require_once dirname(__FILE__) . '/functions.php';
-require_once dirname(__FILE__) . '/component.class.php';
+require_once dirname(__FILE__).'/define.php';
+require_once dirname(__FILE__).'/functions.php';
+require_once dirname(__FILE__).'/component.class.php';
 
 
 
@@ -60,14 +60,14 @@ 
         $this->addonName = 'libapp';
         $this->addonPrefix = 'app';
 
-        $this->classPrefix = $this->addonPrefix . '_';
-        $this->controllerTg = 'addon/' . $this->addonName . '/main';
+        $this->classPrefix = $this->addonPrefix.'_';
+        $this->controllerTg = 'addon/'.$this->addonName.'/main';
 
         $addon = bab_getAddonInfosInstance($this->addonName);
         $this->phpPath = $addon->getPhpPath();
         $this->recordSetPath = $this->phpPath;
         $this->ctrlPath = $this->phpPath;
-        $this->uiPath = $this->phpPath . 'ui/';
+        $this->uiPath = $this->phpPath.'ui/';
 
         $babDB = bab_getDB();
 
@@ -84,7 +84,7 @@ 
         if (class_exists($componentDefinitionObjectName)) {
             $componentDefinition = new $componentDefinitionObjectName;
             $components = $componentDefinition->getComponents($this);
-            foreach ($components as $singleName => $singleComponent){
+            foreach ($components as $singleName => $singleComponent) {
                 $this->addComponent($singleName, $singleComponent);
             }
         }
@@ -113,7 +113,7 @@ 
         $nbElem = count($componentName);
         $componentName = $componentName[$nbElem - 1];
         $componentName = strtoupper($componentName);
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
         }
         return null;
@@ -142,9 +142,9 @@ 
     
     public function __get($componentName)
     {
-        if(isset($this->components[$componentName])){
+        if (isset($this->components[$componentName])) {
             return $this->components[$componentName];
-        }else{
+        } else {
             return null;
         }
     }
@@ -163,12 +163,12 @@ 
         
         $messages = array();
         
-        foreach ($components as $componentName => $component){
+        foreach ($components as $componentName => $component) {
             $dependencies = $component->checkDependencies();
-            foreach($dependencies['requiredComponents'] as $requiredComponent){
+            foreach ($dependencies['requiredComponents'] as $requiredComponent) {
                 $messages['requiredComponents'][$componentName][] = $requiredComponent;
             }
-            foreach($dependencies['optionalComponents'] as $optionalComponent){
+            foreach ($dependencies['optionalComponents'] as $optionalComponent) {
                 $messages['optionalComponents'][$componentName][] = $optionalComponent;
             }
         }
@@ -180,9 +180,9 @@ 
     {
         $components = $this->getComponents();
         $componentDefinitions = array();
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $packageName = $component->getPackageName();
-            if(isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])){
+            if (isset($componentDefinitions[$packageName]) && !empty($componentDefinitions[$packageName])) {
                 continue;
             }
             $componentDefinitions[$packageName] = $component->getDefinition();
@@ -225,8 +225,8 @@ 
     public function getRecordSetPathname($class)
     {
         // $App->MyRecordSet() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix), -3)) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix), -3)).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -238,8 +238,8 @@ 
     public function getRecordPathname($class)
     {
         // $App->MyRecord() -> myrecord.class.php
-        $file = strtolower(substr($class, strlen($this->classPrefix))) . '.class.php';
-        return $this->recordSetPath . $file;
+        $file = strtolower(substr($class, strlen($this->classPrefix))).'.class.php';
+        return $this->recordSetPath.$file;
     }
 
     /**
@@ -340,7 +340,7 @@ 
 
             if (substr($method, 0, 7) === 'include' && substr($method, -3) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
 
                 $classname = $this->$classNameMethod();
@@ -362,7 +362,7 @@ 
                                 // We need to revert to multilang fields before synchronizing.
                                 $set->useLang(false);
                             }
-                            $sql .= $mysqlbackend->setToSql($set) . "\n";
+                            $sql .= $mysqlbackend->setToSql($set)."\n";
                         }
                     }
                 }
@@ -389,9 +389,9 @@ 
             ';
 
         $noPackageNames = array();
-        foreach ($this->components as $component){
+        foreach ($this->components as $component) {
             /* @var $component app_Component */
-            try{
+            try {
                 /* @var $set ORM_RecordSet */
                 $set = $component->recordSet();
                 //Check if the component is not overriden by the addon
@@ -399,26 +399,26 @@ 
                 //In case the set has been overriden, we simply do nothing here, as it will be instanciated by the synchronizeSql method
                 $cmprc = new ReflectionClass($set);
                 $componentSetClass = $cmprc->getShortName();
-                if(method_exists($this, $componentSetClass)){
+                if (method_exists($this, $componentSetClass)) {
                     continue;
                 }
-                if(method_exists($set, 'useLang')){
+                if (method_exists($set, 'useLang')) {
                     // This is necessary if the recordSet constructor uses a setLang().
                     // We need to revert to multilang fields before synchronizing.
                     $set->useLang(false);
                 }
-                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                $sql .= $mysqlbackend->setToSql($set)."\n";
                 
-                if(empty($component->getPackageName())){
+                if (empty($component->getPackageName())) {
                     $noPackageNames[] = $component->getName();
                 }
             }
-            catch (Exception $e){
+            catch (Exception $e) {
                 
             }
         }
         
-        if(!empty($noPackageNames)){
+        if (!empty($noPackageNames)) {
             $errorMessage = implode(', ', $noPackageNames);
             bab_installWindow::message(
                 sprintf(
@@ -442,18 +442,18 @@ 
         $synchronize->fromSqlString($sql);
         
         $dependencies = $this->checkComponentsDependencies();
-        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents){
-            foreach ($requiredComponents as $requiredComponent){
+        foreach ($dependencies['requiredComponents'] as $componentName => $requiredComponents) {
+            foreach ($requiredComponents as $requiredComponent) {
                 $hasComponent = $this->getComponentByName($requiredComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     bab_installWindow::message(sprintf($this->translate('The component %s is required for the component %s to work. You will encounter fatal errors'), $requiredComponent, $componentName));
                 }
             }
         }
-        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents){
-            foreach ($optionalComponents as $optionalComponent){
+        foreach ($dependencies['optionalComponents'] as $componentName => $optionalComponents) {
+            foreach ($optionalComponents as $optionalComponent) {
                 $hasComponent = $this->getComponentByName($optionalComponent);
-                if(!$hasComponent){
+                if (!$hasComponent) {
                     bab_installWindow::message(sprintf($this->translate('The optional component %s has not been added. The component %s may have reduced functionalities'), $optionalComponent, $componentName));
                 }
             }
@@ -466,7 +466,7 @@ 
     {
         $components = $this->getComponents();
         
-        foreach ($components as $component){
+        foreach ($components as $component) {
             $component->onUpdate();
         }
         
@@ -487,7 +487,7 @@ 
 
             if (substr($method, 0, strlen('include')) === 'include' && substr($method, -strlen('Set')) === 'Set') {
                 $incl = $method;
-                $classNameMethod = substr($method, strlen('include')) . 'ClassName';
+                $classNameMethod = substr($method, strlen('include')).'ClassName';
 
                 $classname = $this->$classNameMethod();
 
@@ -501,7 +501,7 @@ 
 
                             if (class_exists($classname) && method_exists($this, $call)) {
                                 $set = $this->$call();
-                                $sql .= $mysqlbackend->setToSql($set) . "\n";
+                                $sql .= $mysqlbackend->setToSql($set)."\n";
                             }
                         }
                     }
@@ -515,7 +515,7 @@ 
 
     public function includeBase()
     {
-        require_once APP_PHP_PATH . 'base.class.php';
+        require_once APP_PHP_PATH.'base.class.php';
     }
 
     /**
@@ -523,7 +523,7 @@ 
      */
     public function includeRecordSet()
     {
-        require_once APP_SET_PATH . 'record.class.php';
+        require_once APP_SET_PATH.'record.class.php';
     }
 
 
@@ -532,7 +532,7 @@ 
      */
     public function includeTraceableRecordSet()
     {
-        require_once APP_SET_PATH . 'traceablerecord.class.php';
+        require_once APP_SET_PATH.'traceablerecord.class.php';
     }
 
 
@@ -544,7 +544,7 @@ 
     {
         static $accessManager = null;
         if (!isset($accessManager)) {
-            require_once APP_SET_PATH . 'accessmanager.class.php';
+            require_once APP_SET_PATH.'accessmanager.class.php';
             $accessManager = new app_AccessManager($this);
         }
 
@@ -562,7 +562,7 @@ 
      */
     public function includeLogSet()
     {
-        require_once APP_SET_PATH . 'log.class.php';
+        require_once APP_SET_PATH.'log.class.php';
     }
 
     /**
@@ -578,7 +578,7 @@ 
      */
     public function LogSetClassName()
     {
-        return $this->LogClassName() . 'Set';
+        return $this->LogClassName().'Set';
     }
 
     /**
@@ -600,7 +600,7 @@ 
      */
     public function includeLinkSet()
     {
-        require_once APP_SET_PATH . 'link.class.php';
+        require_once APP_SET_PATH.'link.class.php';
     }
 
     /**
@@ -616,7 +616,7 @@ 
      */
     public function LinkSetClassName()
     {
-        return $this->LinkClassName() . 'Set';
+        return $this->LinkClassName().'Set';
     }
 
     /**
@@ -637,7 +637,7 @@ 
      */
     public function includeNotificationSet()
     {
-        require_once APP_SET_PATH . 'notification.class.php';
+        require_once APP_SET_PATH.'notification.class.php';
     }
 
     /**
@@ -653,7 +653,7 @@ 
      */
     public function NotificationSetClassName()
     {
-        return $this->NotificationClassName() . 'Set';
+        return $this->NotificationClassName().'Set';
     }
 
     /**
@@ -674,7 +674,7 @@ 
      */
     public function includeSSESet()
     {
-        require_once APP_SET_PATH . 'sse.class.php';
+        require_once APP_SET_PATH.'sse.class.php';
     }
     
     /**
@@ -690,7 +690,7 @@ 
      */
     public function SSESetClassName()
     {
-        return $this->SSEClassName() . 'Set';
+        return $this->SSEClassName().'Set';
     }
 
     /**
@@ -714,7 +714,7 @@ 
     public function getRecordSetByRef($recordClassname)
     {
         $recordClassname = str_replace($this->classPrefix, '', $recordClassname);
-        $classSet = $recordClassname . 'Set';
+        $classSet = $recordClassname.'Set';
         $set = $this->$classSet();
         return $set;
     }
@@ -735,7 +735,7 @@ 
         list($recordClassname, $id) = $refParts;
         $set = $this->getRecordSetByRef($recordClassname);
         if (isset($set)) {
-            if($noDefaultCriteria){
+            if ($noDefaultCriteria) {
                 $set->setDefaultCriteria(null);
             }
             return $set->get($id);
@@ -754,7 +754,7 @@ 
     {
         $fullClassName = get_class($record);
         list(, $className) = explode('_', $fullClassName);
-        return $className . ':' . $record->id;
+        return $className.':'.$record->id;
     }
 
 
@@ -808,7 +808,7 @@ 
         
         //Then, check if current component has a translation
         if ($translation === $str) {
-            if($currentComponent = $this->getCurrentComponent()){
+            if ($currentComponent = $this->getCurrentComponent()) {
                 $translator->setAddonName($currentComponent->getPackageName());
                 $translator->setLangPath($currentComponent->getLangPath());
                 $translation = $translator->translate($str, $str_plurals, $number);
@@ -817,7 +817,7 @@ 
         }
         //Then, check if libapp has a translation
         if ($translation === $str) { 
-            $translator->setLangPath(null);//Reset lang path
+            $translator->setLangPath(null); //Reset lang path
             $translator->setAddonName('libapp');
             $translation = $translator->translate($str, $str_plurals, $number);
         }
@@ -865,16 +865,16 @@ 
      */
     public function mailTo($addr, $subject = null, $body = null)
     {
-        $mailTo = 'mailto:' . $addr;
+        $mailTo = 'mailto:'.$addr;
         $parameters = array();
         if (isset($subject)) {
-            $parameters[] = 'subject=' . $subject;
+            $parameters[] = 'subject='.$subject;
         }
         if (isset($body)) {
-            $parameters[] = 'body=' . $body;
+            $parameters[] = 'body='.$body;
         }
         if (!empty($parameters)) {
-            $mailTo .= '?' . implode('&', $parameters);
+            $mailTo .= '?'.implode('&', $parameters);
         }
 
         return $mailTo;
@@ -925,7 +925,7 @@ 
         }
 
         $number = number_format($number, $decimals, ',', ' ');
-        return str_replace(' ', bab_nbsp(), $number . ' ' . $prefix . $unitSymbol);
+        return str_replace(' ', bab_nbsp(), $number.' '.$prefix.$unitSymbol);
     }
 
 
@@ -945,7 +945,7 @@ 
         }
 
         if (!isset($format)) {
-            $format = bab_registry::get('/' . $this->addonName . '/numberFormat', $PhoneNumber->getDefaultFormat());
+            $format = bab_registry::get('/'.$this->addonName.'/numberFormat', $PhoneNumber->getDefaultFormat());
         }
         $phoneNumberUtil = $PhoneNumber->PhoneNumberUtil();
 
@@ -966,7 +966,7 @@ 
      */
     public function includeController()
     {
-        require_once APP_PHP_PATH . '/controller.class.php';
+        require_once APP_PHP_PATH.'/controller.class.php';
     }
 
 
@@ -975,7 +975,7 @@ 
      */
     public function includeRecordController()
     {
-        require_once APP_CTRL_PATH . '/record.ctrl.php';
+        require_once APP_CTRL_PATH.'/record.ctrl.php';
     }
 
 
@@ -1015,7 +1015,7 @@ 
      */
     public function includeUi()
     {
-        require_once APP_UI_PATH . 'ui.class.php';
+        require_once APP_UI_PATH.'ui.class.php';
     }
 
 
@@ -1027,7 +1027,7 @@ 
     public function Ui()
     {
         $this->includeUi();
-        return bab_getInstance($this->classPrefix . 'Ui')->setApp($this);
+        return bab_getInstance($this->classPrefix.'Ui')->setApp($this);
     }
 
     /**
@@ -1055,34 +1055,34 @@ 
 
             case substr($name, -strlen('SetClassName')) === 'SetClassName':
                 $className = substr($name, 0, strlen($name) - strlen('SetClassName'));
-                if($component = $this->getComponentByName($className)){
+                if ($component = $this->getComponentByName($className)) {
                     return $component->getSetClassName();
                 }
                 $setName = $className.'Set';
-                return $this->classPrefix . $setName;
+                return $this->classPrefix.$setName;
 
             case substr($name, -strlen('ClassName')) === 'ClassName':
                 $recordName = substr($name, 0, strlen($name) - strlen('ClassName'));
-                if($component = $this->getComponentByName($recordName)){
+                if ($component = $this->getComponentByName($recordName)) {
                     return $component->getRecordClassName();
                 }
-                return $this->classPrefix . $recordName;
+                return $this->classPrefix.$recordName;
 
             case substr($name, 0, strlen('include')) === 'include' && substr($name, -strlen('Set')) === 'Set':
                 $fileNameBase = strtolower(substr(substr($name, 0, strlen($name) - strlen('Set')), strlen('include')));
-                if($this->getComponentByName($fileNameBase)){
+                if ($this->getComponentByName($fileNameBase)) {
                     return;
                 }
-                require_once APP_SET_PATH . $fileNameBase . '.class.php';
+                require_once APP_SET_PATH.$fileNameBase.'.class.php';
                 return;
 
             case substr($name, -strlen('Set')) === 'Set':
-                if($component = $this->getComponentByName(substr($name, 0, strlen($name) -strlen('Set')))){
+                if ($component = $this->getComponentByName(substr($name, 0, strlen($name) - strlen('Set')))) {
                     return $component->recordSet();
                 }
-                $includeMethod = 'include' . $name;
+                $includeMethod = 'include'.$name;
                 $this->$includeMethod();
-                $setClassNameMethod = $name . 'ClassName';
+                $setClassNameMethod = $name.'ClassName';
                 $className = $this->$setClassNameMethod();
                 $set = new $className($this);
                 return $set;
@@ -1090,8 +1090,8 @@ 
             case ($component = $this->getComponentByName($name)) != false:
                 return $component;
             default:
-                $setName = $name . 'Set';
-                $recordClassNameMethod = $name . 'ClassName';
+                $setName = $name.'Set';
+                $recordClassNameMethod = $name.'ClassName';
                 $recordClassName = $this->$recordClassNameMethod();
                 if (isset($arguments[0])) {
                     if ($arguments[0] instanceof $recordClassName) {

Braces +2 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
     {
         if(isset($this->components[$componentName])){
             return $this->components[$componentName];
-        }else{
+        } else{
             return null;
         }
     }
@@ -412,8 +412,7 @@ 
                 if(empty($component->getPackageName())){
                     $noPackageNames[] = $component->getName();
                 }
-            }
-            catch (Exception $e){
+            } catch (Exception $e){
                 
             }
         }

programs/ui/base.ui.php

Indentation +9 added lines, -9 removed lines

@@ -119,7 +119,7 @@ 
     public function __construct(Func_App $app, $id = null, Widget_Layout $layout = null)
     {
         parent::__construct($app);
-         // We simulate inheritance from Widget_VBoxLayout.
+            // We simulate inheritance from Widget_VBoxLayout.
         $W = $this->widgets = bab_Widgets();
 
         $this->buttonsLayout = $this->buttonsLayout();
@@ -1453,21 +1453,21 @@ 
 
 
 
-	protected function addCustomFields(app_RecordSet $recordSet)
-	{
-		$customFields = $recordSet->getCustomFields();
+    protected function addCustomFields(app_RecordSet $recordSet)
+    {
+        $customFields = $recordSet->getCustomFields();
 
         foreach ($customFields as $customField) {
             $fieldname = $customField->fieldname;
             $this->addColumn(
                 widget_TableModelViewColumn($recordSet->$fieldname, $customField->name)
-                  ->setSortable(true)
-                  ->setExportable(true)
-                  ->setSearchable($customField->searchable)
-				  ->setVisible($customField->visible)
+                    ->setSortable(true)
+                    ->setExportable(true)
+                    ->setSearchable($customField->searchable)
+                    ->setVisible($customField->visible)
             );
         }
-	}
+    }
 
 
     /**

Spacing +57 added lines, -57 removed lines

@@ -26,7 +26,7 @@ 
 bab_Widgets()->includePhpClass('widget_InputWidget');
 bab_Widgets()->includePhpClass('widget_TableModelView');
 
-require_once dirname(__FILE__) . '/ui.helpers.php';
+require_once dirname(__FILE__).'/ui.helpers.php';
 
 /**
  * @return Widget_Form
@@ -529,7 +529,7 @@ 
      */
     protected function getRecordSet()
     {
-        if(!isset($this->recordSet)){
+        if (!isset($this->recordSet)) {
             $this->recordSet = parent::getRecordSet();
         }
         return $this->recordSet;
@@ -665,7 +665,7 @@ 
 
     public function addSections($view)
     {
-        echo '<!-- VIEW (' . $view . ') -->';
+        echo '<!-- VIEW ('.$view.') -->';
         $App = $this->App();
         $W = bab_Widgets();
 
@@ -713,7 +713,7 @@ 
                     continue;
                 }
     
-                list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+                list(,, $nbCol) = explode('-', $customSection->sizePolicy);
     
                 if ($currentColumn + $nbCol > 12) {
                     $container->addItem($row);
@@ -745,14 +745,14 @@ 
                     $sizePolicy = 'customsection-field-box ';
                     $sizePolicy .= isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
                     $sizePolicy .= isset($parameters['transparentBackground']) && $parameters['transparentBackground'] ? 'customsection-field-box-transparentBackground' : '';
-                    $displayFieldMethod = '_' . $displayFieldName;
+                    $displayFieldMethod = '_'.$displayFieldName;
     
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                         $widget = $this->$displayFieldMethod($customSection, $label);
                         $item = $widget;
                     } 
                     else {
-                        if($isGroupField){
+                        if ($isGroupField) {
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                             if (method_exists($this, '__fieldsGroup')) {
                                 $customSection->fieldsLayout = $groupFieldsLayout;
@@ -761,8 +761,8 @@ 
                             }
                             $sizePolicy .= ' customsection-fieldsgroup-box';
                         }
-                        else{
-                            try{
+                        else {
+                            try {
                                 $field = $recordSet->getField($displayFieldName);
                                 if ($label === '' || $label === '__') {
                                     $label = $field->getDescription();
@@ -824,14 +824,14 @@ 
             $parameters = $displayField['parameters'];
             $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
             $label = isset($parameters['label']) && !empty($parameters['label']) && $parameters['label'] !== '__' ? $parameters['label'] : null;
-            $displayFieldMethod = '_' . $displayFieldName;
+            $displayFieldMethod = '_'.$displayFieldName;
             $sizePolicy = 'customsection-field-box ';
             $sizePolicy .= isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
             if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                 $item = $this->$displayFieldMethod($customSection, $label);
             }
-            else{
-                if($isGroupField){
+            else {
+                if ($isGroupField) {
                     list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                     if (method_exists($this, '__fieldsGroup')) {
                         $customSection->fieldsLayout = $groupFieldsLayout;
@@ -840,7 +840,7 @@ 
                     }
                     $sizePolicy .= ' customsection-fieldsgroup-box';
                 }
-                else{
+                else {
                     try {
                         $field = $this->recordSet->getField($displayFieldName);
                         if (!isset($label) || empty($label)) {
@@ -882,14 +882,14 @@ 
         $groupField = $customSection->getField('_fieldsGroup'.$groupId);
         $recordSet = $this->getRecordSet();
         
-        if(isset($groupField['fields'])){
-            foreach ($groupField['fields'] as $field){
+        if (isset($groupField['fields'])) {
+            foreach ($groupField['fields'] as $field) {
                 $item = null;
                 
                 $labelField = isset($field['parameters']['label']) ? $field['parameters']['label'] : '';
                 $itemClass = isset($field['parameters']['classname']) ? $field['parameters']['classname'] : '';
                 $displayFieldName = $field['fieldname'];
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $labelField);
                 }
@@ -907,7 +907,7 @@ 
                     }
                     $item = $this->getValueItem($customSection, $field, $labelField, $item);
                 }
-                if(isset($item)){
+                if (isset($item)) {
                     $item->addClass('app-customsection-groupedfield');
                     $item->addClass($itemClass);
                     $box->addItem($item);
@@ -1172,7 +1172,7 @@ 
         $row = $W->Items()->setSizePolicy('row');
         foreach ($customSections as $customSection) {
 
-            list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+            list(,, $nbCol) = explode('-', $customSection->sizePolicy);
 
             if ($currentColumn + $nbCol > 12) {
                 $this->addItem($row);
@@ -1199,7 +1199,7 @@ 
                 $parameters = $displayField['parameters'];
                 $classname = isset($parameters['classname']) ? $parameters['classname'] : '';
                 $label = isset($parameters['label']) ? $parameters['label'] : '';
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
 
                 if (method_exists($this, $displayFieldMethod)) {
                     $value = $this->$displayFieldMethod($customSection, $label);
@@ -1286,7 +1286,7 @@ 
      */
     protected function initHeaderRow(ORM_RecordSet $set)
     {
-        require_once $GLOBALS['babInstallPath'] . 'utilit/urlincl.php';
+        require_once $GLOBALS['babInstallPath'].'utilit/urlincl.php';
         
         bab_functionality::includefile('Icons');
         
@@ -1318,12 +1318,12 @@ 
             $sizePolicy = 'widget-actions-target';
             
             if ($this->isMultiSelect() && $columnPath === '_select_') {
-                $this->toggleCheckAllBox  = $W->CheckBox();
+                $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;
@@ -1340,9 +1340,9 @@ 
                     $direction = ':up';
                 }
                 
-                $url = bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath . $direction);
+                $url = bab_url::mod($this->sortBaseUrl, $this->sortParameterName, $columnPath.$direction);
                 if ($anchor = $this->getAnchor()) {
-                    $url .= '#' . urlencode($anchor);
+                    $url .= '#'.urlencode($anchor);
                 }
                 
                 $columnItem = $W->Link(
@@ -1354,7 +1354,7 @@ 
                 )->addClass('widget-table-column-sorting-action');
                 if ($this->sortAjaxAction) {
                     $columnItem->setAjaxAction(
-                        $this->sortAjaxAction->setParameter('sort', $columnPath . $direction),
+                        $this->sortAjaxAction->setParameter('sort', $columnPath.$direction),
                         ''
                     );
                 }
@@ -1375,10 +1375,10 @@ 
                 $columnItem->addClass('icon', $columnIcon)->setSizePolicy(Func_Icons::ICON_LEFT_16);
             }
             
-            if($isSortable){
+            if ($isSortable) {
                 $sizePolicy .= ' widget-table-column-sortable';
             }
-            if($isSearchable){
+            if ($isSearchable) {
                 if (!isset($this->filterBaseUrl)) {
                     $this->filterBaseUrl = $this->getRecordControllerProxy()->displayListFilter();
                 }
@@ -1393,7 +1393,7 @@ 
                     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';
                 }
             }
@@ -1408,12 +1408,12 @@ 
         }
     }
 
-    protected function initRow($record, $row){
-        if($this->highlightRows == null){
+    protected function initRow($record, $row) {
+        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");
@@ -1443,7 +1443,7 @@ 
             // we try to select one according to the classname prefix.
             list($prefix) = explode('_', get_class($this));
             $functionalityName = ucwords($prefix);
-            $this->app = @bab_functionality::get('App/' . $functionalityName);
+            $this->app = @bab_functionality::get('App/'.$functionalityName);
             if (!$this->app) {
                 $this->app = @bab_functionality::get('App');
             }
@@ -1504,7 +1504,7 @@ 
         $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
 
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }
@@ -1609,7 +1609,7 @@ 
 
             $values = $set->select();
             foreach ($values as $record) {
-                $widget->addOption($record->id, (string)$record->name);
+                $widget->addOption($record->id, (string) $record->name);
             }
 
             return $widget;
@@ -1717,11 +1717,11 @@ 
 
         foreach ($columns as $fieldName => $column) {
             $field = $column->getField();
-            if (! $column->isSearchable()) {
+            if (!$column->isSearchable()) {
                 continue;
             }
 
-            if (! ($field instanceof ORM_Field)) {
+            if (!($field instanceof ORM_Field)) {
                 $field = null;
             }
 
@@ -1738,7 +1738,7 @@ 
                 $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());
 
@@ -1762,7 +1762,7 @@ 
                             $W->Link('', $removeColumnsAction)
                                 ->setAjaxAction()
                                 ->addClass('icon', Func_Icons::STATUS_DIALOG_ERROR)
-                                ->addAttribute('data-removefor',  $column->getFieldPath())
+                                ->addAttribute('data-removefor', $column->getFieldPath())
                         )->setAlignItems(Widget_FlexLayout::FLEX_ALIGN_ITEMS_FLEX_END)
                     );
                 } else {
@@ -1773,7 +1773,7 @@ 
         }
 
 
-        if (! $this->submit) {
+        if (!$this->submit) {
             $this->submit = $W->SubmitButton();
             $this->submit->setLabel(widget_translate('Apply filter'));
         }
@@ -1812,7 +1812,7 @@ 
 
 
                 foreach ($filterNames as $filterName) {
-                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId() . '/filters/' . $filterName, 'widgets', false);
+                    $filter = $W->getUserConfiguration($controller->getModelViewDefaultId().'/filters/'.$filterName, 'widgets', false);
 
 //                     $this->select->addItem(
 //                         $W->Link(
@@ -1866,7 +1866,7 @@ 
         $form->setReadOnly(true);
         $form->setName('filter');
         $form->colon();
-        $form->checkUnsaved(false,null);
+        $form->checkUnsaved(false, null);
 
         $form->setLayout(
             $W->FlowItems(
@@ -1928,7 +1928,7 @@ 
 //        $this->setCurrentPage(isset($filter['pageNumber']) ? $filter['pageNumber'] : $pageNumber);
 
         if (isset($name)) {
-            $this->sortParameterName = $name . '[filter][sort]';
+            $this->sortParameterName = $name.'[filter][sort]';
         } else {
             $this->sortParameterName = 'filter[sort]';
         }
@@ -2026,7 +2026,7 @@ 
 
     $tableview->setCurrentPage(isset($filterValues['pageNumber']) ? $filterValues['pageNumber'] : 0);
 
-    $tableview->sortParameterName = $name . '[filter][sort]';
+    $tableview->sortParameterName = $name.'[filter][sort]';
 
     if (isset($filterValues['sort'])) {
         $tableview->setSortField($filterValues['sort']);
@@ -2357,7 +2357,7 @@ 
                     continue;
                 }
     
-                list(, , $nbCol) = explode('-', $customSection->sizePolicy);
+                list(,, $nbCol) = explode('-', $customSection->sizePolicy);
     
                 if ($currentColumn + $nbCol > 12) {
                     $container->addItem($row);
@@ -2413,19 +2413,19 @@ 
                     $sizePolicy .= isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
                     $sizePolicy .= isset($parameters['transparentBackground']) && $parameters['transparentBackground'] ? 'customsection-field-box-transparentBackground' : '';
                     
-                    $displayFieldMethod = '_' . $displayFieldName;
+                    $displayFieldMethod = '_'.$displayFieldName;
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                         $item = $this->$displayFieldMethod($customSection, $label);
                     } 
                     else {
-                        if($isGroupField){
+                        if ($isGroupField) {
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                             if (method_exists($this, '__fieldsGroup')) {
                                 $item = $this->__fieldsGroup($customSection, $groupId, $label);
                             } 
                             $sizePolicy .= ' customsection-fieldsgroup-box';
                         }
-                        else{
+                        else {
                             try {
                                 $field = $this->recordSet->getField($displayFieldName);
                                 $value = $this->fieldOutput($field, $this->record, $displayFieldName);
@@ -2453,7 +2453,7 @@ 
                 }
             }
             
-            if ($currentColumn + $nbCol> 0) {
+            if ($currentColumn + $nbCol > 0) {
                 $container->addItem($row);
             }
         }
@@ -2485,8 +2485,8 @@ 
         $groupField = $customSection->getField('_fieldsGroup'.$groupId);
         $originalFieldsLayout = $customSection->fieldsLayout;
         $customSection->fieldsLayout = app_CustomSection::FIELDS_LAYOUT_VERTICAL_LABEL;
-        if(isset($groupField['fields'])){
-            foreach ($groupField['fields'] as $field){
+        if (isset($groupField['fields'])) {
+            foreach ($groupField['fields'] as $field) {
                 $item = null;
                 $parameters = $field['parameters'];
                 $labelField = isset($parameters['label']) ? $parameters['label'] : '';
@@ -2496,11 +2496,11 @@ 
                 
                 $displayFieldName = $field['fieldname'];
                 
-                $displayFieldMethod = '_' . $displayFieldName;
+                $displayFieldMethod = '_'.$displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $labelField);
                 } 
-                else{
+                else {
                     try {
                         $field = $this->recordSet->getField($displayFieldName);
                         $value = $this->fieldOutput($field, $this->record, $displayFieldName);
@@ -2516,7 +2516,7 @@ 
                         $item = null;
                     }
                 }
-                if(isset($item)){
+                if (isset($item)) {
                     $item->addClass('app-customsection-groupedfield');
                     $item->addClass($itemClass);
                 }
@@ -2638,7 +2638,7 @@ 
 
         $displayable = $field->output($value);
 
-        switch(true) {
+        switch (true) {
             case ($field instanceof ORM_TextField):
                 $displayable = $W->RichText($displayable)->setRenderingOptions(BAB_HTML_ALL ^ BAB_HTML_P);
                 break;
@@ -2758,7 +2758,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);
@@ -2806,10 +2806,10 @@ 
         $pagesLengths = array(5, 10, 12, 15, 20, 30, 50, 100, 200, 300, 500, 1000);
         
         $select = $W->Select();
-        foreach ($pagesLengths as $pagesLength){
+        foreach ($pagesLengths as $pagesLength) {
             $select->addOption($pagesLength, $pagesLength);
         }
-        $select->setValue($W->getUserConfiguration($this->modelViewId . '/pageLength', 'widgets'));
+        $select->setValue($W->getUserConfiguration($this->modelViewId.'/pageLength', 'widgets'));
         
         return $W->LabelledWidget(
             $this->App()->translate('Number of lines per page'),
@@ -2823,7 +2823,7 @@ 
         $W = bab_Widgets();
         
         $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'),

Braces +8 added lines, -16 removed lines

@@ -750,8 +750,7 @@ 
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                         $widget = $this->$displayFieldMethod($customSection, $label);
                         $item = $widget;
-                    } 
-                    else {
+                    } else {
                         if($isGroupField){
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                             if (method_exists($this, '__fieldsGroup')) {
@@ -760,8 +759,7 @@ 
                                 $customSection->fieldsLayout = $originalFieldsLayout;
                             }
                             $sizePolicy .= ' customsection-fieldsgroup-box';
-                        }
-                        else{
+                        } else{
                             try{
                                 $field = $recordSet->getField($displayFieldName);
                                 if ($label === '' || $label === '__') {
@@ -829,8 +827,7 @@ 
             $sizePolicy .= isset($parameters['sizePolicy']) ? $parameters['sizePolicy'] : '';
             if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                 $item = $this->$displayFieldMethod($customSection, $label);
-            }
-            else{
+            } else{
                 if($isGroupField){
                     list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                     if (method_exists($this, '__fieldsGroup')) {
@@ -839,8 +836,7 @@ 
                         $customSection->fieldsLayout = $wantedFieldsLayout;
                     }
                     $sizePolicy .= ' customsection-fieldsgroup-box';
-                }
-                else{
+                } else{
                     try {
                         $field = $this->recordSet->getField($displayFieldName);
                         if (!isset($label) || empty($label)) {
@@ -892,8 +888,7 @@ 
                 $displayFieldMethod = '_' . $displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $labelField);
-                }
-                else if ($recordSet->fieldExist($displayFieldName)) {
+                } else if ($recordSet->fieldExist($displayFieldName)) {
                     $field = $recordSet->getField($displayFieldName);
                     if ($labelField === '') {
                         $labelField = $field->getDescription();
@@ -2416,16 +2411,14 @@ 
                     $displayFieldMethod = '_' . $displayFieldName;
                     if (!$isGroupField && method_exists($this, $displayFieldMethod)) {
                         $item = $this->$displayFieldMethod($customSection, $label);
-                    } 
-                    else {
+                    } else {
                         if($isGroupField){
                             list(, $groupId) = explode('_fieldsGroup', $displayFieldId);
                             if (method_exists($this, '__fieldsGroup')) {
                                 $item = $this->__fieldsGroup($customSection, $groupId, $label);
                             } 
                             $sizePolicy .= ' customsection-fieldsgroup-box';
-                        }
-                        else{
+                        } else{
                             try {
                                 $field = $this->recordSet->getField($displayFieldName);
                                 $value = $this->fieldOutput($field, $this->record, $displayFieldName);
@@ -2499,8 +2492,7 @@ 
                 $displayFieldMethod = '_' . $displayFieldName;
                 if (method_exists($this, $displayFieldMethod)) {
                     $item = $this->$displayFieldMethod($customSection, $labelField);
-                } 
-                else{
+                } else{
                     try {
                         $field = $this->recordSet->getField($displayFieldName);
                         $value = $this->fieldOutput($field, $this->record, $displayFieldName);

programs/ui/widgets/shapes.ui.php

Spacing +2 added lines, -2 removed lines

@@ -88,7 +88,7 @@ 
 {    
     protected function getShapeHtml()
     {
-        $path = "M{$this->size} {$this->size} ".number_format($this->size/2, 1).' '.number_format($this->size/6, 1)." L0 {$this->size} Z";
+        $path = "M{$this->size} {$this->size} ".number_format($this->size / 2, 1).' '.number_format($this->size / 6, 1)." L0 {$this->size} Z";
         return "<svg height='{$this->size}' width='{$this->size}'>
             <path d='{$path}' fill='{$this->color}'/>
         </svg>";
@@ -99,7 +99,7 @@ 
 {    
     protected function getShapeHtml()
     {
-        $val = number_format($this->size/2,1);
+        $val = number_format($this->size / 2, 1);
         return "<svg height='{$this->size}' width='{$this->size}'>
             <circle cx='{$val}' cy='{$val}' r='{$val}' fill='{$this->color}' />
         </svg>";

programs/ui/widgets/chip.ui.php

Spacing +2 added lines, -2 removed lines

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

programs/ui/ui.class.php

Spacing +18 added lines, -18 removed lines

@@ -34,13 +34,13 @@ 
      */
     public function includeBase()
     {
-        require_once APP_UI_PATH . 'base.ui.php';
-        require_once APP_UI_PATH . 'ui.helpers.php';
+        require_once APP_UI_PATH.'base.ui.php';
+        require_once APP_UI_PATH.'ui.helpers.php';
     }
 
     public function includePage()
     {
-        require_once APP_UI_PATH . 'page.class.php';
+        require_once APP_UI_PATH.'page.class.php';
     }
     
     public function __call($name, $arguments)
@@ -48,22 +48,22 @@ 
         $App = $this->App();
         $Ui = $App->Ui();
         
-        if(strpos($name, $App->classPrefix) !== false){
+        if (strpos($name, $App->classPrefix) !== false) {
             list(, $name) = explode($App->classPrefix, $name);
         }
         
-        if(method_exists($Ui, $name)){
+        if (method_exists($Ui, $name)) {
             return call_user_func_array(array($Ui, $name), $arguments);
         }
         
         $components = $App->getComponents();
-        foreach ($components as $component){
-            try{
+        foreach ($components as $component) {
+            try {
                 $componentUi = $component->ui();
-                if(isset($componentUi) && method_exists($componentUi, $name)){
+                if (isset($componentUi) && method_exists($componentUi, $name)) {
                     return call_user_func_array(array($componentUi, $name), $arguments);
                 }
-            }catch(Exception $e){}
+            } catch (Exception $e) {}
         }
         
         $rc = new ReflectionClass($this);
@@ -86,11 +86,11 @@ 
         $page->addMessageInfo();
         
         $addon = $App->getAddon();
-        if($addon){
+        if ($addon) {
             $components = $App->getComponents();
-            foreach ($components as $component){
+            foreach ($components as $component) {
                 $stylePath = $component->getStylePath();
-                if($stylePath){
+                if ($stylePath) {
                     $page->addStyleSheet($stylePath.'style.css');
                 }
             }
@@ -133,25 +133,25 @@ 
      */
     public function ExportSelectEditor($id, app_TableModelView $tableview, $filter = null)
     {
-        require_once dirname(__FILE__) . '/exportselect.ui.php';
+        require_once dirname(__FILE__).'/exportselect.ui.php';
         return new app_ExportSelectEditor($this->App(), $id, $tableview, $filter);
     }
     
     public function Chip($label, $labelIcon = null, $action = null, $actionIcon = null, $id = null)
     {
-        require_once APP_WIDGETS_PATH . 'chip.ui.php';
+        require_once APP_WIDGETS_PATH.'chip.ui.php';
         return new app_Chip($this->App(), $label, $labelIcon, $action, $actionIcon, $id);
     }
     
     public function CustomFieldTableView($id = null)
     {
-        require_once APP_UI_PATH . 'customfield.ui.php';
+        require_once APP_UI_PATH.'customfield.ui.php';
         return new app_CustomFieldTableView($this->App(), $id);
     }
     
     public function CustomFieldEditor(app_CustomField $customField = null, $id = null, $layout = null)
     {
-        require_once APP_UI_PATH . 'customfield.ui.php';
+        require_once APP_UI_PATH.'customfield.ui.php';
         return new app_CustomFieldEditor($this->App(), $customField, $id, $layout);
     }
     
@@ -175,13 +175,13 @@ 
      */
     public function CriteriaEditor(ORM_Criteria $criteria = null)
     {
-        require_once APP_UI_PATH . 'criteria.ui.php';
+        require_once APP_UI_PATH.'criteria.ui.php';
         return new app_CriteriaEditor($this->App(), $criteria);
     }
     
     public function includeShapesUi()
     {
-        require_once APP_WIDGETS_PATH . 'shapes.ui.php';
+        require_once APP_WIDGETS_PATH.'shapes.ui.php';
     }
     
     public function ShapeSquare($size = 15, $color = 'black')

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                 if(isset($componentUi) && method_exists($componentUi, $name)){
                     return call_user_func_array(array($componentUi, $name), $arguments);
                 }
-            }catch(Exception $e){}
+            } catch(Exception $e){}
         }
         
         $rc = new ReflectionClass($this);

programs/ui/criteria.ui.php

Spacing +3 added lines, -3 removed lines

@@ -120,7 +120,7 @@ 
         $classPrefix = $App->classPrefix;
 
         foreach ($recordSetFields as $fieldName => $recordSetField) {
-            if($recordSetField instanceof ORM_ManyRelation){
+            if ($recordSetField instanceof ORM_ManyRelation) {
                 /* @var $recordSetField ORM_ManyRelation */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -154,7 +154,7 @@ 
                 }
                 
             }
-            elseif($recordSetField instanceof ORM_FkField){
+            elseif ($recordSetField instanceof ORM_FkField) {
                 /* @var $recordSetField ORM_FkField */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -182,7 +182,7 @@ 
                     }
                 }
             }
-            else{
+            else {
                 /* @var $recordSetField ORM_Field */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();

Braces +2 added lines, -4 removed lines

@@ -153,8 +153,7 @@ 
                     }
                 }
                 
-            }
-            elseif($recordSetField instanceof ORM_FkField){
+            } elseif($recordSetField instanceof ORM_FkField){
                 /* @var $recordSetField ORM_FkField */
                 $fieldDescription = $fieldName;
                 $path = $fieldName;
@@ -181,8 +180,7 @@ 
                         $defaultFieldPathes[] = $foreignPath;
                     }
                 }
-            }
-            else{
+            } else{
                 /* @var $recordSetField ORM_Field */
                 $fieldName = $recordSetField->getName();
                 $fieldDescription = $recordSetField->getDescription();