pull request #91 fabrixxm (manual merge)

[friendica.git] / include / Scrape.php

diff --git a/include/Scrape.php b/include/Scrape.php
index 320e18edbf4e4e52e6b9f12af252f58c99f637b4..a6bb5f728c6d659be732ca65b7ab66439b552671 100644 (file)
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -322,7 +322,7 @@ function probe_url($url) {
                                $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())
                                );
-                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+                               $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
                                        intval(local_user())
                                );
                                if(count($x) && count($r)) {
@@ -339,11 +339,15 @@ function probe_url($url) {
                                                $network = NETWORK_MAIL;
                                                $name = substr($url,0,strpos($url,'@'));
                                                $profile = 'http://' . substr($url,strpos($url,'@')+1);
-                                               // fix nick
+                                               // fix nick character range
                                                $vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
-                                               $notify = 'smtp';
-                                               $poll = 'email';
+                                               $notify = 'smtp ' . random_string();
+                                               $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))
+                                                       $vcard['fn'] = notags($adr[0]->personal);
                                        }
                                        imap_close($mbox);
                                }