aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/acl.php8
-rw-r--r--mod/friendika.php1
-rw-r--r--mod/hostxrd.php4
-rw-r--r--mod/xrd.php4
4 files changed, 12 insertions, 5 deletions
diff --git a/mod/acl.php b/mod/acl.php
index cb5959a95..f2d2456a6 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -53,12 +53,13 @@ function acl_init(&$a){
"photo" => "images/default-group-mm.png",
"name" => $g['name'],
"id" => intval($g['id']),
- "uids" => array_map("intval", explode(",",$g['uids']))
+ "uids" => array_map("intval", explode(",",$g['uids'])),
+ "link" => ''
);
}
- $r = q("SELECT `id`, `name`, `micro`, `network` FROM `contact`
+ $r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
$sql_extra
ORDER BY `name` ASC ",
@@ -70,7 +71,8 @@ function acl_init(&$a){
"photo" => $g['micro'],
"name" => $g['name'],
"id" => intval($g['id']),
- "network" => $g['network']
+ "network" => $g['network'],
+ "link" => $g['url'],
);
}
diff --git a/mod/friendika.php b/mod/friendika.php
index c5d7de59f..b12110bd5 100644
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -21,6 +21,7 @@ function friendika_init(&$a) {
'register_policy' => $register_policy[$a->config['register_policy']],
'admin' => $admin,
'site_name' => $a->config['sitename'],
+ 'platform' => FRIENDIKA_PLATFORM,
'info' => ((x($a->config,'info')) ? $a->config['info'] : '')
);
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 1cc18da7a..e057cccad 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -1,11 +1,13 @@
<?php
+require_once('include/crypto.php');
+
function hostxrd_init(&$a) {
header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml");
$tpl = file_get_contents('view/xrd_host.tpl');
echo str_replace(array(
- '$zroot','$domain','$zot_post'),array(z_root(),z_path(),z_root() . '/post'),$tpl);
+ '$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
session_write_close();
exit();
diff --git a/mod/xrd.php b/mod/xrd.php
index dae6e4828..a416a2cf3 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -41,6 +41,7 @@ function xrd_init(&$a) {
$tpl = file_get_contents('view/xrd_person.tpl');
$o = replace_macros($tpl, array(
+ '$nick' => $r[0]['nickname'],
'$accturi' => $uri,
'$profile_url' => $a->get_baseurl() . '/profile/' . $r[0]['nickname'],
'$hcard_url' => $a->get_baseurl() . '/hcard/' . $r[0]['nickname'],
@@ -50,7 +51,8 @@ function xrd_init(&$a) {
'$dspr' => $dspr,
'$salmon' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'],
'$salmen' => $a->get_baseurl() . '/salmon/' . $r[0]['nickname'] . '/mention',
- '$modexp' => 'data:application/magic-public-key,' . $salmon_key
+ '$modexp' => 'data:application/magic-public-key,' . $salmon_key,
+ '$bigkey' => salmon_key($r[0]['pubkey'])
));