- code cleanup (mostly whitespaces)

alecpl

2009-11-26 f7f9346feb02dafc8d7337790aacb0a9afb2b9a6

- code cleanup (mostly whitespaces)

 program/lib/Mail/mime.php

@@ -341,8 +341,12 @@
               $n_encoding    = NULL,
               $f_encoding   = NULL)
    {
        $filedata = ($isfile === true) ? $this->_file2str($file)
                                           : $file;
        $filedata = ($isfile === true) ? $this->_file2str($file) : $file;

        if (PEAR::isError($filedata)) {
            return $filedata;
        }

        if ($isfile === true) {
            // Force the name the user supplied, otherwise use $file
            $filename = (strlen($name)) ? $name : $file;
@@ -355,9 +359,6 @@
            return $err;
        }
        $filename = $this->_basename($filename);
        if (PEAR::isError($filedata)) {
            return $filedata;
        }

        $this->_parts[] = array(
                                'body'        => $filedata,
@@ -538,10 +539,11 @@
        $params['disposition']  = 'inline';
        $params['dfilename']    = $value['name'];
        $params['cid']          = $value['cid'];
    if ($value['name-encoding']) {

        if (!empty($value['name-encoding'])) {
        $params['name-encoding'] = $value['name-encoding'];
    }
    if ($value['filename-encoding']) {
        if (!empty($value['filename-encoding'])) {
        $params['filename-encoding'] = $value['filename-encoding'];
    }
        

 program/lib/Mail/mimePart.php

@@ -416,8 +416,10 @@
        return $this->_buildRFC2047Param($name, $value, $charset, $paramEnc);

    // RFC2231:
        $encValue = preg_replace('#([^\x21,\x23,\x24,\x26,\x2B,\x2D,\x2E,\x30-\x39,\x41-\x5A,\x5E-\x7E])#e',
            '"%" . strtoupper(dechex(ord("\1")))', $value);
        $encValue = preg_replace(
            '#([^\x21,\x23,\x24,\x26,\x2B,\x2D,\x2E,\x30-\x39,\x41-\x5A,\x5E-\x7E])#e',
            '"%" . strtoupper(dechex(ord("\1")))',
            $value);
        $value = "$charset'$language'$encValue";

        $header = " {$name}*={$value};";