X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fxrd.php;h=363994a8d42e22eae7177fd14a36c92fc1e42cf6;hb=0b5f7da270bcaa679cb684dbbbbe40781f0b49c6;hp=60f78ed27c7563b725f2934ea0e0ee7d521f3783;hpb=e2224a2ddce3e2944765ecb46bc8a646df06109e;p=friendica.git

diff --git a/mod/xrd.php b/mod/xrd.php
index 60f78ed27c..363994a8d4 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,11 +1,14 @@
 <?php
-
+/**
+ * @file mod/xrd.php
+ */
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Salmon;
 
-require_once('include/crypto.php');
-
-function xrd_init(App $a) {
+function xrd_init(App $a)
+{
 	if ($a->argv[0] == 'xrd') {
 		$uri = urldecode(notags(trim($_GET['uri'])));
 		if ($_SERVER['HTTP_ACCEPT'] == 'application/jrd+json') {
@@ -33,7 +36,7 @@ function xrd_init(App $a) {
 	}
 
 	$r = dba::select('user', array(), array('nickname' => $name), array('limit' => 1));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		killme();
 	}
 
@@ -53,8 +56,9 @@ function xrd_init(App $a) {
 	}
 }
 
-function xrd_json($a, $uri, $alias, $profile_url, $r) {
-	$salmon_key = salmon_key($r['spubkey']);
+function xrd_json($a, $uri, $alias, $profile_url, $r)
+{
+	$salmon_key = Salmon::salmonKey($r['spubkey']);
 
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: application/json; charset=utf-8");
@@ -78,8 +82,9 @@ function xrd_json($a, $uri, $alias, $profile_url, $r) {
 	killme();
 }
 
-function xrd_xml($a, $uri, $alias, $profile_url, $r) {
-	$salmon_key = salmon_key($r['spubkey']);
+function xrd_xml($a, $uri, $alias, $profile_url, $r)
+{
+	$salmon_key = Salmon::salmonKey($r['spubkey']);
 
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
@@ -93,15 +98,14 @@ function xrd_xml($a, $uri, $alias, $profile_url, $r) {
 		'$profile_url' => $profile_url,
 		'$hcard_url'   => System::baseUrl() . '/hcard/'         . $r['nickname'],
 		'$atom'        => System::baseUrl() . '/dfrn_poll/'     . $r['nickname'],
-		'$zot_post'    => System::baseUrl() . '/post/'          . $r['nickname'],
 		'$poco_url'    => System::baseUrl() . '/poco/'          . $r['nickname'],
 		'$photo'       => System::baseUrl() . '/photo/profile/' . $r['uid']      . '.jpg',
 		'$baseurl' => System::baseUrl(),
 		'$salmon'      => System::baseUrl() . '/salmon/'        . $r['nickname'],
 		'$salmen'      => System::baseUrl() . '/salmon/'        . $r['nickname'] . '/mention',
 		'$subscribe'   => System::baseUrl() . '/follow?url={uri}',
-		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
-	));
+		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key)
+	);
 
 	$arr = array('user' => $r, 'xml' => $o);
 	call_hooks('personal_xrd', $arr);