keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bug #148 email subscription issue

Browse source
This commit is contained in:
Friendika 2011-09-12 22:24:36 -07:00
parent 4f24494b0b
commit 08fc3e91b6
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/Scrape.php
View file

@ -430,7 +430,8 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$addr = $orig_url; $addr = $orig_url;
$network = NETWORK_MAIL; $network = NETWORK_MAIL;
$name = substr($url,0,strpos($url,'@')); $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 // fix nick character range
$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url)); $vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
$notify = 'smtp ' . random_string(); $notify = 'smtp ' . random_string();
@ -441,8 +442,15 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$adr = imap_rfc822_parse_adrlist($x->from,''); $adr = imap_rfc822_parse_adrlist($x->from,'');
elseif(stristr($x->to,$orig_url)) elseif(stristr($x->to,$orig_url))
$adr = imap_rfc822_parse_adrlist($x->to,''); $adr = imap_rfc822_parse_adrlist($x->to,'');
if(isset($adr) && strlen($adr[0]->personal)) if(isset($adr)) {
$vcard['fn'] = notags($adr[0]->personal); 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); imap_close($mbox);
} }