Changeset 7219

Timestamp:

09/14/12 11:16:17 (12 years ago)

Author:

angelo

Message:

Ticket #3103 - Inconsistencia com a sincronizacao com davical

File:

• trunk/prototype/services/iCal.php (modified) (1 diff)

trunk/prototype/services/iCal.php

@@ -2005 +2005 @@
 
     static private function _existInMyCalendars($id, $owner) {
-        $sig = Controller::find(array('concept' => 'calendarSignature'), array('user', 'calendar', 'isOwner'), array('filter' =>  array('=', 'user', $owner)));
+        $sig = Controller::find(array('concept' => 'calendarSignature'), array('user', 'calendar', 'isOwner'), array('filter' => array('AND', array('=', 'isOwner', '1'), array('=', 'user', $owner))));
+        $sig2 = Controller::find(array('concept' => 'calendarToPermission'), array('calendar'), array('filter' => array('AND', array('*', 'acl', 'w'), array('=', 'user', $owner))));
+
         $calendars = array();
-        foreach ($sig as $val)
-            $calendars[] = $val['calendar'];
+        if(is_array($sig))
+                foreach ($sig as $val)
+                    $calendars[] = $val['calendar'];
+        if(is_array($sig2))
+                foreach ($sig2 as $val)
+                    $calendars[] = $val['calendar'];
+
 
         $return = Controller::find(array('concept' => 'calendarToSchedulable'), null, array('filter' => array('AND', array('IN', 'calendar', $calendars), array('=', 'schedulable', $id))));