Changeset 7792 for trunk

Timestamp:

01/24/13 15:27:55 (12 years ago)

Author:

cristiano

Message:

Ticket #3324 - Eventos criados no modulo ExpressoCalendar? nao estao sendo criados no Thunderbird

Location:

trunk/prototype

Files:

• modules/calendar/interceptors/DAViCalAdapter.php (modified) (2 diffs)
• plugins/icalcreator/iCalcreator.class.php (modified) (3 diffs)
• services/iCal.php (modified) (4 diffs)

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

@@ -206 +206 @@
         {  
             $args =  Controller::parse( array( 'service' => 'iCal' ) , $data , $params);
-            ob_start();                     
+            ob_start();
             include ROOTPATH.'/Sync.php';
             ob_end_clean();
@@ -236 +236 @@
             require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php';
             
-            $vcalendar = new vcalendar( );
+            $vcalendar = new icalCreatorVcalendar( );
             $vcalendar->parse($data); 
             $vcalendar->sort();

trunk/prototype/plugins/icalcreator/iCalcreator.class.php

@@ -55 +55 @@
  * @since 2.9.6 - 2011-05-14
  */
-class vcalendar {
+class icalCreatorVcalendar {
             //  calendar property variables
   var $calscale;
@@ -88 +88 @@
  * @return void
  */
-  function vcalendar ( $config = array()) {
+  function icalCreatorVcalendar ( $config = array()) {
     $this->_makeVersion();
     $this->calscale   = null;
@@ -9836 +9836 @@
  */
 function & XML2iCal( $xmlobj, $iCalcfg=array()) {
-  $iCal = new vcalendar( $iCalcfg );
+  $iCal = new icalCreatorVcalendar( $iCalcfg );
   foreach( $xmlobj->children() as $icalendar ) { // vcalendar
     foreach( $icalendar->children() as $calPart ) { // calendar properties and components

trunk/prototype/services/iCal.php

@@ -31 +31 @@
     protected function createIcal($data, $params = false )
     {
-        $ical = new vcalendar();
+        $ical = new icalCreatorVcalendar();
                 $ical->setProperty('method', isset($params['method']) ? $params['method'] : 'PUBLISH' );
 
@@ -264 +264 @@
     protected function createCompatibleIcal($data, $params = false )
     {
-        $ical = new vcalendar();
+        $ical = new icalCreatorVcalendar();
                 $ical->setProperty('method', isset($params['method']) ? $params['method'] : 'PUBLISH' );
 
@@ -534 +534 @@
     public function parse($data, $params = false) {
         Config::regSet('noAlarm', TRUE); //Evita o envio de notificação
-        $vcalendar = new vcalendar( );
+        $vcalendar = new icalCreatorVcalendar( );
+
         $vcalendar->parse(trim($data));
         $vcalendar->sort();
@@ -1194 +1195 @@
 
     public function analize($data, $params = false) {
-        $vcalendar = new vcalendar( );
+        $vcalendar = new icalCreatorVcalendar( );
         $vcalendar->parse(trim($data));
         $vcalendar->sort();