Make writing to prefs/abook/calendar files more reliable by handling it

[squirrelmail.git] / functions / abook_local_file.php

diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index 9f7acf7a5bfaa2565bab00b86ecd1244c15cfc25..72c7932b018c0b6b217726c2df87fdbcca769488 100644 (file)
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -3,7 +3,7 @@
 /**
  * abook_local_file.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Backend for addressbook as a pipe separated file
@@ -19,8 +19,13 @@
  *       "AddressBook" class instead.
  *
  * $Id$
+ * @package squirrelmail
  */
 
+/**
+ * Store the addressbook in a local file
+ * @package squirrelmail
+ */
 class abook_local_file extends addressbook_backend {
     var $btype = 'local';
     var $bname = 'local_file';
@@ -135,21 +140,29 @@ class abook_local_file extends addressbook_backend {
      * NOTE! Previous locks are broken by this function */
     function overwrite(&$rows) {
         $this->unlock();
-        $newfh = @fopen($this->filename, 'w');
+        $newfh = @fopen($this->filename.'.tmp', 'w');
+
         if(!$newfh) {
-            return $this->set_error("$file: " . _("Open failed"));
+            return $this->set_error($this->filename. '.tmp:' . _("Open failed"));
         }
         
-        for($i = 0 ; $i < sizeof($rows) ; $i++) {
+        for($i = 0, $cnt=sizeof($rows) ; $i < $cnt ; $i++) {
             if(is_array($rows[$i])) {
-                for($j = 0 ; $j < count($rows[$i]) ; $j++) {
+                for($j = 0, $cnt_part=count($rows[$i]) ; $j < $cnt_part ; $j++) {
                     $rows[$i][$j] = $this->quotevalue($rows[$i][$j]);
                 }
-                fwrite($newfh, join('|', $rows[$i]) . "\n");
+                $tmpwrite = sq_fwrite($newfh, join('|', $rows[$i]) . "\n");
+                if ($tmpwrite === FALSE) {
+                    return $this->set_error($this->filename . '.tmp:' . _("Write failed"));
+                }
             }
         }       
 
         fclose($newfh);
+        if (!@copy($this->filename . '.tmp' , $this->filename)) {
+          return $this->set_error($this->filename . ':' . _("Unable to update"));
+        }
+        @unlink($this->filename . '.tmp');
         $this->unlock();
         $this->open(true);
         return true;
@@ -273,17 +286,19 @@ class abook_local_file extends addressbook_backend {
         }
   
         /* Write */
-        $r = fwrite($this->filehandle, $data);
+        $r = sq_fwrite($this->filehandle, $data);
   
         /* Unlock file */
         $this->unlock();
   
-        /* Test write result and exit if OK */
-        if($r > 0) return true;
+        /* Test write result */
+        if($r === FALSE) {
+               /* Fail */
+               $this->set_error(_("Write to addressbook failed"));
+               return FALSE;
+       }
   
-        /* Fail */
-        $this->set_error(_("Write to addressbook failed"));
-        return false;
+        return TRUE;
     }
 
     /* Delete address */
@@ -376,4 +391,4 @@ class abook_local_file extends addressbook_backend {
     }
 
 } /* End of class abook_local_file */
-?>
\ No newline at end of file
+?>