Changeset 5907

Timestamp:

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

Author:

cristiano

Message:

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

Location:

trunk

Files:

• expressoAdmin1_2/inc/class.uishared_accounts.inc.php (modified) (2 diffs)
• expressoAdmin1_2/js/jscode/shared_accounts.js (modified) (2 diffs)
• expressoAdmin1_2/templates/default/shared_accounts_modal.tpl (modified) (1 diff)
• prototype/config/CalDAV.srv (modified) (1 diff)
• prototype/config/calendarToPermission.ini (modified) (1 diff)
• prototype/modules/calendar/interceptors/DAViCalAdapter.php (modified) (14 diffs)
• prototype/modules/calendar/interceptors/DBMapping.php (modified) (10 diffs)

trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -101 +101 @@
                         $p->set_var('modal_id', $modal_id);
                         
+                        $davicalConf = parse_ini_file( dirname(__FILE__)."/../../prototype/config/CalDAV.srv", true );  
                         $var = Array(
                             'mailquota' =>  $this->current_config['expressoAdmin_defaultSharedAccountQuota'],
@@ -108 +109 @@
                             'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
                             'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
-                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar'
-                        );
+                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar',
+                            'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : ''
+                          );
                         $p->set_var($var);
                         $shared_accounts_modal_tpl = $p->fp('out','shared_accounts_modal');

trunk/expressoAdmin1_2/js/jscode/shared_accounts.js

@@ -396 +396 @@
 
                 if(!!!sharemailbox.currentPemissions[sharedUser.id])
-                    DataLayer.put('calendarSignature', {
+                     DataLayer.put('calendarSignature', {
                         user: sharedUser.id,
                         calendar:  {
                             timezone: 'America/Sao_Paulo',
                             name: $('#cn').val(),
-                            location : $('#cn').val(),
+                            location : $('#sharedAccountsLocation').val() + '/' + $('#cn').val(),
                             description : $('#cn').val()
                             },
@@ -409 +409 @@
                         borderColor: 'eddb21'
                     });
-
+                  
                 var returns = function(data){
                     

trunk/expressoAdmin1_2/templates/default/shared_accounts_modal.tpl

@@ -47 +47 @@
                                                 
                 <td width="15%" valign="bottom" align="center" bgcolor="#DDDDDD" style="padding-bottom: 5px;">
+                    <input type="hidden" id="sharedAccountsLocation" value="{sharedAccountsLocation}" />
                     <table align="center" style="display: {aclCalendar}">
                         <tbody>

trunk/prototype/config/CalDAV.srv

@@ -1 +1 @@
 ;Url utilizada para acessar o serviço caldav
 url = ""
+;Conta do caldav onde fica armazenada as agendas de contas compartilhadas
+sharedAccountsLocation = "shareds"

trunk/prototype/config/calendarToPermission.ini

@@ -11 +11 @@
 deepnessFindCalendarShared = modules/calendar/interceptors/DBMapping.php
 
+[before.create]
+createCollectionACL = modules/calendar/interceptors/DAViCalAdapter.php
+
+[before.update]
+updateCollectionACL = modules/calendar/interceptors/DAViCalAdapter.php
+
+
 [PostgreSQL.mapping]
 id = id

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

@@ -1 +1 @@
 <?php
+require_once ROOTPATH.'/modules/calendar/constants.php';
 
 class DAViCalAdapter { 
@@ -29 +30 @@
             if($concept['concept'] === 'calendarToSchedulable')
             {
-                if(Config::module('useCaldav'))
+                if(Config::module('useCaldav' , 'expressoCalendar'))
                 {      
                     ob_start();
@@ -38 +39 @@
                         $calendar =  Controller::read( array( 'concept' => 'calendar' , 'id' => $calendarToschedulable['calendar'] ),array('timezone','name','location'));
                         $ical = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('defaultTZI' => $calendar['timezone']));          
-                        DAViCalAdapter::putIcal($ical , array('uid' => $schedulable['uid'] , 'collection' => $calendar['location'] ));
+                        DAViCalAdapter::putIcal($ical , array('uid' => $schedulable['uid'] , 'location' => $calendar['location'] ));
                     }
                     ob_end_clean();
@@ -47 +48 @@
     } 
     
+    public function createCollectionACL(&$uri ,&$params , &$criteria , $original)
+    {      
+        if( Config::module('useCaldav' , 'expressoCalendar') )
+        {
+            $calendar = Controller::read( array( 'concept' => 'calendar' , 'id' => $params['calendar'] ));
+            
+            if($params['user'] !== '0')
+            {
+                $user = Controller::read( array( 'concept' => 'user' , 'id' => $params['user'] ));
+                $xmUser =   '<D:href>'.Config::service( 'CalDAV' , 'url' ).'/'.$user['uid'].'/</D:href>';
+            }
+            else
+                $xmUser =   '<D:authenticated/>';
+
+            $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+                   <D:acl xmlns:D=\"DAV:\">
+                     <D:ace>
+                       <D:principal>
+                        ".$xmUser."
+                       </D:principal>
+                       <D:grant>
+                        ".self::acltToXML($params['acl'])."
+                       </D:grant>
+                     </D:ace>
+                    </D:acl>";  
+            
+            ob_start();
+            require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+            $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.$calendar['location'].'/', Config::me( 'uid' ), Config::me( 'password' ));
+            $cal->DoXMLRequest('ACL', $xml);
+            ob_end_clean();
+        }
+    }
+    
+    public function updateCollectionACL(&$uri ,&$params , &$criteria , $original)
+    {      
+        if( Config::module('useCaldav' , 'expressoCalendar') )
+        {    
+            $permision = Controller::read( array( 'concept' => 'calendarToPermission' , 'id' => $params['id'] ));
+            $calendar = Controller::read( array( 'concept' => 'calendar' , 'id' => $permision['calendar'] ));
+            
+            if($permision['user'] !== '0')
+            {
+                $user = Controller::read( array( 'concept' => 'user' , 'id' => $permision['user'] ));
+                $xmUser =   '<D:href>'.Config::service( 'CalDAV' , 'url' ).'/'.$user['uid'].'/</D:href>';
+            }
+            else
+                $xmUser =   '<D:authenticated/>';
+
+                $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+                       <D:acl xmlns:D=\"DAV:\">
+                         <D:ace>
+                           <D:principal>
+                            ".$xmUser."
+                           </D:principal>
+                           <D:grant>
+                            ".self::acltToXML($params['acl'])."
+                           </D:grant>
+                         </D:ace>
+                        </D:acl>";
+            
+            ob_start();
+            require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
+            $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.$calendar['location'].'/', Config::me( 'uid' ), Config::me( 'password' ));
+            $cal->DoXMLRequest('ACL', $xml);
+            ob_end_clean();
+            
+        }
+    }
+    
+    private static function acltToXML($acls)
+    {
+        $array = array();
+        $acls = str_split($acls);
+        
+        foreach ($acls as &$acl)
+            switch ($acl) 
+            {
+                case CALENDAR_ACL_WRITE:
+                    $array[] = "<D:privilege><D:bind/></D:privilege>";
+                    $array[] = "<D:privilege><D:write-properties/></D:privilege>";
+                    $array[] = "<D:privilege><D:write-content/></D:privilege>";
+                    $array[] = "<D:privilege><D:unlock/></D:privilege>";
+                    $array[] = "<D:privilege><D:schedule-deliver/></D:privilege>";
+                    $array[] = "<D:privilege><D:schedule-send/></D:privilege>";
+                    break;
+                case CALENDAR_ACL_READ:
+                    $array[] = "<D:privilege><D:read /></D:privilege>";
+                    $array[] = "<D:privilege><D:schedule-query-freebusy /></D:privilege>";
+                    $array[] = "<D:privilege><D:read-free-busy /></D:privilege>";
+                    break;
+                case CALENDAR_ACL_REMOVE:
+                    $array[] = "<D:privilege><D:unbind/></D:privilege>";
+                    break;
+                case CALENDAR_ACL_SHARED:
+                    $array[] = "<D:privilege><D:write-acl/></D:privilege>";
+                    $array[] = "<D:privilege><D:read-acl/></D:privilege>";
+                    $array[] = "<D:privilege><D:read-current-user-privilege-set/></D:privilege>";
+                    break;
+                case CALENDAR_ACL_BUSY:
+                    $array[] = "<D:privilege><D:schedule-query-freebusy/></D:privilege>";
+                    $array[] = "<D:privilege><D:read-free-busy/></D:privilege>";
+                    break;
+            }      
+        return implode("\n", $array);
+    }
     
     static function import($data , $params = false)
@@ -157 +264 @@
             
             if(!is_array(self::$deleted) || !in_array($event['uid'], self::$deleted))
-                self::deleteIcal($event['uid'] , array('uid' => $event['uid'] , 'collection' => $params['calendar'] ));
+                self::deleteIcal($event['uid'] , array('uid' => $event['uid'] , 'location' => $params['location'] ));
 
     }
