aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-22 18:40:00 -0700
committerFriendika <info@friendika.com>2011-05-22 18:40:00 -0700
commit44a22c29155fa3beeed7cd5d0add30818e409891 (patch)
treefe89c42ebff5947d312f07120f6e47de6b9949dd /mod
parenta803652653a3c354c697d9c58e86d98d814a388a (diff)
downloadvolse-hubzilla-44a22c29155fa3beeed7cd5d0add30818e409891.tar.gz
volse-hubzilla-44a22c29155fa3beeed7cd5d0add30818e409891.tar.bz2
volse-hubzilla-44a22c29155fa3beeed7cd5d0add30818e409891.zip
more improvements in twitter handling, reduce duplicates from FB when double friended
Diffstat (limited to 'mod')
-rw-r--r--mod/follow.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/mod/follow.php b/mod/follow.php
index 6786e9039..9a9f9da7d 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -12,7 +12,7 @@ function follow_post(&$a) {
$url = $orig_url = notags(trim($_POST['url']));
- // remove ajax junk
+ // remove ajax junk, e.g. Twitter
$url = str_replace('/#!/','/',$url);
@@ -41,6 +41,14 @@ function follow_post(&$a) {
if(! ((x($ret,'name')) && (x($ret,'poll')) && ((x($ret,'url')) || (x($ret,'addr'))))) {
notice( t('The profile address specified does not provide adequate information.') . EOL);
+ if(! x($ret,'poll'))
+ notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+ if(! x($ret,'name'))
+ notice( t('An author or name was not found.') . EOL);
+ if(! x($ret,'url'))
+ notice( t('No browser URL could be matched to this address.') . EOL);
+ if(strpos($url,'@') !== false)
+ notice('Unable to match @-style Identity Address with a known protocol or email contact');
goaway($_SESSION['return_url']);
}