aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/follow.php10
-rw-r--r--mod/friendika.php4
-rw-r--r--mod/item.php3
3 files changed, 12 insertions, 5 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']);
}
diff --git a/mod/friendika.php b/mod/friendika.php
index c7d8b5b81..8bd6e3437 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -62,7 +62,9 @@ function friendika_content(&$a) {
}
else
$o .= '<p>' . t('No installed plugins/addons/apps');
-
+
+ call_hooks('about_hook', $o);
+
return $o;
}
diff --git a/mod/item.php b/mod/item.php
index 8c9e004c3..66fdc13af 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -589,9 +589,6 @@ function item_post(&$a) {
dbesc(datetime_convert()),
intval($post_id)
);
- foreach( $r as $key => $val) {
- logger("key: " . $key . " val: " . $val);
- }
// photo comments turn the corresponding item visible to the profile wall
// This way we don't see every picture in your new photo album posted to your wall at once.