Drupal doesn't provide absolute URL on feed. Fix to allow importing Drupal "contacts".

[friendica.git] / include / email.php

diff --git a/include/email.php b/include/email.php
index 91aafd45ed840716154800a68e756aa67796cd1d..7e0351e94690ce8ee19fe8d56d56f0e4277fb4b8 100644 (file)
--- a/include/email.php
+++ b/include/email.php
@@ -15,12 +15,22 @@ function email_poll($mbox,$email_addr) {
                return array();;
 
        $search = imap_search($mbox,'FROM "' . $email_addr . '"', SE_UID);
-       return (($search) ? $search : array());
+
+       $search2 = imap_search($mbox,'TO "' . $email_addr . '"', SE_UID);
+
+       if($search && $search2)
+               $res = array_merge($search,$search2);
+       elseif($search)
+               $res = $search;
+       else
+               $res = $search2;
+
+       return (($res) ? $res : array());
 }
 
 
 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;