X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhostxrd.php;h=27dc349db2df12977e428b9cedee672be9e8b281;hb=9259feec6f4b0a24c15f971a3dc8fa54f4f08141;hp=a1c24765b4a40e28755961ed22550f4a59c27178;hpb=360a46178b6f189a7ad4485fea65403463561149;p=friendica.git

diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index a1c24765b4..27dc349db2 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -2,38 +2,29 @@
 
 require_once('include/crypto.php');
 
-function hostxrd_init(&$a) {
+function hostxrd_init(App $a) {
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 	$pubkey = get_config('system','site_pubkey');
 
 	if(! $pubkey) {
+		$res = new_keypair(1024);
 
-		// should only have to ever do this once.
-
-		$res=openssl_pkey_new(array(
-			'digest_alg' => 'sha1',
-			'private_key_bits' => 4096,
-			'encrypt_key' => false ));
-
-
-		$prvkey = '';
-
-		openssl_pkey_export($res, $prvkey);
-
-		// Get public key
-
-		$pkey = openssl_pkey_get_details($res);
-		$pubkey = $pkey["key"];
-
-		set_config('system','site_prvkey', $prvkey);
-		set_config('system','site_pubkey', $pubkey);
+		set_config('system','site_prvkey', $res['prvkey']);
+		set_config('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array(
-		'$zroot','$domain','$zot_post','$bigkey'),array(z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
-	session_write_close();
+	//$tpl = file_get_contents('view/xrd_host.tpl');
+	/*echo str_replace(array(
+		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
+	$tpl = get_markup_template('xrd_host.tpl');
+	echo replace_macros($tpl, array(
+		'$zhost' => $a->get_hostname(),
+		'$zroot' => z_root(),
+		'$domain' => z_path(),
+		'$zot_post' => z_root() . '/post',
+		'$bigkey' => salmon_key(get_config('system','site_pubkey')),
+	));
 	exit();
 
-}
\ No newline at end of file
+}