capwelton / libapp

programs/functions.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
     if (null === $url) {
         $script = '<script type="text/javascript">';
         if (isset($message)) {
-            $script .= 'alert("' . bab_toHtml($message, BAB_HTML_JS) . '");';
+            $script .= 'alert("'.bab_toHtml($message, BAB_HTML_JS).'");';
         }
         $script .= 'history.back();';
         $script .= '</script>';
@@ -124,7 +124,7 @@ 
         $url = $url->url();
     }
     if (!empty($babBody->msgerror)) {
-        $url .=  '&msgerror=' . urlencode($babBody->msgerror);
+        $url .= '&msgerror='.urlencode($babBody->msgerror);
     }
     if (isset($message)) {
         $lines = explode("\n", $message);
@@ -133,7 +133,7 @@ 
         }
     }
 
-    header('Location: ' . $url);
+    header('Location: '.$url);
     die;
 }
 
@@ -165,7 +165,7 @@ 
  */
 function app_fileUploadError($error)
 {
-    switch($error) {
+    switch ($error) {
         case UPLOAD_ERR_OK:
             return null;
 

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

Spacing +37 added lines, -37 removed lines

@@ -63,7 +63,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'),
@@ -80,7 +80,7 @@ 
      */
     public function getRawFields()
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return array();
         }
         return explode(',', $this->fields);
@@ -105,29 +105,29 @@ 
      */
     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 (json_last_error() === JSON_ERROR_NONE) {
             return $fields;
         }
         
         $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;
                 }
@@ -160,7 +160,7 @@ 
      */
     public function getField($searchedFieldName)
     {
-        if(empty($this->fields)){
+        if (empty($this->fields)) {
             return null;
         }
         
@@ -177,7 +177,7 @@ 
     public function addField($fieldName, $parameters = null)
     {
         $fields = $this->getFields();
-        if(! isset($parameters)){
+        if (!isset($parameters)) {
             $fields[$fieldName] = array(
                 'block' => ''
             );
@@ -211,24 +211,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' => ''
             );
@@ -243,11 +243,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' => ''
             );
@@ -281,15 +281,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' => ''
             );
@@ -309,7 +309,7 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
@@ -318,36 +318,36 @@ 
         
         $arrCriteria = json_decode($this->visibilityCriteria, true);
         
-        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);

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

Spacing +33 added lines, -33 removed lines

@@ -102,8 +102,8 @@ 
      */
     public function joinSource($sourceClass)
     {
-        if(! $this->sourceId instanceof $sourceClass){
-            $this->hasOne('sourceId', $sourceClass . 'Set');
+        if (!$this->sourceId instanceof $sourceClass) {
+            $this->hasOne('sourceId', $sourceClass.'Set');
             $this->join('sourceId');
         }
     }
@@ -113,8 +113,8 @@ 
      */
     public function joinTarget($targetClass = null)
     {
-        if(! $this->targetId instanceof $targetClass){
-            $this->hasOne('targetId', $targetClass . 'Set');
+        if (!$this->targetId instanceof $targetClass) {
+            $this->hasOne('targetId', $targetClass.'Set');
             $this->join('targetId');
         }
     }
@@ -162,21 +162,21 @@ 
     {
         $criteria = $this->sourceIs($object);
         
-        if(isset($targetClass)){
+        if (isset($targetClass)) {
             $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));
         }
         
@@ -191,24 +191,24 @@ 
         $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 (isset($targetClass)) {
             $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));
             }
         }
@@ -222,16 +222,16 @@ 
     {
         $criteria = $this->targetIs($object);
         
-        if(isset($sourceClass)){
+        if (isset($sourceClass)) {
             $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));
             }
         }
@@ -247,24 +247,24 @@ 
         $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 (isset($sourceClass)) {
             $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));
             }
         }
@@ -288,17 +288,17 @@ 
         
         $criteria = $set->sourceId->is($object->id)->_AND_($set->sourceClass->is($object->getClassName()));
         
-        if(null !== $targetClass){
+        if (null !== $targetClass) {
             $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
                 
@@ -326,11 +326,11 @@ 
             ->_AND_($this->sourceClass->is($source->getClassName()))
             ->_AND_($this->targetId->is($target->id))
             ->_AND_($this->targetClass->is($target->getClassName()));
-        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

Spacing +15 added lines, -15 removed lines

@@ -53,7 +53,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'),
@@ -70,7 +70,7 @@ 
      */
     public function isVisibleForRecord(AppRecord $record)
     {
-        if(empty($this->visibilityCriteria)){
+        if (empty($this->visibilityCriteria)) {
             return true;
         }
         
@@ -79,36 +79,36 @@ 
         
         $arrCriteria = json_decode($this->visibilityCriteria, true);
         
-        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);