capwelton / libapp

programs/define.php

Spacing +6 added lines, -6 removed lines

@@ -21,9 +21,9 @@
  * @copyright Copyright (c) 2006 by CANTICO ({@link http://www.cantico.fr})

  */

 
-define('APP_PHP_PATH', dirname(__FILE__) . '/');

-define('APP_SET_PATH', dirname(__FILE__) . '/');

-define('APP_UI_PATH', dirname(__FILE__) . '/ui/');

-define('APP_WIDGETS_PATH', APP_UI_PATH . 'widgets/');

-define('APP_CTRL_PATH', dirname(__FILE__) . '/');
-define('APP_PORTLET_PATH', APP_PHP_PATH . 'portlet/');
\ No newline at end of file
+define('APP_PHP_PATH', dirname(__FILE__).'/');

+define('APP_SET_PATH', dirname(__FILE__).'/');

+define('APP_UI_PATH', dirname(__FILE__).'/ui/');

+define('APP_WIDGETS_PATH', APP_UI_PATH.'widgets/');

+define('APP_CTRL_PATH', dirname(__FILE__).'/');
+define('APP_PORTLET_PATH', APP_PHP_PATH.'portlet/');
\ No newline at end of file

programs/Set/AppCustomSectionSet.php

Spacing +2 added lines, -2 removed lines

@@ -109,9 +109,9 @@
     public function isUpdatable()
     {
         return $this->all();
-        if($this->App()
+        if ($this->App()
             ->Access()
-            ->administer()){
+            ->administer()) {
             return $this->all();
         }
         return $this->none();

programs/Set/AppCustomSection.php

Braces +4 added lines, -8 removed lines

@@ -123,8 +123,7 @@ 
             
             if(strpos($rawField, ':') === false){
                 $fieldName = $rawField;
-            }
-            else{
+            } else{
                 list ($fieldName, $parameters) = explode(':', $rawField);
                 $parameters = explode(';', $parameters);
                 foreach ($parameters as $parameter){
@@ -322,15 +321,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();
@@ -339,8 +336,7 @@ 
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
                             if($foreignFieldName === '_foreignField'){
                                 $foreignField = $foreignConditions;
-                            }
-                            else{
+                            } else{
                                 foreach ($foreignConditions as $key => $val){
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }

Spacing +45 added lines, -45 removed lines

@@ -68,7 +68,7 @@ 
         $App = app_App();
         static $fieldsLayouts = null;
         
-        if(! isset($fieldsLayouts)){
+        if (!isset($fieldsLayouts)) {
             $fieldsLayouts = array(
                 self::FIELDS_LAYOUT_VERTICAL_LABEL => $App->translate('Vertical label'),
                 self::FIELDS_LAYOUT_HORIZONTAL_LABEL => $App->translate('Horizontal label'),
@@ -85,7 +85,7 @@ 
      */
     public function getRawFields()
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return array();
         }
         return explode(',', $this->fields);
@@ -110,13 +110,13 @@ 
      */
     public function getFields()
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return array();
         }
         $fields = json_decode($this->fields, true);
         
-        if(json_last_error() === JSON_ERROR_NONE){
-            if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (json_last_error() === JSON_ERROR_NONE) {
+            if (bab_charset::getIso() != bab_charset::UTF_8) {
                 $fields = app_utf8Decode($fields);
             }
             return $fields;
@@ -124,19 +124,19 @@ 
         
         $fields = array();
         $rawFields = $this->getRawFields();
-        foreach ($rawFields as $rawField){
-            if(empty($rawField)){
+        foreach ($rawFields as $rawField) {
+            if (empty($rawField)) {
                 continue;
             }
             $params = array();
             
-            if(strpos($rawField, ':') === false){
+            if (strpos($rawField, ':') === false) {
                 $fieldName = $rawField;
             }
-            else{
+            else {
                 list ($fieldName, $parameters) = explode(':', $rawField);
                 $parameters = explode(';', $parameters);
-                foreach ($parameters as $parameter){
+                foreach ($parameters as $parameter) {
                     list ($key, $value) = explode('=', $parameter);
                     $params[$key] = $value;
                 }
@@ -169,7 +169,7 @@ 
      */
     public function getField($searchedFieldName)
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return null;
         }
         
@@ -186,7 +186,7 @@ 
     public function addField($fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$fieldName] = array(
                 'block' => ''
             );
@@ -194,7 +194,7 @@ 
         }
         $fields[$fieldName]['fieldname'] = $fieldName;
         $fields[$fieldName]['parameters'] = $parameters;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -208,7 +208,7 @@ 
     {
         $fields = $this->getFields();
         unset($fields[$removedFieldName]);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -226,24 +226,24 @@ 
     {
         $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])){
-                    $groupPos ++;
+        if (!isset($fields[$updatedFieldName])) {
+            if ($isFieldsGroup) {
+                while (isset($fields[$updatedFieldName.$groupPos])) {
+                    $groupPos++;
                 }
                 $updatedFieldName .= $groupPos;
             }
             $this->addField($updatedFieldName, $parameters);
             return $this;
         }
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$updatedFieldName] = array(
                 'block' => ''
             );
@@ -251,7 +251,7 @@ 
         }
         $fields[$updatedFieldName]['fieldname'] = $updatedFieldName;
         $fields[$updatedFieldName]['parameters'] = $parameters;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -261,11 +261,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' => ''
             );
@@ -274,7 +274,7 @@ 
         $groupFields[$fieldName]['fieldname'] = $fieldName;
         $groupFields[$fieldName]['parameters'] = $parameters;
         $fields[$fieldGroupName]['fields'] = $groupFields;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -288,7 +288,7 @@ 
     {
         $fields = $this->getFields();
         unset($fields[$fieldGroupName]['fields'][$removedFieldName]);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -305,15 +305,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' => ''
             );
@@ -323,7 +323,7 @@ 
         $groupFields[$updatedFieldName]['fieldname'] = $updatedFieldName;
         $groupFields[$updatedFieldName]['parameters'] = $parameters;
         $fields[$fieldGroupName]['fields'] = $groupFields;
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $fields = app_utf8Encode($fields);
         }
         $this->fields = json_encode($fields);
@@ -337,46 +337,46 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
         $App = \bab_functionality::get('App');
         $recordSet = $record->getParentSet();
         $arrCriteria = json_decode($this->visibilityCriteria, true);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $arrCriteria = app_utf8Decode($arrCriteria);
         }
-        foreach ($arrCriteria as $fieldName => $condition){
-            if(strpos($fieldName, '/') !== false){
+        foreach ($arrCriteria as $fieldName => $condition) {
+            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)){
+            foreach ($condition as $op => $value) {
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
-                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName) . 'Set';
+                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());
                     }
                     $criteria = $field->in($foreignCondition, $foreignField);

programs/Set/AppSSESet.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(AppSSE::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(AppSSE::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/Set/AppRecord.php

Braces +2 added lines, -4 removed lines

@@ -351,8 +351,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -379,8 +378,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }

Spacing +37 added lines, -37 removed lines

@@ -58,7 +58,7 @@ 
     {
         $value = $this->oParentSet->getBackend()->getRecordValue($this, $sFieldName);
         $field = $this->oParentSet->$sFieldName;
-        if(! is_null($value) && $field instanceof ORMFkField){
+        if (!is_null($value) && $field instanceof ORMFkField) {
             
             $sClassName = $field->getForeignSetName();
             
@@ -93,7 +93,7 @@ 
      */
     public function App()
     {
-        if(! isset($this->app)){
+        if (!isset($this->app)) {
             // If the app object was not specified (through the setApp() method),
             // we set it as parent set's App.
             $this->setApp($this->getParentSet()
@@ -114,7 +114,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;
@@ -130,11 +130,11 @@ 
      */
     public function getRef()
     {
-        if(! isset($this->id)){
+        if (!isset($this->id)) {
             throw new AppException('Trying to get the reference string of a record without an id.');
         }
         $classname = $this->getClassName();
-        return $classname . ':' . $this->id;
+        return $classname.':'.$this->id;
     }
     
     /**
@@ -161,7 +161,7 @@ 
     {
         $App = $this->App();
         
-        if(! isset($deletedStatus)){
+        if (!isset($deletedStatus)) {
             $deletedStatus = AppTraceableRecord::DELETED_STATUS_DELETED;
         }
         
@@ -173,7 +173,7 @@ 
         // referenced elements.
         $manyRelations = $set->getHasManyRelations();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -187,7 +187,7 @@ 
                     
                     $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
                     
-                    foreach ($foreignRecords as $foreignRecord){
+                    foreach ($foreignRecords as $foreignRecord) {
                         $foreignRecord->$foreignSetFieldName = 0;
                         $foreignRecord->save();
                     }
@@ -198,7 +198,7 @@ 
                     
                     $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
                     
-                    foreach ($foreignRecords as $foreignRecord){
+                    foreach ($foreignRecords as $foreignRecord) {
                         $foreignRecord->delete();
                     }
                     
@@ -244,7 +244,7 @@ 
         // referenced elements.
         $manyRelations = $set->getHasManyRelations();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -254,7 +254,7 @@ 
             // $foreignSet = new $foreignSetClassName($App);
             $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
             
-            foreach ($foreignRecords as $foreignRecord){
+            foreach ($foreignRecords as $foreignRecord) {
                 $foreignRecord->$foreignSetFieldName = $id;
                 $foreignRecord->save();
             }
@@ -267,7 +267,7 @@ 
         $links = $linkSet->select($linkSet->sourceClass->is($recordClassName)
             ->_AND_($linkSet->sourceId->is($recordId)));
         
-        foreach ($links as $link){
+        foreach ($links as $link) {
             $link->sourceId = $id;
             $link->save();
         }
@@ -275,7 +275,7 @@ 
         $links = $linkSet->select($linkSet->targetClass->is($recordClassName)
             ->_AND_($linkSet->targetId->is($recordId)));
         
-        foreach ($links as $link){
+        foreach ($links as $link) {
             $link->targetId = $id;
             $link->save();
         }
@@ -300,7 +300,7 @@ 
         
         $relatedRecords = array();
         
-        foreach ($manyRelations as $manyRelation){
+        foreach ($manyRelations as $manyRelation) {
             /* @var $manyRelation ORMManyRelation */
             
             $foreignSetClassName = $manyRelation->getForeignSetClassName();
@@ -311,7 +311,7 @@ 
             // $foreignSet = new $foreignSetClassName($App);
             $foreignRecords = $foreignSet->select($foreignSet->$foreignSetFieldName->is($recordId));
             
-            if($foreignRecords->count() > 0){
+            if ($foreignRecords->count() > 0) {
                 $relatedRecords[$foreignSetClassName] = $foreignRecords;
             }
         }
@@ -328,7 +328,7 @@ 
     {
         $path = $this->App()->uploadPath();
         
-        if(null === $path){
+        if (null === $path) {
             throw new \Exception('Missing upload path information');
             return null;
         }
@@ -348,12 +348,12 @@ 
         $linkSet = $App->LinkSet();
         
         $sourceClass = $source->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $targetClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         
         $targetClass = $this->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         
@@ -361,11 +361,11 @@ 
             ->_AND_($linkSet->sourceId->is($source->id))
             ->_AND_($linkSet->targetClass->is($targetClass))
             ->_AND_($linkSet->targetId->is($this->id));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -388,22 +388,22 @@ 
         $linkSet = $App->LinkSet();
         
         $sourceClass = $this->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $targetClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         
         $targetClass = $target->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         
         $criteria = $linkSet->all($linkSet->targetClass->is($targetClass), $linkSet->targetId->is($target->id), $linkSet->sourceClass->is($sourceClass), $linkSet->sourceId->is($this->id));
         
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($linkSet->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($linkSet->type->is($linkType));
             }
         }
@@ -465,7 +465,7 @@ 
      */
     protected function importProperty($name, $value)
     {
-        if(((string) $this->$name) !== ((string) $value)){
+        if (((string) $this->$name) !== ((string) $value)) {
             $this->$name = $value;
             return 1;
         }
@@ -485,13 +485,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']);
             
@@ -511,11 +511,11 @@ 
         $customContainers->groupBy($customContainerSet->view);
         
         $views = array();
-        foreach ($customContainers as $customContainer){
+        foreach ($customContainers as $customContainer) {
             $views[] = $customContainer->view;
         }
         
-        if(empty($views)){
+        if (empty($views)) {
             $views[] = '';
         }
         
@@ -599,9 +599,9 @@ 
      */
     public function requireReadable($message = null)
     {
-        if(! $this->isReadable()){
+        if (!$this->isReadable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);
@@ -617,9 +617,9 @@ 
      */
     public function requireUpdatable($message = null)
     {
-        if(! $this->isUpdatable()){
+        if (!$this->isUpdatable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);
@@ -635,9 +635,9 @@ 
      */
     public function requireDeletable($message = null)
     {
-        if(! $this->isDeletable()){
+        if (!$this->isDeletable()) {
             $App = $this->App();
-            if(! isset($message)){
+            if (!isset($message)) {
                 $message = $App->translate('Access denied');
             }
             throw new AppAccessException($message);

programs/Set/AppLink.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
     public function getSource()
     {
         $App = $this->App();
-        return $App->getRecordByRef($this->sourceClass . ':' . $this->sourceId);
+        return $App->getRecordByRef($this->sourceClass.':'.$this->sourceId);
     }
     
     /**
@@ -54,7 +54,7 @@ 
     public function getTarget()
     {
         $App = $this->App();
-        return $App->getRecordByRef($this->targetClass . ':' . $this->targetId);
+        return $App->getRecordByRef($this->targetClass.':'.$this->targetId);
     }
 }

 

programs/Set/AppNotificationSet.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     
     public function selectUserNotifications($user = null, $seen = false)
     {
-        if(! isset($user)){
+        if (!isset($user)) {
             $App = $this->App();
             $user = $App->getCurrentUser();
         }

programs/Set/AppLinkSet.php

Braces +5 added lines, -10 removed lines

@@ -170,8 +170,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($this->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -207,8 +206,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($this->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -230,8 +228,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($this->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -263,8 +260,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($this->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -329,8 +325,7 @@ 
         if(isset($linkType)){
             if(is_array($linkType)){
                 $criteria = $criteria->_AND_($this->type->in($linkType));
-            }
-            else{
+            } else{
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }

Spacing +46 added lines, -46 removed lines

@@ -91,11 +91,11 @@ 
     {
         $link = $this->newRecord();
         $sourceClass = $source->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         $targetClass = $target->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         $link->sourceClass = $sourceClass;
@@ -114,11 +114,11 @@ 
      */
     public function joinSource($sourceClass)
     {
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
-        if(! $this->sourceId instanceof $sourceClass){
-            $this->hasOne('sourceId', $sourceClass . 'Set');
+        if (!$this->sourceId instanceof $sourceClass) {
+            $this->hasOne('sourceId', $sourceClass.'Set');
             $this->join('sourceId');
         }
     }
@@ -128,11 +128,11 @@ 
      */
     public function joinTarget($targetClass = null)
     {
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
-        if(! $this->targetId instanceof $targetClass){
-            $this->hasOne('targetId', $targetClass . 'Set');
+        if (!$this->targetId instanceof $targetClass) {
+            $this->hasOne('targetId', $targetClass.'Set');
             $this->join('targetId');
         }
     }
@@ -143,7 +143,7 @@ 
      */
     public function sourceIsA($recordClass)
     {
-        if(strpos($recordClass, '\\')){
+        if (strpos($recordClass, '\\')) {
             $recordClass = (new \ReflectionClass($recordClass))->getShortName();
         }
         return $this->sourceClass->is($recordClass);
@@ -164,7 +164,7 @@ 
      */
     public function targetIsA($recordClass)
     {
-        if(strpos($recordClass, '\\')){
+        if (strpos($recordClass, '\\')) {
             $recordClass = (new \ReflectionClass($recordClass))->getShortName();
         }
         return $this->targetClass->is($recordClass);
@@ -187,24 +187,24 @@ 
         $criteria = $this->sourceIs($object);
         
         
-        if(isset($targetClass)){
-            if(strpos($targetClass, '\\')){
+        if (isset($targetClass)) {
+            if (strpos($targetClass, '\\')) {
                 $targetClass = (new \ReflectionClass($targetClass))->getShortName();
             }
             $this->joinTarget($targetClass);
             $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
         }
         
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($this->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
         
-        if(is_a($this->targetId, 'app_TraceableRecordSet')){
+        if (is_a($this->targetId, 'app_TraceableRecordSet')) {
             $criteria = $criteria->_AND_($this->targetId->deleted->is(false));
         }
         
@@ -219,27 +219,27 @@ 
         $sourceClass = null;
         $sourceIds = array();
         
-        foreach ($objects as $obj){
-            if(is_null($sourceClass)){
+        foreach ($objects as $obj) {
+            if (is_null($sourceClass)) {
                 $sourceClass = $obj->getClassName();
             }
             $sourceIds[] = $obj->id;
         }
         $criteria = $this->sourceId->in($sourceIds)->_AND_($this->sourceClass->is($sourceClass));
         
-        if(isset($targetClass)){
-            if(strpos($targetClass, '\\')){
+        if (isset($targetClass)) {
+            if (strpos($targetClass, '\\')) {
                 $targetClass = (new \ReflectionClass($targetClass))->getShortName();
             }
             $this->joinTarget($targetClass);
             $criteria = $criteria->_AND_($this->targetClass->is($targetClass));
         }
         
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($this->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -253,19 +253,19 @@ 
     {
         $criteria = $this->targetIs($object);
         
-        if(isset($sourceClass)){
-            if(strpos($sourceClass, '\\')){
+        if (isset($sourceClass)) {
+            if (strpos($sourceClass, '\\')) {
                 $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
             }
             $this->joinSource($sourceClass);
             $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
         }
         
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($this->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -281,27 +281,27 @@ 
         $targetClass = null;
         $targetIds = array();
         
-        foreach ($objects as $obj){
-            if(is_null($targetClass)){
+        foreach ($objects as $obj) {
+            if (is_null($targetClass)) {
                 $targetClass = $obj->getClassName();
             }
             $targetIds[] = $obj->id;
         }
         $criteria = $this->targetId->in($targetIds)->_AND_($this->targetClass->is($targetClass));
         
-        if(isset($sourceClass)){
-            if(strpos($sourceClass, '\\')){
+        if (isset($sourceClass)) {
+            if (strpos($sourceClass, '\\')) {
                 $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
             }
             $this->joinSource($sourceClass);
             $criteria = $criteria->_AND_($this->sourceClass->is($sourceClass));
         }
         
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($this->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }
@@ -325,20 +325,20 @@ 
         
         $criteria = $set->sourceId->is($object->id)->_AND_($set->sourceClass->is($object->getClassName()));
         
-        if(null !== $targetClass){
-            if(strpos($targetClass, '\\')){
+        if (null !== $targetClass) {
+            if (strpos($targetClass, '\\')) {
                 $targetClass = (new \ReflectionClass($targetClass))->getShortName();
             }
             $criteria = $criteria->_AND_($set->targetClass->is($targetClass));
         }
-        if(null !== $linkType){
+        if (null !== $linkType) {
             $criteria = $criteria->_AND_($set->type->is($linkType));
         }
         
-        if($deleteTarget){
-            foreach ($set->select($criteria) as $link){
+        if ($deleteTarget) {
+            foreach ($set->select($criteria) as $link) {
                 
-                $className = $link->targetClass . 'Set';
+                $className = $link->targetClass.'Set';
                 
                 // remove prefix
                 
@@ -363,22 +363,22 @@ 
     public function deleteLink($source, $target, $linkType = null)
     {
         $sourceClass = $source->getClassName();
-        if(strpos($sourceClass, '\\')){
+        if (strpos($sourceClass, '\\')) {
             $sourceClass = (new \ReflectionClass($sourceClass))->getShortName();
         }
         $targetClass = $target->getClassName();
-        if(strpos($targetClass, '\\')){
+        if (strpos($targetClass, '\\')) {
             $targetClass = (new \ReflectionClass($targetClass))->getShortName();
         }
         $criteria = $this->sourceId->is($source->id)
             ->_AND_($this->sourceClass->is($sourceClass))
             ->_AND_($this->targetId->is($target->id))
             ->_AND_($this->targetClass->is($targetClass));
-        if(isset($linkType)){
-            if(is_array($linkType)){
+        if (isset($linkType)) {
+            if (is_array($linkType)) {
                 $criteria = $criteria->_AND_($this->type->in($linkType));
             }
-            else{
+            else {
                 $criteria = $criteria->_AND_($this->type->is($linkType));
             }
         }

programs/Set/AppCustomContainer.php

Braces +3 added lines, -6 removed lines

@@ -83,15 +83,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();
@@ -100,8 +98,7 @@ 
                         foreach ($foreignValues as $foreignFieldName => $foreignConditions){
                             if($foreignFieldName === '_foreignField'){
                                 $foreignField = $foreignConditions;
-                            }
-                            else{
+                            } else{
                                 foreach ($foreignConditions as $key => $val){
                                     $foreignCondition = $foreignSet->$foreignFieldName->$key($val);
                                 }

Spacing +16 added lines, -16 removed lines

@@ -56,7 +56,7 @@ 
     {
         static $layouts = null;
         
-        if(! isset($layouts)){
+        if (!isset($layouts)) {
             $layouts = array(
                 self::LAYOUT_VERTICAL_BOX => app_translate('Vertical box'),
                 self::LAYOUT_HORIZONTAL_BOX => app_translate('Horizontal box'),
@@ -73,7 +73,7 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
@@ -81,39 +81,39 @@ 
         $recordSet = $record->getParentSet();
         
         $arrCriteria = json_decode($this->visibilityCriteria, true);
-        if(bab_charset::getIso() != bab_charset::UTF_8){
+        if (bab_charset::getIso() != bab_charset::UTF_8) {
             $arrCriteria = app_utf8Encode($arrCriteria);
         }
-        foreach ($arrCriteria as $fieldName => $condition){
-            if(strpos($fieldName, '/') !== false){
+        foreach ($arrCriteria as $fieldName => $condition) {
+            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)){
+            foreach ($condition as $op => $value) {
+                if (!is_array($value)) {
                     $criteria = $field->$op($value);
                 }
-                else{
-                    foreach ($value as $foreignClassName => $foreignValues){
-                        $foreignClassName = str_replace($App->classPrefix, '', $foreignClassName) . 'Set';
+                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());
                     }
                     $criteria = $field->in($foreignCondition, $foreignField);