X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Femail.php;h=dec8c93db7aa519dcfae0711b2bccb0b5f744593;hb=85fede486e6ff57daeb3bc3472eb9bf0bde990e3;hp=8ea8145fb65acc9a58443a8139f3217ce3ee036a;hpb=8b13358ce33a1d3f88dedf2d50c650017614f418;p=friendica.git

diff --git a/include/email.php b/include/email.php
old mode 100755
new mode 100644
index 8ea8145fb6..dec8c93db7
--- a/include/email.php
+++ b/include/email.php
@@ -48,8 +48,8 @@ function construct_mailbox_name($mailacct) {
 
 
 function email_msg_meta($mbox,$uid) {
-	$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array()));
-	return ((count($ret)) ? $ret[0] : array());
+	$ret = (($mbox && $uid) ? @imap_fetch_overview($mbox,$uid,FT_UID) : array(array())); // POSSIBLE CLEANUP --> array(array()) is probably redundant now
+	return ((count($ret)) ? $ret : array());
 }
 
 function email_msg_headers($mbox,$uid) {
@@ -74,7 +74,7 @@ function email_msg_headers($mbox,$uid) {
 }
 
 
-function email_get_msg($mbox,$uid) {
+function email_get_msg($mbox,$uid, $reply) {
 	$ret = array();
 
 	$struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null);
@@ -82,10 +82,6 @@ function email_get_msg($mbox,$uid) {
 	if(! $struc)
 		return $ret;
 
-	// for testing purposes: Collect imported mails
-	// $file = tempnam("/tmp/friendica2/", "mail-in-");
-	// file_put_contents($file, json_encode($struc));
-
 	if(! $struc->parts) {
 		$ret['body'] = email_get_part($mbox,$uid,$struc,0, 'html');
 		$html = $ret['body'];
@@ -114,7 +110,7 @@ function email_get_msg($mbox,$uid) {
 	$ret['body'] = removegpg($ret['body']);
 	$msg = removesig($ret['body']);
 	$ret['body'] = $msg['body'];
-	$ret['body'] = convertquote($ret['body'], false);
+	$ret['body'] = convertquote($ret['body'], $reply);
 
 	if (trim($html) != '')
 		$ret['body'] = removelinebreak($ret['body']);
@@ -138,10 +134,6 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 		? @imap_fetchbody($mbox,$uid,$partno, FT_UID|FT_PEEK)
 	: @imap_body($mbox,$uid,FT_UID|FT_PEEK);
 
-	// for testing purposes: Collect imported mails
-	// $file = tempnam("/tmp/friendica2/", "mail-body-");
-	// file_put_contents($file, $data);
-
 	// Any part may be encoded, even plain text messages, so check everything.
 	if ($p->encoding==4)
 		$data = quoted_printable_decode($data);
@@ -250,7 +242,7 @@ function email_header_encode($in_str, $charset) {
 
         // remove trailing spacer and
         // add start and end delimiters
-        $spacer = preg_quote($spacer);
+        $spacer = preg_quote($spacer,'/');
         $out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
         $out_str = $start . $out_str . $end;
     }