diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-16 09:39:29 +0200 |
| commit | 9d2afc2d3c12f6b70eae11487e491e2d8604ed60 (patch) | |
| tree | ced4fb400d25762866a773115b122f6c9cc498de /include/Scrape.php | |
| parent | 019b735ec75989336826e5ad5db6377803ecb050 (diff) | |
| parent | 2e43b291e73f6d7c36a9d8743fc2635dc3444841 (diff) | |
| download | volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.gz volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.tar.bz2 volse-hubzilla-9d2afc2d3c12f6b70eae11487e491e2d8604ed60.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/Scrape.php')
| -rw-r--r-- | include/Scrape.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/Scrape.php b/include/Scrape.php index b80f24c22..58468a40d 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -430,7 +430,8 @@ function probe_url($url, $mode = PROBE_NORMAL) { $addr = $orig_url; $network = NETWORK_MAIL; $name = substr($url,0,strpos($url,'@')); - $profile = 'http://' . substr($url,strpos($url,'@')+1); + $phost = substr($url,strpos($url,'@')+1); + $profile = 'http://' . $phost; // fix nick character range $vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url)); $notify = 'smtp ' . random_string(); @@ -441,8 +442,15 @@ function probe_url($url, $mode = PROBE_NORMAL) { $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); + if(isset($adr)) { + foreach($adr as $feadr) { + if((strcasecmp($feadr->mailbox,$name) == 0) + &&(strcasecmp($feadr->host,$phost) == 0) + && (strlen($feadr->personal))) { + $vcard['fn'] = notags($feadr->personal); + } + } + } } imap_close($mbox); } |