Changeset 5399 for trunk/prototype/modules/calendar/interceptors/DAViCalAdapter.php

Timestamp:

01/18/12 16:10:57 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - Alteração da estrutura de diretórios da nova API

Location:

trunk/prototype

Files:

• . (modified) (1 prop)
• modules/calendar/interceptors/DAViCalAdapter.php (modified) (12 diffs)

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

@@ -39 +39 @@
     
     static function import($data , $params = false)
-    {              
+    {                  
         $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$params['owner'])));  
         $params['owner'] = $user[0]['id'];
@@ -87 +87 @@
         if(isset($params['calendar']))
         { 
-            require_once ROOTPATH.'/app/plugins/icalcreator/iCalUtilityFunctions.class.php';
-            require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php';
+            require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php';
+            require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
             
             $vcalendar = new icalCreator( ); 
@@ -118 +118 @@
     
     static function move($origem , $destino , $owner)
-    {    
+    {  
         $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$owner)));  
         $owner = $user[0]['id'];
@@ -153 +153 @@
     {  
       ob_start();
-      require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-      $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password'] );
-      $cal->DoPUTRequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );  
+      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  );  
       ob_end_clean();
     }
@@ -162 +162 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
-       $cal->DoDELETERequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$data.'.ics' );
+       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' );
        ob_end_clean();
     }
@@ -171 +171 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
-       $cal->DoDELETERequest($_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$data.'/');
+       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->DoDELETERequest(Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$data.'/');
        ob_end_clean();
     }
@@ -180 +180 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);       
+       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->DoMOVERequest( $origem.'/' , $destination.'/' );
        ob_end_clean();
@@ -189 +189 @@
     {
        ob_start();
-       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);       
+       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']);       
        ob_end_clean();
        return $cal->FindCalendars();
@@ -198 +198 @@
     {
         ob_start();
-        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
+        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']);
  
         $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?>
@@ -216 +216 @@
           
           
-        $cal->DoXMLRequest('MKCALENDAR', $xml, $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$location.'/');
+        $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$location.'/');
         ob_end_clean();
     }
@@ -223 +223 @@
     {
         ob_start();
-        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php';
-        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);
+        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']);
          
         $events = $cal->GetCollectionETags($url) ;
@@ -234 +234 @@
             $args = array_merge($args , $sync);
         }
-           
-        
+          
         include ROOTPATH.'/Sync.php';
         ob_end_clean();