Changeset 5366 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

01/11/12 16:42:50 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Inclusão do novo módulo de agenda no ambiente trunk

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -683 +683 @@
        
         $newCriteria = $original['criteria'];
-        
-        $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', $_SESSION['wallet']['user']['uidNumber']) );        
-        $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria );
-        
-        if(is_array($externalUsers))
-        {
-            foreach ($externalUsers as $i => $v)
-                $externalUsers[$i]['isExternal'] = '1';
-        }
-        else
-            $externalUsers = array();
-        
-        if(!is_array($result))
-                $result = array();
-            
-        return array_merge($result, $externalUsers);    
+        $valid = true;
+        self::validExternalUserCriteria($newCriteria, self::$calendar_ex_participantMap, $valid);
+        if($valid == true)
+        {
+             $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', $_SESSION['wallet']['user']['uidNumber']) );        
+            $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria );
+
+            if(is_array($externalUsers))
+            {
+                foreach ($externalUsers as $i => $v)
+                    $externalUsers[$i]['isExternal'] = '1';
+            }
+            else
+                $externalUsers = array();
+
+            if(!is_array($result))
+                    $result = array();
+
+            return array_merge($result, $externalUsers);    
+        }
+       
     }
 
@@ -975 +980 @@
     }  
     
+    private static function validExternalUserCriteria( $filter, $map , &$ref )
+    {
+        if (!is_array($filter) || count($filter) <= 0)
+            return null;
+
+        $op = array_shift($filter);
+
+        if (is_array($filter[0])) {
+            foreach ($filter as $i => $f)
+                $filter[$i] = self::validExternalUserCriteria($f, $map ,$findCalendar );
+        }
+        else
+        {
+           if( isset($filter[0]) && !in_array($filter[0] , self::$calendar_ex_participantMap))
+             $ref = false;
+  
+            else
+                $filter[0] = isset($map[$filter[0]]) ? $map[$filter[0]] : $filter[0];
+        }
+
+        array_unshift($filter, $op);
+
+        return( $filter );
+    }
+    
     private static function schedulable2calendarToObject($Schedulable)
     {