@@ -165 +272 @@
       ob_start();
       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-      $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password'] );
-      $cal->DoPUTRequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );  
+      $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.$params['location'].'/', Config::me( 'uid' ), Config::me( 'password' ) );
+      $cal->DoPUTRequest( Config::service( 'CalDAV' , 'url' ).'/'.$params['location'].'/'.$params['uid'].'.ics', $data  );  
       ob_end_clean();
     }
@@ -174 +281 @@
        ob_start();
        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
-       $cal->DoDELETERequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$data.'.ics' );
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.$params['location'].'/', Config::me( 'uid' ), Config::me( 'password' ));
+       $cal->DoDELETERequest( Config::service( 'CalDAV' , 'url' ).'/'.$params['location'].'/'.$data.'.ics' );
        ob_end_clean();
     }
@@ -183 +290 @@
        ob_start();
        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';       
-       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/', Config::me( 'uid' ), Config::me( 'password' ));
        $cal->DoDELETERequest(Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$data.'/');
        ob_end_clean();
@@ -192 +299 @@
        ob_start();
        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);       
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), Config::me( 'password' ));       
        $cal->DoMOVERequest( $origem.'/' , $destination.'/' );
        ob_end_clean();
@@ -201 +308 @@
        ob_start();
        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);       
+       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/', Config::me( 'uid' ), Config::me( 'password' ));       
        ob_end_clean();
        return $cal->FindCalendars();
@@ -207 +314 @@
     
     static function mkcalendar($location , $name, $description )
-    {
+    {   
         ob_start();
         require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);
+        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/', Config::me( 'uid' ), Config::me( 'password' ));
  
         $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?>
@@ -227 +334 @@
           
           
-        $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$location.'/');
+        $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.$location.'/');
         ob_end_clean();
     }
@@ -235 +342 @@
         ob_start();
         require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), Config::me( 'password' ));
+        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/', Config::me( 'uid' ), Config::me( 'password' ));
          
         $events = $cal->GetCollectionETags($url) ;
@@ -251 +358 @@
         ob_end_clean();
     }
-
+    
 }
 

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'