lrdd link on profile page (for salmon m/e), remove dfrn-template, qualify some contact lookups, some cleanup of app/boot
This commit is contained in:
parent
3876cab8ea
commit
0b2d85891e
4 changed files with 16 additions and 18 deletions
|
@ -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)
|
||||
);
|
||||
|
|
|
@ -61,10 +61,11 @@ function profile_init(&$a) {
|
|||
$profile = $a->argv[1];
|
||||
}
|
||||
profile_load($a,$which,$profile);
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\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" ;
|
||||
$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";
|
||||
|
||||
|
||||
|
||||
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
|
||||
|
|
|
@ -83,6 +83,7 @@ function pubsub_init(&$a) {
|
|||
}
|
||||
}
|
||||
|
||||
require_once('include/security.php');
|
||||
|
||||
function pubsub_post(&$a) {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue