Changeset 2316


Ignore:
Timestamp:
03/22/10 10:12:28 (14 years ago)
Author:
amuller
Message:

Ticket #535 - Correção de bug do commit anterior neste arquivo

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/expressoMail1_2/inc/class.phpmailer.php

    r2295 r2316  
    13341334                $filename = $this->EncodeFile($path, $encoding); 
    13351335                $handle = fopen($filename,'r'); 
    1336                 $mime[] = fread($handle, filesize($filename));;         
     1336                $mime[] = fread($handle, filesize($filename));;         
     1337                exec("rm -f ".escapeshellcmd(escapeshellarg($filename))); 
    13371338                if($this->IsError()) { return ""; } 
    13381339                $mime[] = $this->LE.$this->LE; 
     
    13601361        set_magic_quotes_runtime(0); 
    13611362 
    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"; 
    13631364        $fh2 = fopen($nameOut, 'wb'); 
    1364         if ($encoding != 'base64') 
     1365        if ($encoding != "" && $encoding != 'base64') 
    13651366        { 
    1366                 return false; 
    13671367                $file_buffer = fread($fh, filesize($path)); 
    13681368                $file_buffer = $this->EncodeString($file_buffer, $encoding); 
     
    13711371        else 
    13721372        { 
    1373  
    13741373                $cache = ''; 
    13751374                $eof = false; 
Note: See TracChangeset for help on using the changeset viewer.