aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_request.php4
-rw-r--r--mod/profile.php5
-rw-r--r--mod/pubsub.php1
3 files changed, 6 insertions, 4 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 7a3060ff4..6e8171d50 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -44,7 +44,7 @@ function dfrn_request_post(&$a) {
if(x($dfrn_url)) {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval(local_user()),
dbesc($dfrn_url)
);
@@ -198,7 +198,7 @@ function dfrn_request_post(&$a) {
if($network === 'dfrn') {
- $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' LIMIT 1",
+ $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
intval($uid),
dbesc($url)
);
diff --git a/mod/profile.php b/mod/profile.php
index 5576b49dd..8fa25cdbf 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -61,10 +61,11 @@ function profile_init(&$a) {
$profile = $a->argv[1];
}
profile_load($a,$which,$profile);
+ $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+ $uri = urlencode('acct:' . $a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
+ $a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
- $a->page['htmlhead'] .= '<meta name="dfrn-template" content="' . $a->get_baseurl() . "/profile/%s" . '" />' . "\r\n" ;
- $a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
diff --git a/mod/pubsub.php b/mod/pubsub.php
index b47b2eedf..1b69cc5f9 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -83,6 +83,7 @@ function pubsub_init(&$a) {
}
}
+require_once('include/security.php');
function pubsub_post(&$a) {