move key conversion to separate lib

1 files changed, 20 insertions, 18 deletions

diff --git a/Zotlabs/Module/Xrd.php b/Zotlabs/Module/Xrd.php
index 959e31cbe..21574eb8d 100644
--- a/Zotlabs/Module/Xrd.php
+++ b/Zotlabs/Module/Xrd.php
@@ -1,19 +1,21 @@
 <?php
 namespace Zotlabs\Module;
 
+use Zotlabs\Lib\Keyutils;
+
 require_once('include/crypto.php');
 
 
 class Xrd extends \Zotlabs\Web\Controller {
 
 	function init() {
-	
+
 		$uri = urldecode(notags(trim($_GET['uri'])));
 		$subject = $uri;
 		logger('xrd: ' . $uri,LOGGER_DEBUG);
-	
+
 		$resource = $uri;
-	
+
 		if(substr($uri,0,4) === 'http') {
 			$uri = str_replace('~','',$uri);
 			$name = basename($uri);
@@ -22,29 +24,29 @@ class Xrd extends \Zotlabs\Web\Controller {
 			$local = str_replace('acct:', '', $uri);
 			if(substr($local,0,2) == '//')
 				$local = substr($local,2);
-	
+
 			$name = substr($local,0,strpos($local,'@'));
 		}
-	
+
 		$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
 			dbesc($name)
 		);
-		if(! $r) 
+		if(! $r)
 			killme();
-		
-		$salmon_key = salmon_key($r[0]['channel_pubkey']);
-	
+
+		$salmon_key = Keyutils::salmonKey($r[0]['channel_pubkey']);
+
 		header('Access-Control-Allow-Origin: *');
 		header("Content-type: application/xrd+xml");
-	
-	
+
+
 		$aliases = array('acct:' . channel_reddress($r[0]), z_root() . '/channel/' . $r[0]['channel_address'], z_root() . '/~' . $r[0]['channel_address']);
-	
+
 		for($x = 0; $x < count($aliases); $x ++) {
 			if($aliases[$x] === $resource)
 				unset($aliases[$x]);
 		}
-		
+
 		$o = replace_macros(get_markup_template('xrd_person.tpl'), array(
 			'$nick'        => $r[0]['channel_address'],
 			'$accturi'     => $resource,
@@ -60,14 +62,14 @@ class Xrd extends \Zotlabs\Web\Controller {
 			'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
 			'$subscribe'   => z_root() . '/follow?f=&amp;url={uri}',
 		));
-	
-	
+
+
 		$arr = array('user' => $r[0], 'xml' => $o);
 		call_hooks('personal_xrd', $arr);
-	
+
 		echo $arr['xml'];
 		killme();
-	
+
 	}
-	
+
 }