Issue 3857: There is the possibility of a bad handling of dislikes

[friendica.git] / include / email.php

diff --git a/include/email.php b/include/email.php
index b8d99433e1e070b0c44514c18022d4f745fab072..b3bd52a6682e9649a0fbd2cc92a12e593b85a33c 100644 (file)
--- a/include/email.php
+++ b/include/email.php
@@ -18,22 +18,27 @@ function email_poll($mbox,$email_addr) {
                return array();
 
        $search1 = @imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-       if (! $search1)
+       if (!$search1) {
                $search1 = array();
+       } else {
+               logger("Found mails from ".$email_addr, LOGGER_DEBUG);
+       }
 
        $search2 = @imap_search($mbox,'TO "' . $email_addr . '"', SE_UID);
-       if (! $search2)
+       if (!$search2) {
                $search2 = array();
+       } else {
+               logger("Found mails to ".$email_addr, LOGGER_DEBUG);
+       }
 
        $search3 = @imap_search($mbox,'CC "' . $email_addr . '"', SE_UID);
-       if (! $search3)
+       if (!$search3) {
                $search3 = array();
+       } else {
+               logger("Found mails cc ".$email_addr, LOGGER_DEBUG);
+       }
 
-       $search4 = @imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID);
-       if (! $search4)
-               $search4 = array();
-
-       $res = array_unique(array_merge($search1,$search2,$search3,$search4));
+       $res = array_unique(array_merge($search1, $search2, $search3));
 
        return $res;
 }
@@ -152,7 +157,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
        if ($p->parameters)
                foreach ($p->parameters as $x)
                        $params[strtolower($x->attribute)] = $x->value;
-       if (isset($p->dparameters) and $p->dparameters)
+       if (isset($p->dparameters) && $p->dparameters)
                foreach ($p->dparameters as $x)
                        $params[strtolower($x->attribute)] = $x->value;
 
@@ -160,7 +165,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
        // Any part with a filename is an attachment,
        // so an attached text file (type 0) is not mistaken as the message.
 
-       if ((isset($params['filename']) and $params['filename']) || (isset($params['name']) and $params['name'])) {
+       if ((isset($params['filename']) && $params['filename']) || (isset($params['name']) && $params['name'])) {
                // filename may be given as 'Filename' or 'Name' or both
                $filename = ($params['filename'])? $params['filename'] : $params['name'];
                // filename may be encoded, so see imap_mime_header_decode()
@@ -191,7 +196,7 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 //     }
 
        // SUBPART RECURSION
-       if (isset($p->parts) and $p->parts) {
+       if (isset($p->parts) && $p->parts) {
                $x = "";
                foreach ($p->parts as $partno0=>$p2) {
                        $x .=  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.