This is Philippe Mingo

[squirrelmail.git] / plugins / calendar / calendar_data.php

diff --git a/plugins/calendar/calendar_data.php b/plugins/calendar/calendar_data.php
index 737537ec112cdaa15f92c7b345d2f725e0b69642..7a2a455aacc4e5194653f7d4ad6d848c143ff961 100644 (file)
--- a/plugins/calendar/calendar_data.php
+++ b/plugins/calendar/calendar_data.php
@@ -1,5 +1,4 @@
-<?php /* Modified at 1 places by ri_once */ ?>
-<?php /* 'php' Added by ri_once */
+<?php
 /*
  *  calendar_data.php
  *
@@ -8,7 +7,7 @@
  *
  *  functions to operate on calendar data files.
  *
- *  18 Jan 2002 Adapted to official SM rules philippe@squirrelmail.org.
+ * $Id$
  */
 
 // this is array that contains all events
@@ -28,16 +27,17 @@ function readcalendardata() {
 
     if (file_exists($filename)){
         $fp = fopen ($filename,'r');
-    }
-    if ($fp){
-        while ($fdata = fgetcsv ($fp, 4096, '|')) {
-            $calendardata[$fdata[0]][$fdata[1]] = array( 'length' => $fdata[2],
-                                                         'priority' => $fdata[3],
-                                                         'title' => $fdata[4],
-                                                         'message' => $fdata[5],
-                                                         'reminder' => $fdata[6] );
+
+        if ($fp){
+            while ($fdata = fgetcsv ($fp, 4096, '|')) {
+                $calendardata[$fdata[0]][$fdata[1]] = array( 'length' => $fdata[2],
+                                                            'priority' => $fdata[3],
+                                                            'title' => $fdata[4],
+                                                            'message' => $fdata[5],
+                                                            'reminder' => $fdata[6] );
+            }
+            fclose ($fp);
         }
-        fclose ($fp);
     }
 }
 
@@ -50,8 +50,8 @@ function writecalendardata() {
     $fp = fopen ($filetmp,"w");
     if ($fp) {
         while ( $calfoo = each ($calendardata)) {
-            while ( $calbar = each ($calfoo[value])) {
-                $calfoobar = $calendardata[$calfoo[key]][$calbar[key]];
+            while ( $calbar = each ($calfoo['value'])) {
+                $calfoobar = $calendardata[$calfoo['key']][$calbar['key']];
                 $calstr = "$calfoo[key]|$calbar[key]|$calfoobar[length]|$calfoobar[priority]|$calfoobar[title]|$calfoobar[message]|$calfoobar[reminder]\n";
                 fwrite($fp, $calstr, 4096);
             }
@@ -110,4 +110,4 @@ function update_event($date, $time) {
 }
 
 
-?>
+?>
\ No newline at end of file