aboutsummaryrefslogtreecommitdiffstats
path: root/include/email.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-03-10 09:52:20 +0100
committerMichael Vogel <icarus@dabo.de>2012-03-10 09:52:20 +0100
commit15916a2cb717828367fc7e0bb74137942836a772 (patch)
treeb1cdcacab4bb67563d0ff2beb52c67438e9c7b21 /include/email.php
parentcb1ecf2c5ad649eb372db9eb3bd1da756f207fb6 (diff)
downloadvolse-hubzilla-15916a2cb717828367fc7e0bb74137942836a772.tar.gz
volse-hubzilla-15916a2cb717828367fc7e0bb74137942836a772.tar.bz2
volse-hubzilla-15916a2cb717828367fc7e0bb74137942836a772.zip
Mail: Removing signatures, gpg, unnecessary line breaks
Diffstat (limited to 'include/email.php')
-rwxr-xr-xinclude/email.php14
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;
}