Changeset 56849c6 in github


Ignore:
Timestamp:
Jan 6, 2011 6:48:11 AM (2 years ago)
Author:
thomascube <thomas@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
c3be8ed
Parents:
965ed0ca
Message:

Wrap HTML parts with <html><body> and add Doctype declaration (#1487098)

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    r965ed0ca r56849c6  
    22=========================== 
    33 
     4- Wrap HTML parts with <html><body> and add Doctype declaration (#1487098) 
    45- Make rcube_autoload silently skip unknown classes (#1487109) 
    56- Fix charset detection in vcards with encoded values (#1485542) 

  • program/steps/mail/sendmail.inc

    r14f87f7 r56849c6  
    167167      if ($name && ($name[0] != '"' || $name[strlen($name)-1] != '"') 
    168168          && preg_match('/[\(\)\<\>\\\.\[\]@,;:"]/', $name)) { 
    169           $name = '"'.addcslashes($name, '"').'"'; 
     169            $name = '"'.addcslashes($name, '"').'"'; 
    170170      } 
    171171      $address = idn_to_ascii($address); 
    … …  
    400400    $bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%'; 
    401401    $message_body = preg_replace('/<blockquote>/', 
    402         '<blockquote type="cite" style="'.$bstyle.'">', $message_body); 
     402      '<blockquote type="cite" style="'.$bstyle.'">', $message_body); 
     403 
     404    // append doctype and html/body wrappers 
     405    $message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' . 
     406      "\r\n<html><body>\r\n" . $message_body; 
    403407  } 
    404408 
    … …  
    416420  if ($footer) 
    417421    $message_body .= "\r\n" . $footer; 
     422  if ($isHtml) 
     423    $message_body .= "\r\n</body></html>\r\n"; 
    418424} 
    419425 
Note: See TracChangeset for help on using the changeset viewer.