Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index 1250b0812c0bd754558931686e2d0ca1fae4040e..02a5d7b23c33270e48603e7bc6a7babde96f42be 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -2,7 +2,7 @@
 
 require_once('include/crypto.php');
 
-function xrd_init(&$a) {
+function xrd_init(App &$a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));
 
@@ -21,8 +21,9 @@ function xrd_init(&$a) {
        $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                dbesc($name)
        );
-       if(! dbm::is_result($r))
+       if (! dbm::is_result($r)) {
                killme();
+       }
 
        $salmon_key = salmon_key($r[0]['spubkey']);
 
@@ -31,14 +32,14 @@ function xrd_init(&$a) {
 
        $tpl = get_markup_template('xrd_diaspora.tpl');
        $dspr = replace_macros($tpl,array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$dspr_guid' => $r[0]['guid'],
                '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
        ));
 
        $tpl = get_markup_template('xrd_person.tpl');
 
-       $profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
+       $profile_url = App::get_baseurl().'/profile/'.$r[0]['nickname'];
 
        if ($acct)
                $alias = $profile_url;
@@ -54,15 +55,15 @@ function xrd_init(&$a) {
                '$accturi'     => $uri,
                '$alias'       => $alias,
                '$profile_url' => $profile_url,
-               '$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
-               '$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
-               '$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],
-               '$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['nickname'],
-               '$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
+               '$hcard_url'   => App::get_baseurl() . '/hcard/'         . $r[0]['nickname'],
+               '$atom'        => App::get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
+               '$zot_post'    => App::get_baseurl() . '/post/'          . $r[0]['nickname'],
+               '$poco_url'    => App::get_baseurl() . '/poco/'          . $r[0]['nickname'],
+               '$photo'       => App::get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
                '$dspr'        => $dspr,
-               '$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
-               '$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
-               '$subscribe'   => $a->get_baseurl() . '/follow?url={uri}',
+               '$salmon'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'],
+               '$salmen'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
+               '$subscribe'   => App::get_baseurl() . '/follow?url={uri}',
                '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
                '$bigkey'      =>  salmon_key($r[0]['pubkey'])
        ));