- Fix problem with non-ascii attachment names in Mail_mime (#1485267, #1485...

alecpl

2008-09-25 09f19e675f3396a8a0f26fecd9b0501d19a4999f

 program/lib/Mail/mime.php

@@ -350,7 +350,7 @@
            $err = PEAR::raiseError($msg);
            return $err;
        }
        $filename = substr('s_'.basename($filename), 2);
        $filename = $this->_basename($filename);
        if (PEAR::isError($filedata)) {
            return $filedata;
        }
@@ -667,7 +667,7 @@

                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
                $this->_html_images[$key]['name'] = 
                    substr(basename('s_'.$this->_html_images[$key]['name']), 2);
                    $this->_basename($this->_html_images[$key]['name']);
            }
        }

@@ -1114,6 +1114,21 @@
        }
    }

    
    /**
     * Get file's basename (locale independent) 
     *
     * @param string Filename
     *
     * @return string Basename
     * @access private
     */
    function _basename($filename)
    {
   // basename() is not unicode safe and locale dependent
   if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware'))
       return preg_replace('/^.*[\\\\\\/]/', '', $filename);
   else
       return preg_replace('/^.*[\/]/', '', $filename);
    }

} // End of class