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 b9f93a78dbdda097990c8940b8833d0f5507ab2f..72c7932b018c0b6b217726c2df87fdbcca769488 100644 (file)
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -151,8 +151,8 @@ class abook_local_file extends addressbook_backend {
                 for($j = 0, $cnt_part=count($rows[$i]) ; $j < $cnt_part ; $j++) {
                     $rows[$i][$j] = $this->quotevalue($rows[$i][$j]);
                 }
                 for($j = 0, $cnt_part=count($rows[$i]) ; $j < $cnt_part ; $j++) {
                     $rows[$i][$j] = $this->quotevalue($rows[$i][$j]);
                 }

-                $tmpwrite = @fwrite($newfh, join('|', $rows[$i]) . "\n");
-                if ($tmpwrite == -1) {
+                $tmpwrite = sq_fwrite($newfh, join('|', $rows[$i]) . "\n");
+                if ($tmpwrite === FALSE) {

                     return $this->set_error($this->filename . '.tmp:' . _("Write failed"));
                 }
             }
                     return $this->set_error($this->filename . '.tmp:' . _("Write failed"));
                 }
             }


@@ -286,17 +286,19 @@ class abook_local_file extends addressbook_backend {
         }
   
         /* Write */
         }
   
         /* Write */

-        $r = fwrite($this->filehandle, $data);
+        $r = sq_fwrite($this->filehandle, $data);

   
         /* Unlock file */
         $this->unlock();
   
   
         /* 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 */
     }
 
     /* Delete address */