capwelton / libapp

programs/customsection.class.php

Spacing +23 added lines, -23 removed lines

@@ -230,7 +230,7 @@ 
             return array();
         }
         $fields = json_decode($this->fields, true);
-        if(json_last_error() === JSON_ERROR_NONE){
+        if (json_last_error() === JSON_ERROR_NONE) {
             return $fields;
         }
         
@@ -299,7 +299,7 @@ 
     public function addField($fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(!isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$fieldName] = array(
                 'block' => ''
             );
@@ -334,16 +334,16 @@ 
     {
         $isFieldsGroup = false;
         $fields = $this->getFields();
-        if(strpos($updatedFieldName, '_fieldsGroup') !== false){
+        if (strpos($updatedFieldName, '_fieldsGroup') !== false) {
             $isFieldsGroup = true;
             list(, $groupPos) = explode('_fieldsGroup', $updatedFieldName);
-            if(!isset($groupPos) || empty($groupPos)){
+            if (!isset($groupPos) || empty($groupPos)) {
                 $groupPos = 0;
             }
         }
-        if(!isset($fields[$updatedFieldName])){
-            if($isFieldsGroup){
-                while(isset($fields[$updatedFieldName.$groupPos])){
+        if (!isset($fields[$updatedFieldName])) {
+            if ($isFieldsGroup) {
+                while (isset($fields[$updatedFieldName.$groupPos])) {
                     $groupPos++;
                 }
                 $updatedFieldName .= $groupPos;
@@ -351,7 +351,7 @@ 
             $this->addField($updatedFieldName, $parameters);
             return $this;
         }
-        if(!isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$updatedFieldName] = array(
                 'block' => ''
             );
@@ -366,11 +366,11 @@ 
     public function addFieldToGroup($fieldGroupName, $fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(!isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             return $this;
         }
         $groupFields = isset($fields[$fieldGroupName]['fields']) ? $fields[$fieldGroupName]['fields'] : array();
-        if(!isset($parameters)){
+        if (!isset($parameters)) {
             $groupFields[$fieldName] = array(
                 'block' => ''
             );
@@ -405,15 +405,15 @@ 
     public function updateFieldGroup($fieldGroupName, $updatedFieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(!isset($fields[$fieldGroupName])){
+        if (!isset($fields[$fieldGroupName])) {
             return $this;
         }
         $groupFields = isset($fields[$fieldGroupName]['fields']) ? $fields[$fieldGroupName]['fields'] : array();
-        if(!isset($groupFields[$updatedFieldName])){
+        if (!isset($groupFields[$updatedFieldName])) {
             $this->addFieldToGroup($fieldGroupName, $updatedFieldName, $parameters);
             return $this;
         }
-        if(!isset($parameters)){
+        if (!isset($parameters)) {
             $groupFields[$updatedFieldName] = array(
                 'block' => ''
             );
@@ -445,35 +445,35 @@ 
         $arrCriteria = json_decode($this->visibilityCriteria, true);
         
         foreach ($arrCriteria as $fieldName => $condition) {
-            if(strpos($fieldName, '/') !== false){
+            if (strpos($fieldName, '/') !== false) {
                 list($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
             }
-            else{
+            else {
                 $field = $recordSet->$fieldName;
             }
             foreach ($condition as $op => $value) {
-                if(!is_array($value)){
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
+                else {
+                    foreach ($value as $foreignClassName => $foreignValues) {
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
                         $foreignField = '';
                         $foreignCondition = '';
-                        foreach ($foreignValues as $foreignFieldName => $foreignConditions){
-                            if($foreignFieldName === '_foreignField'){
+                        foreach ($foreignValues as $foreignFieldName => $foreignConditions) {
+                            if ($foreignFieldName === '_foreignField') {
                                 $foreignField = $foreignConditions;
                             }
-                            else{
-                                foreach ($foreignConditions as $key => $val){
+                            else {
+                                foreach ($foreignConditions as $key => $val) {
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }
                             }
                         }
                     }
-                    if(method_exists($foreignSet, 'getDefaultCriteria')){
+                    if (method_exists($foreignSet, 'getDefaultCriteria')) {
                         $foreignCondition = $foreignCondition->_AND_($foreignSet->getDefaultCriteria());
                         
                     }

Braces +3 added lines, -6 removed lines

@@ -448,15 +448,13 @@ 
             if(strpos($fieldName, '/') !== false){
                 list($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
-            }
-            else{
+            } else{
                 $field = $recordSet->$fieldName;
             }
             foreach ($condition as $op => $value) {
                 if(!is_array($value)){
                     $criteria = $field->$op($value);
-                }
-                else{
+                } else{
                     foreach ($value as $foreignClassName => $foreignValues){
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
@@ -465,8 +463,7 @@ 
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
                             if($foreignFieldName === '_foreignField'){
                                 $foreignField = $foreignConditions;
-                            }
-                            else{
+                            } else{
                                 foreach ($foreignConditions as $key => $val){
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }

programs/portlet/base.portlet.php

Indentation +82 added lines, -82 removed lines

@@ -66,63 +66,63 @@ 
         return $this->addon->getIconPath();

     }

 

-	/**

-	 * Portlet definition ID

-	 *

-	 * @example lcrm/MyTasks

-	 * @return string

-	 */

-	public function getId()

-	{

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

-	    $app_path = explode('_', get_class($App));

-	    unset($app_path[0]); // remove Func

+    /**

+     * Portlet definition ID

+     *

+     * @example lcrm/MyTasks

+     * @return string

+     */

+    public function getId()

+    {

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

+        $app_path = explode('_', get_class($App));

+        unset($app_path[0]); // remove Func

 

-		$portlet_path = explode('_',get_class($this));

+        $portlet_path = explode('_',get_class($this));

 

-		return implode('/', $app_path).'/'.$portlet_path[count($portlet_path) - 1];

-	}

+        return implode('/', $app_path).'/'.$portlet_path[count($portlet_path) - 1];

+    }

 

 

-	/**

-	 * @return App_PortletUi

-	 */

-	public function getPortlet()

-	{

-		$classname = get_class($this);

-		$suffix = mb_substr($classname, mb_strlen('App_PortletDefinition_'));

-		$classname = 'App_PortletUi_'.$suffix;

+    /**

+     * @return App_PortletUi

+     */

+    public function getPortlet()

+    {

+        $classname = get_class($this);

+        $suffix = mb_substr($classname, mb_strlen('App_PortletDefinition_'));

+        $classname = 'App_PortletUi_'.$suffix;

 

-		return new $classname($this->App());

-	}

+        return new $classname($this->App());

+    }

 

 

-	/**

-	 * @return array

-	 */

-	public function getPreferenceFields()

-	{

-		return array();

-	}

+    /**

+     * @return array

+     */

+    public function getPreferenceFields()

+    {

+        return array();

+    }

 

 

 

-	public function getConfigurationActions()

-	{

-		return array();

-	}

+    public function getConfigurationActions()

+    {

+        return array();

+    }

 

 

 

 

-	/**

-	 * Get thumbnail URL

-	 * max 120x60

-	 */

-	public function getThumbnail()

-	{

-		return '';

-	}

+    /**

+     * Get thumbnail URL

+     * max 120x60

+     */

+    public function getThumbnail()

+    {

+        return '';

+    }

 }

 

 

@@ -131,44 +131,44 @@ 
 

 class App_PortletUi extends app_UiObject

 {

-	protected $options = array();

-

-

-	/**

-	 * @return string

-	 */

-	public function getName()

-	{

-		$classname = get_class($this);

-		return mb_substr($classname, 1 + mb_strlen(__CLASS__));

-	}

-

-

-	/**

-	 * @return App_PortletDefinition

-	 */

-	public function getPortletDefinition()

-	{

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

-	    $portlet = $App->Portlet();

-		$classname = get_class($this);

-		$method = mb_substr($classname, 1 + mb_strlen(__CLASS__));

-		return $portlet->$method();

-	}

-

-

-	public function setPreferences(array $configuration)

-	{

-		$this->options = $configuration;

-	}

-

-	public function setPreference($name, $value)

-	{

-		$this->options[$name] = $value;

-	}

-

-	public function setPortletId($id)

-	{

+    protected $options = array();

+

+

+    /**

+     * @return string

+     */

+    public function getName()

+    {

+        $classname = get_class($this);

+        return mb_substr($classname, 1 + mb_strlen(__CLASS__));

+    }

+

+

+    /**

+     * @return App_PortletDefinition

+     */

+    public function getPortletDefinition()

+    {

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

+        $portlet = $App->Portlet();

+        $classname = get_class($this);

+        $method = mb_substr($classname, 1 + mb_strlen(__CLASS__));

+        return $portlet->$method();

+    }

+

+

+    public function setPreferences(array $configuration)

+    {

+        $this->options = $configuration;

+    }

+

+    public function setPreference($name, $value)

+    {

+        $this->options[$name] = $value;

+    }

+

+    public function setPortletId($id)

+    {

         $this->portletId = $id;

-	}

+    }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
 	    $app_path = explode('_', get_class($App));

 	    unset($app_path[0]); // remove Func

 

-		$portlet_path = explode('_',get_class($this));

+		$portlet_path = explode('_', get_class($this));

 

 		return implode('/', $app_path).'/'.$portlet_path[count($portlet_path) - 1];

 	}

programs/portlet/notifications.portlet.php

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
  */
 include_once 'base.php';
 
-require_once dirname(__FILE__) . '/../functions.php';
+require_once dirname(__FILE__).'/../functions.php';
 
-require_once dirname(__FILE__) . '/base.portlet.php';
+require_once dirname(__FILE__).'/base.portlet.php';
 
 
 

programs/configuration.ctrl.php

Indentation +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
         foreach ($definitions as $packageName => $definition){

             /* @var $definition app_ComponentDefinition */

             if(!method_exists($definition, 'getConfiguration')){

-               continue; 

+                continue; 

             }

             $configurationItems[$packageName] = array(

                 'tabTitle' => $packageName,

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2022 by CapWelton ({@link https://www.capwelton.com})

  */

 

-require_once dirname(__FILE__) . '/controller.class.php';

+require_once dirname(__FILE__).'/controller.class.php';

 

 

 /**

@@ -34,10 +34,10 @@ 
     public function __construct(Func_App $app = null)

     {

         parent::__construct($app);

-        if(!bab_isUserAdministrator()){

+        if (!bab_isUserAdministrator()) {

             $action = Widget_Action::fromRequest();

             list(, $method) = explode('.', $action->getMethod());

-            if($method !== 'denied'){

+            if ($method !== 'denied') {

                 $this->redirect($this->proxy()->denied());

             }

         }

@@ -100,7 +100,7 @@ 
         $box->addClass('reload-configuration-page');

         $box->addClass('widget-100pc');

         

-        if(!isset($itemId)){

+        if (!isset($itemId)) {

             $this->resetCurrentTab();

         }

         

@@ -110,13 +110,13 @@ 
         $navBoxHtml = '<ul class="nav nav-tabs">';

         $htmlCanvas = $W->HtmlCanvas();

         

-        foreach ($configurationItems as $tabId => $tab){

+        foreach ($configurationItems as $tabId => $tab) {

             $tabLink = $W->Link(

                 $tab['tabTitle'],

                 $this->proxy()->setDisplayTab($tabId)

             )->setOpenMode(Widget_Link::OPEN_DIALOG);

             $tabLinkHtml = '<li role="configuration"';

-            if($tabId == $currentTab){

+            if ($tabId == $currentTab) {

                 $tabLinkHtml .= ' class="active"';

             }

             $tabLinkHtml .= '>';

@@ -145,14 +145,14 @@ 
         $configBox = $W->VBoxItems()->addClass('panel-body')->addClass('icon-left icon-48x48 icon-left-48');

         $box->addItem($configBox);

         

-        if(!isset($configurationItems[$currentTab])){      

+        if (!isset($configurationItems[$currentTab])) {      

             return $box;

         }

         

         $tab = $configurationItems[$currentTab];

         

-        foreach ($tab['tabContent'] as $tabSection){

-            if(!isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])){

+        foreach ($tab['tabContent'] as $tabSection) {

+            if (!isset($tabSection['sectionContent']) || empty($tabSection['sectionContent'])) {

                 continue;

             }

             $configBox->addItem(

@@ -161,7 +161,7 @@ 
                     $sectionContentBox = $W->HBoxItems()

                 )->setFoldable(true)

             );

-            foreach ($tabSection['sectionContent'] as $tabSection){

+            foreach ($tabSection['sectionContent'] as $tabSection) {

                 $sectionContentBox->addItem($tabSection);

             }

         }

@@ -188,9 +188,9 @@ 
         );

         

         $definitions = $App->getComponentDefinitions();

-        foreach ($definitions as $packageName => $definition){

+        foreach ($definitions as $packageName => $definition) {

             /* @var $definition app_ComponentDefinition */

-            if(!method_exists($definition, 'getConfiguration')){

+            if (!method_exists($definition, 'getConfiguration')) {

                continue; 

             }

             $configurationItems[$packageName] = array(

programs/component.class.php

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
  * @copyright Copyright (c) 2019 by CapWelton ({@link http://www.capwelton.com})

  */

 

-require_once dirname(__FILE__). '/record.ctrl.php';

+require_once dirname(__FILE__).'/record.ctrl.php';

 

 class app_Component 

 {

@@ -58,15 +58,15 @@ 
     {

         $main = new ReflectionClass($this->set);

         $dependencies = array();

-        if($main->hasMethod('getRequiredComponents')){

+        if ($main->hasMethod('getRequiredComponents')) {

             $requiredComponents = $this->recordSet()->getRequiredComponents();

-            foreach ($requiredComponents as $requiredComponent){

+            foreach ($requiredComponents as $requiredComponent) {

                 $dependencies['requiredComponents'][] = $requiredComponent;

             }

         }

-        if($main->hasMethod('getOptionalComponents')){

+        if ($main->hasMethod('getOptionalComponents')) {

             $optionalComponents = $this->recordSet()->getOptionalComponents();

-            foreach ($optionalComponents as $optionalComponent){

+            foreach ($optionalComponents as $optionalComponent) {

                 $dependencies['optionalComponents'][] = $optionalComponent;

             }

         }

@@ -82,20 +82,20 @@ 
     

     public function getPackageName()

     {

-        if(!isset($this->packageName) || empty($this->packageName)){

+        if (!isset($this->packageName) || empty($this->packageName)) {

             $packageName = '';

             $setRc = new ReflectionClass($this->set);

             //Tries to automatically retrieve the package name from the definition.json

-            if($setRc){

+            if ($setRc) {

                 //Get definition file path

                 $definitionPathParts = explode('/', $setRc->getFileName());

                 $definitionPath = implode('/', (array_splice($definitionPathParts, 0, -3)));

                 $definitionPath .= '/definition.json';

                 $definitionContent = file_get_contents($definitionPath);

-                if($definitionContent){

+                if ($definitionContent) {

                     //Get definition.json content

-                    $definitionContent = json_decode($definitionContent,true);

-                    if($definitionContent && isset($definitionContent['name'])){

+                    $definitionContent = json_decode($definitionContent, true);

+                    if ($definitionContent && isset($definitionContent['name'])) {

                         //Get name in definition.json

                         $definitionNameParts = explode('/', $definitionContent['name']);

                         $packageName = $definitionNameParts[count($definitionNameParts) - 1];

@@ -115,7 +115,7 @@ 
     public function onUpdate()

     {

         $main = new ReflectionClass($this->set);

-        if($main->hasMethod('onUpdate')){

+        if ($main->hasMethod('onUpdate')) {

             $this->recordSet()->onUpdate();

         }

     }

@@ -125,12 +125,12 @@ 
      */

     public function controller($proxy = true)

     {

-        if(!isset($this->controllerObject)){

+        if (!isset($this->controllerObject)) {

             $this->app->includeRecordController();

             $ctrl = $this->controller;

             $this->controllerObject = new $ctrl($this->app, $this);

         }

-        if($proxy){

+        if ($proxy) {

             return $this->controllerObject->proxy();

         }

         return $this->controllerObject;

@@ -150,9 +150,9 @@ 
     public function ui()

     {

         $this->app->includeUi();

-        if(!isset($this->uiObject)){

+        if (!isset($this->uiObject)) {

             $ui = $this->ui;

-            if(!isset($ui)){

+            if (!isset($ui)) {

                 return null;

             }

             $this->uiObject = new $ui($this->app);

@@ -169,7 +169,7 @@ 
     public function getSetClassName()

     {

         $reflectionClass = new ReflectionClass($this->set);

-        return $this->app->classPrefix . $reflectionClass->getShortName();

+        return $this->app->classPrefix.$reflectionClass->getShortName();

     }

     

     public function getRecordClassName()

@@ -195,7 +195,7 @@ 
     public function getLangPath()

     {

         $def = $this->getDefinition();

-        if($def){

+        if ($def) {

             return $def->getLangPath($this->app);

         }

         return null;

@@ -204,7 +204,7 @@ 
     public function getStylePath()

     {

         $def = $this->getDefinition();

-        if($def){

+        if ($def) {

             return $def->getStylePath($this->app);

         }

         return null;

@@ -213,7 +213,7 @@ 
     public function getScriptPath()

     {

         $def = $this->getDefinition();

-        if($def){

+        if ($def) {

             return $def->getScriptPath($this->app);

         }

         return null;

programs/customcontainer.class.php

Spacing +10 added lines, -10 removed lines

@@ -179,35 +179,35 @@
 
 
         foreach ($arrCriteria as $fieldName => $condition) {
-            if(strpos($fieldName, '/') !== false){
+            if (strpos($fieldName, '/') !== false) {
                 list($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
             }
-            else{
+            else {
                 $field = $recordSet->$fieldName;
             }
             foreach ($condition as $op => $value) {
-                if(!is_array($value)){
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
+                else {
+                    foreach ($value as $foreignClassName => $foreignValues) {
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
                         $foreignField = '';
                         $foreignCondition = '';
-                        foreach ($foreignValues as $foreignFieldName => $foreignConditions){
-                            if($foreignFieldName === '_foreignField'){
+                        foreach ($foreignValues as $foreignFieldName => $foreignConditions) {
+                            if ($foreignFieldName === '_foreignField') {
                                 $foreignField = $foreignConditions;
                             }
-                            else{
-                                foreach ($foreignConditions as $key => $val){
+                            else {
+                                foreach ($foreignConditions as $key => $val) {
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }
                             }
                         }
                     }
-                    if(method_exists($foreignSet, 'getDefaultCriteria')){
+                    if (method_exists($foreignSet, 'getDefaultCriteria')) {
                         $foreignCondition = $foreignCondition->_AND_($foreignSet->getDefaultCriteria());
                         
                     }

Braces +3 added lines, -6 removed lines

@@ -182,15 +182,13 @@ 
             if(strpos($fieldName, '/') !== false){
                 list($oneField, $foreignField) = explode('/', $fieldName);
                 $field = $recordSet->$oneField()->$foreignField;
-            }
-            else{
+            } else{
                 $field = $recordSet->$fieldName;
             }
             foreach ($condition as $op => $value) {
                 if(!is_array($value)){
                     $criteria = $field->$op($value);
-                }
-                else{
+                } else{
                     foreach ($value as $foreignClassName => $foreignValues){
                         $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName).'Set';
                         $foreignSet = $App->$foreignClassName();
@@ -199,8 +197,7 @@ 
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
                             if($foreignFieldName === '_foreignField'){
                                 $foreignField = $foreignConditions;
-                            }
-                            else{
+                            } else{
                                 foreach ($foreignConditions as $key => $val){
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }

programs/sse.ctrl.php

Indentation +12 added lines, -12 removed lines

@@ -55,19 +55,19 @@
             ob_end_flush();

             flush();

             sleep($refreshFrequency);

-    	}

-	}

+        }

+    }

 	

-	private function getRefreshFrequency()

-	{

-	    if(!isset($this->refreshFrequency)){

-	        $registry = app_getRegistry();

-	        $registry->changeDirectory('configuration');

-	        $registry->changeDirectory('SSE');

-	        $this->refreshFrequency = $registry->getValue('refreshFrequency', 3);

-	    }

-	    return $this->refreshFrequency;

-	}

+    private function getRefreshFrequency()

+    {

+        if(!isset($this->refreshFrequency)){

+            $registry = app_getRegistry();

+            $registry->changeDirectory('configuration');

+            $registry->changeDirectory('SSE');

+            $this->refreshFrequency = $registry->getValue('refreshFrequency', 3);

+        }

+        return $this->refreshFrequency;

+    }

         

     private function getSSEData()

     {

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
  */

 

 

-require_once dirname(__FILE__) . '/controller.class.php';

+require_once dirname(__FILE__).'/controller.class.php';

 

 

 /**

@@ -39,7 +39,7 @@ 
     {

         session_write_close();

         

-        header("Content-Type: text/event-stream");header('Cache-Control: no-cache');

+        header("Content-Type: text/event-stream"); header('Cache-Control: no-cache');

         header('Connection: keep-alive');

         header('X-Accel-Buffering: no');

         

@@ -47,10 +47,10 @@ 
         

         while (1) {

             $data = $this->getSSEData();

-            if($data != '{}'){

+            if ($data != '{}') {

                 echo "event: ping\n";

                 echo "\n\n";

-                echo 'data: ' . $this->getSSEData() . "\n\n";

+                echo 'data: '.$this->getSSEData()."\n\n";

             }        

             ob_end_flush();

             flush();

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

 	private function getRefreshFrequency()

 	{

-	    if(!isset($this->refreshFrequency)){

+	    if (!isset($this->refreshFrequency)) {

 	        $registry = app_getRegistry();

 	        $registry->changeDirectory('configuration');

 	        $registry->changeDirectory('SSE');

@@ -79,7 +79,7 @@ 
     

     private function getCurrentUser()

     {

-        if(isset($this->currentUser)){

+        if (isset($this->currentUser)) {

             return $this->currentUser;

         }

         

programs/customcontainer.ctrl.php

Spacing +33 added lines, -33 removed lines

@@ -22,7 +22,7 @@ 
  */

 

 

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

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

 

 

 /**

@@ -58,7 +58,7 @@ 
         foreach ($allViewSections as $viewSection) {

             $fields = $viewSection->getFields();

             foreach ($fields as $field) {

-                $allViewFieldNames[$field['fieldname']] = $viewSection->view . ',' . $viewSection->rank . ',' . $viewSection->id;

+                $allViewFieldNames[$field['fieldname']] = $viewSection->view.','.$viewSection->rank.','.$viewSection->id;

             }

         }

 

@@ -81,7 +81,7 @@ 
         bab_Sort::asort($availableFields, 'description', bab_Sort::CASE_INSENSITIVE);

 

         foreach ($availableFields as $field) {

-            $fieldName =  $field['name'];

+            $fieldName = $field['name'];

             $fieldDescription = $field['description'];

 

             $used = isset($allViewFieldNames[$fieldName]);

@@ -388,10 +388,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';

@@ -415,16 +415,16 @@ 
                 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;

@@ -433,14 +433,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;

@@ -485,7 +485,7 @@ 
     protected function preSave(ORM_Record $record, $data)

     {

         parent::preSave($record, $data);

-        if(!isset($record->id) || empty($record->id)){

+        if (!isset($record->id) || empty($record->id)) {

             $set = $record->getParentSet();

             $nbContainers = $set->select(

                 $set->all(

@@ -525,10 +525,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';

@@ -539,14 +539,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());

@@ -554,7 +554,7 @@ 
                 

                 $visibilityCriteria = '';

                 

-                if($foreignSet){

+                if ($foreignSet) {

                     $selectedManyField = $foreignSet->$selectedField;

                     

                     if ($selectedManyField instanceof ORM_BoolInterface) {

@@ -574,9 +574,9 @@ 
             }

             

             $oneRelations = $objectRecordSet->getHasOneRelations();

-            foreach($oneRelations as $oneRelation){

+            foreach ($oneRelations as $oneRelation) {

                 /* @var $oneRelation ORM_OneRelation*/

-                if($selectedRelation != $oneRelation->getOwnerSetFieldName()){

+                if ($selectedRelation != $oneRelation->getOwnerSetFieldName()) {

                     continue;

                 }

                 $foreignSetClassName = $oneRelation->getForeignSetClassName();

@@ -585,7 +585,7 @@ 
                 

                 $visibilityCriteria = '';

                 

-                if($foreignSet){

+                if ($foreignSet) {

                     $selectedOneField = $foreignSet->$selectedField;

                     

                     if ($selectedOneField instanceof ORM_BoolInterface) {

@@ -600,7 +600,7 @@ 
                 break;

             }

         }

-        else{

+        else {

             

             $field = $objectRecordSet->$field;

             

@@ -612,7 +612,7 @@ 
             

             $visibilityCriteria = '';

             

-            if(!empty($condition)){

+            if (!empty($condition)) {

                 $criteria = $field->{$condition}($data['value']);

                 $visibilityCriteria = $criteria->toJson();

             }

@@ -686,7 +686,7 @@ 
             $menu->setSizePolicy(Func_Icons::ICON_LEFT_16);

             

             $hasVisibilityBox = $W->FlowItems()->addClass('widget-100');

-            if(!empty($customContainer->visibilityCriteria)){

+            if (!empty($customContainer->visibilityCriteria)) {

                 $hasVisibilityBox->addItem(

                     $W->HBoxItems(

                         $W->Label($App->translate('This container has a visibility condition'))

@@ -751,7 +751,7 @@ 
             $customSections = $customSectionSet->select(

                 $customSectionSet->container->is($customContainer->id)

             );

-            foreach ($customSections as $customSection){

+            foreach ($customSections as $customSection) {

                 $customSectionValues = $customSection->getValues();

                 unset($customSectionValues['id']);

                 unset($customSectionValues['uuid']);

@@ -770,7 +770,7 @@ 
         }

 

         header('Content-type: application/json');

-        header('Content-Disposition: attachment; filename="' . $object . '.' . ($view === '' ? 'default' : $view) . '.json"'."\n");

+        header('Content-Disposition: attachment; filename="'.$object.'.'.($view === '' ? 'default' : $view).'.json"'."\n");

 

         $json = bab_json_encode($containersValues);

         $json = bab_convertStringFromDatabase($json, bab_charset::UTF_8);

@@ -875,7 +875,7 @@ 
             $customContainer->object = $object;

             $customContainer->view = $view;

             $customContainer->save();

-            foreach ($containerValues['customSections'] as $sectionValues){

+            foreach ($containerValues['customSections'] as $sectionValues) {

                 $customSection = $customSectionSet->newRecord();

                 $sectionValues['fields'] = json_encode($sectionValues['fields']);

                 $customSection->setValues($sectionValues);

Braces +1 added lines, -2 removed lines

@@ -599,8 +599,7 @@
                 }

                 break;

             }

-        }

-        else{

+        } else{

             

             $field = $objectRecordSet->$field;

             

programs/record.class.php

Spacing +12 added lines, -12 removed lines

@@ -191,7 +191,7 @@ 
     {
         $App = $this->App();
 
-        $customFieldSet= $App->CustomFieldSet();
+        $customFieldSet = $App->CustomFieldSet();
         $object = mb_substr(get_class($this), mb_strlen($App->classPrefix), -mb_strlen('Set'));
 
         $customFields = $customFieldSet->select($customFieldSet->object->is($object));
@@ -319,7 +319,7 @@ 
         $recordClassName = $this->getRecordClassName();
         $linkSet->hasOne('sourceId', $recordClassName);
 
-        $criteria =	$linkSet->targetClass->is($target->getClassName())
+        $criteria = $linkSet->targetClass->is($target->getClassName())
             ->_AND_($linkSet->targetId->is($target->id))
             ->_AND_($linkSet->sourceClass->is($this->newRecord()->getClassName()));
         if (isset($linkType)) {
@@ -351,7 +351,7 @@ 
         $recordClassName = $this->getRecordClassName();
         $linkSet->hasOne('targetId', $recordClassName);
         
-        $criteria =	$linkSet->sourceClass->is($source->getClassName())
+        $criteria = $linkSet->sourceClass->is($source->getClassName())
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($this->newRecord()->getClassName()));
         if (isset($linkType)) {
@@ -397,7 +397,7 @@ 
             $sourcesCriteria[] = $linkSet->sourceClass->is($sourceClass)->_AND_($linkSet->sourceId->in($sourceIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is($this->newRecord()->getClassName()),
             $linkSet->any($sourcesCriteria)
         );
@@ -444,7 +444,7 @@ 
             $targetsCriteria[] = $linkSet->targetClass->is($targetClass)->_AND_($linkSet->targetId->in($targetIds));
         }
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->sourceClass->is($this->newRecord()->getClassName()),
             $linkSet->any($targetsCriteria)
         );
@@ -599,7 +599,7 @@ 
     {
         $fields = $this->getFields();
         $manyRelations = $this->getHasManyRelations();
-        foreach ($manyRelations as $fieldName => $manyRelation){
+        foreach ($manyRelations as $fieldName => $manyRelation) {
             $fields[$fieldName] = $manyRelation;
         }
         return $fields;
@@ -691,7 +691,7 @@ 
         $App = $this->App();
         $rClass = new ReflectionClass(get_class($this));
         $component = $App->getComponentByName($rClass->getShortName());
-        if(isset($component)){
+        if (isset($component)) {
             return $component->getRecordClassName();
 //             list(, $classname) = explode('_', $component->getRecordClassName());
 //             return $classname;
@@ -712,7 +712,7 @@ 
             throw new app_Exception('Trying to get the reference string of a record without an id.');
         }
         $classname = $this->getClassName();
-        return $classname . ':' . $this->id;
+        return $classname.':'.$this->id;
     }
 
 
@@ -955,7 +955,7 @@ 
         $App = $this->App();
         $linkSet = $App->LinkSet();
 
-        $criteria =	$linkSet->sourceClass->is($source->getClassName())
+        $criteria = $linkSet->sourceClass->is($source->getClassName())
         ->_AND_($linkSet->sourceId->is($source->id))
         ->_AND_($linkSet->targetClass->is($this->getClassName()))
         ->_AND_($linkSet->targetId->is($this->id));
@@ -986,7 +986,7 @@ 
         $App = $this->App();
         $linkSet = $App->LinkSet();
 
-        $criteria =	$linkSet->all(
+        $criteria = $linkSet->all(
             $linkSet->targetClass->is($target->getClassName()),
             $linkSet->targetId->is($target->id),
             $linkSet->sourceClass->is($this->getClassName()),
@@ -1081,13 +1081,13 @@ 
      */
     protected function importDate($name, $value)
     {
-        if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/',$value)) {
+        if (preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}/', $value)) {
             return $this->importProperty($name, $value);
         }
 
         // try in DD/MM/YYYY format
 
-        if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/',$value, $matches)) {
+        if (preg_match('/(?P<day>[0-9]+)\/(?P<month>[0-9]+)\/(?P<year>[0-9]{2,4})/', $value, $matches)) {
 
             $value = sprintf('%04d-%02d-%02d', (int) $matches['year'], (int) $matches['month'], (int) $matches['day']);