aboutsummaryrefslogtreecommitdiffstats
path: root/include/Scrape.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-04-17 23:27:11 -0700
committerFriendika <info@friendika.com>2011-04-17 23:27:11 -0700
commitab099e91028122dfb6b10cf9510b1b061f6f547f (patch)
tree126742a2c75edd037b52de9e2525f1cffd630604 /include/Scrape.php
parent7cc5a9bba9ee892bac41fe3af4ae00da846ca96a (diff)
downloadvolse-hubzilla-ab099e91028122dfb6b10cf9510b1b061f6f547f.tar.gz
volse-hubzilla-ab099e91028122dfb6b10cf9510b1b061f6f547f.tar.bz2
volse-hubzilla-ab099e91028122dfb6b10cf9510b1b061f6f547f.zip
email integration, cont.
Diffstat (limited to 'include/Scrape.php')
-rw-r--r--include/Scrape.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/Scrape.php b/include/Scrape.php
index 05a53e538..a6bb5f728 100644
--- 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)) {
@@ -341,8 +341,8 @@ function probe_url($url) {
$profile = 'http://' . substr($url,strpos($url,'@')+1);
// 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,'');