Some improvements

[friendica.git] / mod / xrd.php

diff --git a/mod/xrd.php b/mod/xrd.php
index 7b812a7f9d94610d804515ba2e454cdf855762b0..bfb889258cf5193ae21e4e4d8eb67df14a374871 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\App;
+
 require_once('include/crypto.php');
 
 function xrd_init(App $a) {
@@ -18,14 +20,12 @@ function xrd_init(App $a) {
                $name = substr($local,0,strpos($local,'@'));
        }
 
-       $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-               dbesc($name)
-       );
+       $r = dba::select('user', array(), array('nickname' => $name), array('limit' => 1));
        if (! dbm::is_result($r)) {
                killme();
        }
 
-       $salmon_key = salmon_key($r[0]['spubkey']);
+       $salmon_key = salmon_key($r['spubkey']);
 
        header('Access-Control-Allow-Origin: *');
        header("Content-type: text/xml");
@@ -33,19 +33,19 @@ function xrd_init(App $a) {
        $tpl = get_markup_template('xrd_diaspora.tpl');
        $dspr = replace_macros($tpl,array(
                '$baseurl' => App::get_baseurl(),
-               '$dspr_guid' => $r[0]['guid'],
-               '$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
+               '$dspr_guid' => $r['guid'],
+               '$dspr_key' => base64_encode(pemtorsa($r['pubkey']))
        ));
 
        $tpl = get_markup_template('xrd_person.tpl');
 
-       $profile_url = App::get_baseurl().'/profile/'.$r[0]['nickname'];
+       $profile_url = App::get_baseurl().'/profile/'.$r['nickname'];
 
        if ($acct) {
                $alias = $profile_url;
        }
        else {
-               $alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
+               $alias = 'acct:'.$r['nickname'].'@'.$a->get_hostname();
 
                if ($a->get_path()) {
                        $alias .= '/'.$a->get_path();
@@ -53,25 +53,25 @@ function xrd_init(App $a) {
        }
 
        $o = replace_macros($tpl, array(
-               '$nick'        => $r[0]['nickname'],
+               '$nick'        => $r['nickname'],
                '$accturi'     => $uri,
                '$alias'       => $alias,
                '$profile_url' => $profile_url,
-               '$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',
+               '$hcard_url'   => App::get_baseurl() . '/hcard/'         . $r['nickname'],
+               '$atom'        => App::get_baseurl() . '/dfrn_poll/'     . $r['nickname'],
+               '$zot_post'    => App::get_baseurl() . '/post/'          . $r['nickname'],
+               '$poco_url'    => App::get_baseurl() . '/poco/'          . $r['nickname'],
+               '$photo'       => App::get_baseurl() . '/photo/profile/' . $r['uid']      . '.jpg',
                '$dspr'        => $dspr,
-               '$salmon'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'],
-               '$salmen'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
+               '$salmon'      => App::get_baseurl() . '/salmon/'        . $r['nickname'],
+               '$salmen'      => App::get_baseurl() . '/salmon/'        . $r['nickname'] . '/mention',
                '$subscribe'   => App::get_baseurl() . '/follow?url={uri}',
                '$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
-               '$bigkey'      => salmon_key($r[0]['pubkey']),
+               '$bigkey'      => salmon_key($r['pubkey']),
        ));
 
 
-       $arr = array('user' => $r[0], 'xml' => $o);
+       $arr = array('user' => $r, 'xml' => $o);
        call_hooks('personal_xrd', $arr);
 
        echo $arr['xml'];