vier: fix missing icons

[friendica.git] / include / email.php

diff --git a/include/email.php b/include/email.php
old mode 100755 (executable)
new mode 100644 (file)
index a3449a4..0f24a42
--- a/include/email.php
+++ b/include/email.php
@@ -48,15 +48,15 @@ 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) {
        $raw_header = (($mbox && $uid) ? @imap_fetchheader($mbox,$uid,FT_UID) : '');
        $raw_header = str_replace("\r",'',$raw_header);
        $ret = array();
-       $h = split("\n",$raw_header);
+       $h = explode("\n",$raw_header);
        if(count($h))
        foreach($h as $line ) {
            if (preg_match("/^[a-zA-Z]/", $line)) {
@@ -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,13 +242,19 @@ 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;
     }
     return $out_str;
 }
 
+/**
+ * email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code
+ * (not to notify the user, but to send items to email contacts
+ *
+ * TODO: this could be changed to use the Emailer class
+ */
 function email_send($addr, $subject, $headers, $item) {
        //$headers .= 'MIME-Version: 1.0' . "\n";
        //$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n";