Changeset 5481

Timestamp:

02/06/12 17:06:01 (11 years ago)

Author:

cristiano

Message:

Ticket #2434 - Nome de função invalida no DavicalAdapter?

Location:

trunk/prototype

Files:

• modules/calendar/interceptors/DAViCalAdapter.php (modified) (2 diffs)
• services/iCal.php (modified) (1 diff)

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

@@ -235 +235 @@
         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' ));
          
         $events = $cal->GetCollectionETags($url) ;
@@ -242 +242 @@
         {
             $cal->DoGETRequest($ie);
-            $sync =  Controller::parse( array( 'service' => 'iCal' ) , $cal->GetResponseBody() , array('calendar' => $calendar , 'owner' => $_SESSION['wallet']['user']['uidNumber']));
-            $args = array_merge($args , $sync);
-        }
-          
+            $sync =  Controller::parse( array( 'service' => 'iCal' ) , $cal->GetResponseBody() , array('calendar' => $calendar , 'owner' => Config::me( 'uidNumber' )));
+            
+            if( is_array( $sync ) )
+                $args = array_merge( $args , $sync );
+        }
+        
         include ROOTPATH.'/Sync.php';
         ob_end_clean();

trunk/prototype/services/iCal.php

@@ -123 +123 @@
                          case 'PUBLISH':            
                              if( !$schedulable = self::_getSchedulable($uid))
-                                  $interation['schedulable://'.mt_rand().'(Formatter)'] = self::_makeCreateVEVENT($component);
+                                    $interation = self::_makeVEVENT($schedulable , $component , $params);
                                break;