aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-08-07 19:26:44 -0700
committerFriendika <info@friendika.com>2011-08-07 19:26:44 -0700
commit7eb7f774131a47212ff9c505d7d497c8c7b76a53 (patch)
treec0104f6d5186de19eaf7f0e54a08eb80d9c01ea5 /mod
parent0745c00b16a6c6c63c0d49f61d7a09c2fabbf41f (diff)
downloadvolse-hubzilla-7eb7f774131a47212ff9c505d7d497c8c7b76a53.tar.gz
volse-hubzilla-7eb7f774131a47212ff9c505d7d497c8c7b76a53.tar.bz2
volse-hubzilla-7eb7f774131a47212ff9c505d7d497c8c7b76a53.zip
use separate hcard from profile url
Diffstat (limited to 'mod')
-rw-r--r--mod/follow.php2
-rw-r--r--mod/hcard.php50
-rw-r--r--mod/xrd.php1
3 files changed, 52 insertions, 1 deletions
diff --git a/mod/follow.php b/mod/follow.php
index 925572640..80226f3b9 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -58,7 +58,7 @@ function follow_post(&$a) {
}
if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
- notice( t('Communication options with this network have been restricted.') . EOL);
+ notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
$ret['notify'] = '';
}
diff --git a/mod/hcard.php b/mod/hcard.php
new file mode 100644
index 000000000..5505ca08e
--- /dev/null
+++ b/mod/hcard.php
@@ -0,0 +1,50 @@
+<?php
+
+function hcard_init(&$a) {
+
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user()))
+ return;
+
+ if($a->argc > 1)
+ $which = $a->argv[1];
+ else {
+ notice( t('No profile') . EOL );
+ $a->error = 404;
+ return;
+ }
+
+ $profile = 0;
+ if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+ $which = $a->user['nickname'];
+ $profile = $a->argv[1];
+ }
+
+ profile_load($a,$which,$profile);
+
+ if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+ $a->page['htmlhead'] .= '<meta name="friendika.community" content="true" />';
+ }
+ if(x($a->profile,'openidserver'))
+ $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
+ if(x($a->profile,'openid')) {
+ $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+ $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
+ }
+
+ $keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
+ $keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
+ if(strlen($keywords))
+ $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\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->profile['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";
+ header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+
+ $dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+ foreach($dfrn_pages as $dfrn)
+ $a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+
+}
+
diff --git a/mod/xrd.php b/mod/xrd.php
index c96c18f3c..9021222b7 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -47,6 +47,7 @@ function xrd_content(&$a) {
$o = replace_macros($tpl, array(
'$accturi' => $uri,
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
+ '$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'],
'$atom' => $a->get_baseurl() . '/dfrn_poll/' . $r[0]['nickname'],
'$photo' => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid'] . '.jpg',
'$dspr' => $dspr,