diff options
| author | Chris Case <kahotep@bunda.dreamhost.com> | 2011-05-22 19:20:12 -0700 |
|---|---|---|
| committer | Chris Case <kahotep@bunda.dreamhost.com> | 2011-05-22 19:20:12 -0700 |
| commit | 150830d38c2191d2e55a373043af176208d4b430 (patch) | |
| tree | 44cad869fb3a152e40b1111a35ac0c7774e3e703 /mod/follow.php | |
| parent | 991885f1d40b8a8f16cd17c028f5c93eba69a5f3 (diff) | |
| parent | 44a22c29155fa3beeed7cd5d0add30818e409891 (diff) | |
| download | volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.tar.gz volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.tar.bz2 volse-hubzilla-150830d38c2191d2e55a373043af176208d4b430.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 10 |
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']); } |