diff options
| author | friendica <info@friendica.com> | 2012-03-15 16:39:21 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-03-15 16:39:21 -0700 |
| commit | 41d595d5bc74987d95ffc6f81194ccc20050e5a4 (patch) | |
| tree | 5113a75197923b8b0ff994db0f9feef9ce221aea /include/email.php | |
| parent | 7684f63ecdfce560f24475630144f6058df15ca9 (diff) | |
| parent | 5d2c590fa93764c19043981e8398d97c6bae902b (diff) | |
| download | volse-hubzilla-41d595d5bc74987d95ffc6f81194ccc20050e5a4.tar.gz volse-hubzilla-41d595d5bc74987d95ffc6f81194ccc20050e5a4.tar.bz2 volse-hubzilla-41d595d5bc74987d95ffc6f81194ccc20050e5a4.zip | |
Merge branch 'pull'
Diffstat (limited to 'include/email.php')
| -rwxr-xr-x | include/email.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/email.php b/include/email.php index 659978b6e..a3449a424 100755 --- a/include/email.php +++ b/include/email.php @@ -1,5 +1,7 @@ <?php require_once('include/html2plain.php'); +require_once('include/msgclean.php'); +require_once('include/quoteconvert.php'); function email_connect($mailbox,$username,$password) { if(! function_exists('imap_open')) @@ -86,6 +88,7 @@ function email_get_msg($mbox,$uid) { if(! $struc->parts) { $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html'); + $html = $ret['body']; if (trim($ret['body']) == '') $ret['body'] = email_get_part($mbox,$uid,$struc,0, 'plain'); @@ -107,6 +110,17 @@ function email_get_msg($mbox,$uid) { else $ret['body'] = $text; } + + $ret['body'] = removegpg($ret['body']); + $msg = removesig($ret['body']); + $ret['body'] = $msg['body']; + $ret['body'] = convertquote($ret['body'], false); + + if (trim($html) != '') + $ret['body'] = removelinebreak($ret['body']); + + $ret['body'] = unifyattributionline($ret['body']); + return $ret; } |