projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed URL to download PHP. Closes 719873 - "Erata in INSTALL"
[squirrelmail.git]
/
functions
/
abook_local_file.php
diff --git
a/functions/abook_local_file.php
b/functions/abook_local_file.php
index 8b3198d29bd5709d102d800ab9324bc7f07a82b9..61b0e0ce1be5aae08cba7f6ef73f2ce5ea05a765 100644
(file)
--- a/
functions/abook_local_file.php
+++ b/
functions/abook_local_file.php
@@
-3,7
+3,7
@@
/**
* abook_local_file.php
*
/**
* abook_local_file.php
*
- * Copyright (c) 1999-200
2
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
3
The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Backend for addressbook as a pipe separated file
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Backend for addressbook as a pipe separated file
@@
-135,25
+135,29
@@
class abook_local_file extends addressbook_backend {
* NOTE! Previous locks are broken by this function */
function overwrite(&$rows) {
$this->unlock();
* NOTE! Previous locks are broken by this function */
function overwrite(&$rows) {
$this->unlock();
- $newfh = @fopen($this->filename .'.tmp', 'w');
+ $newfh = @fopen($this->filename.'.tmp', 'w');
+
if(!$newfh) {
if(!$newfh) {
- return $this->set_error($this->filename
.'.tmp: '
. _("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])) {
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]);
}
$rows[$i][$j] = $this->quotevalue($rows[$i][$j]);
}
- fwrite($newfh, join('|', $rows[$i]) . "\n");
+ $tmpwrite = @fwrite($newfh, join('|', $rows[$i]) . "\n");
+ if ($tmpwrite == -1) {
+ return $this->set_error($this->filename . '.tmp:' . _("Write failed"));
+ }
}
}
fclose($newfh);
if (!@copy($this->filename . '.tmp' , $this->filename)) {
}
}
fclose($newfh);
if (!@copy($this->filename . '.tmp' , $this->filename)) {
-
return $this->set_error($file->filename.
':' . _("Unable to update"));
+
return $this->set_error($this->filename .
':' . _("Unable to update"));
}
}
- @unlink(
$this->filename .
'.tmp');
+ @unlink(
$this->filename .
'.tmp');
$this->unlock();
$this->open(true);
return true;
$this->unlock();
$this->open(true);
return true;
@@
-380,4
+384,4
@@
class abook_local_file extends addressbook_backend {
}
} /* End of class abook_local_file */
}
} /* End of class abook_local_file */
-?>
+?>
\ No newline at end of file