Changeset 2316
- Timestamp:
- 03/22/10 10:12:28 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.phpmailer.php
r2295 r2316 1334 1334 $filename = $this->EncodeFile($path, $encoding); 1335 1335 $handle = fopen($filename,'r'); 1336 $mime[] = fread($handle, filesize($filename));; 1336 $mime[] = fread($handle, filesize($filename));; 1337 exec("rm -f ".escapeshellcmd(escapeshellarg($filename))); 1337 1338 if($this->IsError()) { return ""; } 1338 1339 $mime[] = $this->LE.$this->LE; … … 1360 1361 set_magic_quotes_runtime(0); 1361 1362 1362 $nameOut = ini_get("session.save_path").'/'."email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ]. ".base64";1363 $nameOut = ini_get("session.save_path").'/'."email_".$_SESSION[ 'phpgw_session' ][ 'session_id' ].base_convert(microtime(), 10, 36).".base64"; 1363 1364 $fh2 = fopen($nameOut, 'wb'); 1364 if ($encoding != 'base64')1365 if ($encoding != "" && $encoding != 'base64') 1365 1366 { 1366 return false;1367 1367 $file_buffer = fread($fh, filesize($path)); 1368 1368 $file_buffer = $this->EncodeString($file_buffer, $encoding); … … 1371 1371 else 1372 1372 { 1373 1374 1373 $cache = ''; 1375 1374 $eof = false;
Note: See TracChangeset
for help on using the changeset viewer.