aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-19 17:25:41 -0700
committerFriendika <info@friendika.com>2011-05-19 17:25:41 -0700
commit44d5c90af446537ddd292caff0cd85370a7339ab (patch)
tree263060ed73c7a9830e3b63e95782eca02a17a38d
parentf151565029162c1de258eaef7fc8aacd4f69ba47 (diff)
downloadvolse-hubzilla-44d5c90af446537ddd292caff0cd85370a7339ab.tar.gz
volse-hubzilla-44d5c90af446537ddd292caff0cd85370a7339ab.tar.bz2
volse-hubzilla-44d5c90af446537ddd292caff0cd85370a7339ab.zip
better mailing list support, email addr can be either 'from' or 'to'
-rw-r--r--boot.php2
-rw-r--r--include/Scrape.php8
-rw-r--r--include/email.php12
3 files changed, 18 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 0eb1a36c8..66a76f49d 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.2.984' );
+define ( 'FRIENDIKA_VERSION', '2.2.985' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 );
diff --git a/include/Scrape.php b/include/Scrape.php
index a6bb5f728..21e6bd01f 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -278,6 +278,7 @@ function probe_url($url) {
$links = lrdd($url);
if(count($links)) {
+ logger('probe_url: found lrdd links: ' . print_r($links,true), LOGGER_DATA);
foreach($links as $link) {
if($link['@attributes']['rel'] === NAMESPACE_DFRN)
$dfrn = unamp($link['@attributes']['href']);
@@ -345,8 +346,11 @@ function probe_url($url) {
$poll = 'email ' . random_string();
$priority = 0;
$x = email_msg_meta($mbox,$msgs[0]);
- $adr = imap_rfc822_parse_adrlist($x->from,'');
- if(strlen($adr[0]->personal))
+ if(stristr($x->from,$orig_url))
+ $adr = imap_rfc822_parse_adrlist($x->from,'');
+ elseif(stristr($x->to,$orig_url))
+ $adr = imap_rfc822_parse_adrlist($x->to,'');
+ if(isset($adr) && strlen($adr[0]->personal))
$vcard['fn'] = notags($adr[0]->personal);
}
imap_close($mbox);
diff --git a/include/email.php b/include/email.php
index db10af2ee..7e0351e94 100644
--- a/include/email.php
+++ b/include/email.php
@@ -15,7 +15,17 @@ 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());
}