[Phpgroupware-cvs] calendar/inc class.boicalendar.inc.php,1.30

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: MAIN
            class.boicalendar.inc.php lines: +15 -13

Log Message:
merge from stable

====================================================
Index: calendar/inc/class.boicalendar.inc.php
diff -u calendar/inc/class.boicalendar.inc.php:1.29 
calendar/inc/class.boicalendar.inc.php:1.30
--- calendar/inc/class.boicalendar.inc.php:1.29 Thu Dec  8 12:18:08 2005
+++ calendar/inc/class.boicalendar.inc.php      Fri Dec  9 00:32:20 2005
@@ -807,6 +807,15 @@
                                        'contact'               => True
                                )
                        ),
+                       'freq'          => Array(
+                               'type'          => 'function',
+                               'function'      => 'switch_freq',
+                               'quoted'                => False,
+                               'to_text'       => False,
+                               'properties'    => Array(
+                                       'rrule'                 => True
+                               )
+                       ),
                        'byday'         => Array(
                                'type'          => 'text',
                                'quoted'                => False,
@@ -994,15 +1003,6 @@
                                        'attach'                        => True
                                )
                        ),
-                       'freq'          => Array(
-                               'type'          => 'function',
-                               'function'      => 'switch_freq',
-                               'quoted'                => False,
-                               'to_text'       => False,
-                               'properties'    => Array(
-                                       'rrule'                 => True
-                               )
-                       ),
                        'interval'              => Array(
                                'type'          => 'integer',
                                'quoted'                => False,
@@ -1634,6 +1634,9 @@
                                                        $this->debug($key.' 
Function Param : '.$value);
                                                        $str .= 
$quote.$this->$function($value).$quote;
                                                        break;
+                                               case 'integer':
+                                                       $str .= ';' . 
strtoupper($key) . "=$value";
+                                                       break;
                                                case 'text':
                                                case 'string':
                                                        $str .= 
';'.strtoupper($key).'='.$quote.$value.$quote;
@@ -3418,11 +3421,10 @@
                                        }
                                        
$this->parse_value($ical_event,'rrule',$str,'vevent');

-                                       $exceptions = $event['recur_exception'];
+                                       $exceptions =& 
$event['recur_exception'];
                                        if(is_array($exceptions))
                                        {
-                                               @reset($exceptions);
-                                               
while(list($key,$except_datetime) = each($exceptions))
+                                               foreach ( $exceptions as $key 
=> $except_datetime )
                                                {
                                                        $ical_event['exdate'][] 
= $this->switch_date(date('Ymd\THis\Z',$except_datetime));
                                                }