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

Timestamp:

04/10/12 17:27:27 (12 years ago)

Author:

cristiano

Message:

Ticket #2606 - Syncronização das acls e compartilhamentos com caldav

File:

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

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

@@ -394 +394 @@
     static function putEvent(&$uri , &$result , &$criteria , $original)
     {          
-            if(Config::module('useCaldav')) //Ignorar Put dos eventos ja vindos do caldav
+            if(Config::module('useCaldav' , 'expressoCalendar')) //Ignorar Put dos eventos ja vindos do caldav
             {
                 require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
@@ -419 +419 @@
                 if( is_array($calendars) )
                     foreach ($calendars as $calendar)
-                        DAViCalAdapter::putIcal($ical , array('uid' => $event['uid'] , 'collection' => $calendar['calendar_location'] ));
+                        DAViCalAdapter::putIcal($ical , array('uid' => $event['uid'] , 'location' => $calendar['calendar_location'] ));
             }
     } 
@@ -426 +426 @@
     public function verifyCalendarLocation( &$uri , &$params , &$criteria , $original ){
         if(!isset($params['location']))
-            $params['location'] = $params['name'];
+            $params['location'] = Config::me('uid').'/'.$params['name'];
     } 
     
@@ -744 +744 @@
     public function deleteSchedulable( &$uri , &$params , &$criteria , $original ){
 
-       if(Config::module('useCaldav'))
+       if(Config::module('useCaldav' , 'expressoCalendar'))
             require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
 
         $calendarsToSchedulable = self::schedulable2calendarToObject($uri['id']);
         if( !self::ownerSchedulable($uri['id']) )
-        {
+        {           
              foreach ($calendarsToSchedulable as $i => $v)
              {
                    Controller::delete(array('concept' => 'calendarToSchedulable' , 'id' => $v['calendar_to_calendar_object']));
                    
-                   if(Config::module('useCaldav'))
-                        DAViCalAdapter::deleteEvent($uri['id'], array('calendar' => $v['calendar_name']));
+                   if(Config::module('useCaldav' , 'expressoCalendar'))
+                        DAViCalAdapter::deleteEvent($uri['id'], array('location' => $v['calendar_location']));
              }
              
@@ -768 +768 @@
             return false; /* Mata o restante da execução */
         } 
-        
-        if(Config::module('useCaldav'))
+                
+        if(Config::module('useCaldav' , 'expressoCalendar'))
             foreach ($calendarsToSchedulable as $i => $v)
-                DAViCalAdapter::deleteEvent($uri['id'], array('calendar' => $v['calendar_name']));
+                DAViCalAdapter::deleteEvent($uri['id'], array('location' => $v['calendar_location']));
 
      }
@@ -831 +831 @@
     {        
         
-        if( Config::module('useCaldav') )
+        if( Config::module('useCaldav' , 'expressoCalendar') )
         {
             require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
@@ -838 +838 @@
         }
         
-        if( Config::module('useCaldav') && is_array($calendario) && count($calendario) > 0)
+        if( Config::module('useCaldav' , 'expressoCalendar') && is_array($calendario) && count($calendario) > 0)
         {     
             foreach ($calendario as $i => $v)
@@ -930 +930 @@
 
     public function davcalCreateCollection( &$uri , &$params , &$criteria , $original ){        
-        if( Config::module('useCaldav') )
+        if( Config::module('useCaldav' , 'expressoCalendar') )
         {
            require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
-           DAViCalAdapter::mkcalendar($params['location'] , $params['name'], isset($params['description']) ? $params['description'] : '' );
+           DAViCalAdapter::mkcalendar($params['location'] , $params['name'], isset($params['description']) ? $params['description'] : '' );
         }
     }
     
    public function davcalDeleteCollection( &$uri , &$params , &$criteria , $original ){ 
-        if( Config::module('useCaldav') &&  Config::module('onRemoveCascadeCalDav'))
+        if( Config::module('useCaldav' , 'expressoCalendar') &&  Config::module('onRemoveCascadeCalDav'))
         {
            require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
@@ -947 +947 @@
         
    public function davcalUpdateCollection( &$uri , &$params , &$criteria , $original ){ 
-        if( Config::module('useCaldav') )
+        if( Config::module('useCaldav' , 'expressoCalendar') )
         {
            require_once ROOTPATH.'/modules/calendar/interceptors/DAViCalAdapter.php';
@@ -1020 +1020 @@
       return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_to_calendar_object.id as calendar_to_calendar_Object , calendar.name as calendar_name ,calendar.location as calendar_location, calendar.id as calendar_id FROM calendar_to_calendar_object , calendar , calendar_signature' 
                 .' WHERE calendar_signature.user_uidnumber = '.$_SESSION['wallet']['user']['uidNumber']
-                .' AND calendar_signature.is_owner = 1'
+          //      .' AND calendar_signature.is_owner = 1'
                 .' AND calendar_signature.calendar_id = calendar.id'
                 .' AND calendar_to_calendar_object.calendar_id = calendar.id'