X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fabook_local_file.php;h=379271009e239bd87bada20dcd9607168eb42692;hb=920c9b9b93a85d48e3c194e8ca8c67fed63466e4;hp=b9f93a78dbdda097990c8940b8833d0f5507ab2f;hpb=82d304a0501324b276cabab1870755d5352bd21c;p=squirrelmail.git diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php index b9f93a78..37927100 100644 --- a/functions/abook_local_file.php +++ b/functions/abook_local_file.php @@ -18,8 +18,9 @@ * NOTE. This class should not be used directly. Use the * "AddressBook" class instead. * - * $Id$ + * @version $Id$ * @package squirrelmail + * @subpackage addressbook */ /** @@ -151,8 +152,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]); } - $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")); } } @@ -286,17 +287,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 */