X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Femail.php;h=1f485e430fa0ab5ab55d4630970ef2dde8e64e6c;hb=24836f2966842b413ae29f325fbb61b30186a5f7;hp=91aafd45ed840716154800a68e756aa67796cd1d;hpb=ab099e91028122dfb6b10cf9510b1b061f6f547f;p=friendica.git

diff --git a/include/email.php b/include/email.php
index 91aafd45ed..1f485e430f 100644
--- a/include/email.php
+++ b/include/email.php
@@ -12,15 +12,32 @@ function email_connect($mailbox,$username,$password) {
 function email_poll($mbox,$email_addr) {
 
 	if(! ($mbox && $email_addr))
-		return array();;
+		return array();
 
-	$search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-	return (($search) ? $search : array());
+	$search1 = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
+	if(! $search1)
+		$search1 = array();
+
+	$search2 = imap_search($mbox,'TO "' . $email_addr . '"', SE_UID);
+	if(! $search2)
+		$search2 = array();
+
+	$search3 = imap_search($mbox,'CC "' . $email_addr . '"', SE_UID);
+	if(! $search3)
+		$search3 = array();
+
+	$search4 = imap_search($mbox,'BCC "' . $email_addr . '"', SE_UID);
+	if(! $search4)
+		$search4 = array();
+
+	$res = array_unique(array_merge($search1,$search2,$search3,$search4));
+
+	return $res;
 }
 
 
 function construct_mailbox_name($mailacct) {
-	$ret = '{' . $mailacct['server'] . (($mailacct['port']) ? ':' . $mailacct['port'] : '');
+	$ret = '{' . $mailacct['server'] . ((intval($mailacct['port'])) ? ':' . $mailacct['port'] : '');
 	$ret .= (($mailacct['ssltype']) ?  '/' . $mailacct['ssltype'] . '/novalidate-cert' : '');
 	$ret .= '}' . $mailacct['mailbox'];
 	return $ret;