From c7ecee3abaee0ea3888aa681b798fc5557b75f90 Mon Sep 17 00:00:00 2001 From: lbergman Date: Mon, 3 Jul 2000 14:44:49 +0000 Subject: [PATCH] Changed temp file write to from due to leftover file possiblity, At least they will all be in the same dir. Also clarified some instructions. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@583 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/addressbook_csvimport.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/addressbook_csvimport.php b/src/addressbook_csvimport.php index 2fa1af87..1b262d2c 100644 --- a/src/addressbook_csvimport.php +++ b/src/addressbook_csvimport.php @@ -81,7 +81,7 @@ if($flag <= 1) { // If first run of script, setup the filename to copy $tempfilename = ($username . (time()+2592000)); $nameholder = $tempfilename; - if(copy($smusercsv, "$data_dir$tempfilename")) { // Set up variable to use in printing status + if(copy($smusercsv, "$attachment_dir$tempfilename")) { // Set up variable to use in printing status $goodcopy = true; } else { $goodcopy = false; @@ -105,7 +105,7 @@ echo " \n"; echo " \n"; echo " "; - if(!$goodcopy && $flag == 0) { // print correct status of file copying + if(!$goodcopy && $flag == 0) { // print correct status of file copying echo _("Failed to create working copy, Please try again."); } else { echo _("Created working copy, continuing with process..."); @@ -157,9 +157,9 @@ // open the correct filename to work with if($flag <= 1) { // before submit - $fp = fopen("$data_dir$tempfilename", "r"); + $fp = fopen("$attachment_dir$tempfilename", "r"); } elseif($flag >= 2) { // after submit - $fp = fopen("$data_dir$nameholder", "r"); + $fp = fopen("$attachment_dir$nameholder", "r"); } echo "
\n"; // user's data table @@ -400,7 +400,7 @@ // Clean up after ourselves. if($finish) { - unlink ("$data_dir$tempfilename"); + unlink ("$attachment_dir$tempfilename"); } ?> -- 2.25.1