X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=2060ddd13a917122f6944182541c4e352aae2c7a;hb=5095ce621ad852676de342d2fef9be3f3f95b2fb;hp=f68fe6f2d2dbd09bf25f0a4ca98bb1a8282f1334;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index f68fe6f2d2..2060ddd13a 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,18 +21,18 @@
 
 use Friendica\App;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\DI;
+use Friendica\Module\Response;
 use Friendica\Module\Security\Login;
-use Friendica\Util\Strings;
 
 function oexchange_init(App $a) {
 
-	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
+	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'xrd')) {
 		$tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
 		$o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
-		echo $o;
-		exit();
+		System::httpExit($o, Response::TYPE_XML, 'application/xrd+xml');
 	}
 }
 
@@ -43,20 +43,16 @@ function oexchange_content(App $a) {
 		return $o;
 	}
 
-	if (($a->argc > 1) && $a->argv[1] === 'done') {
+	if ((DI::args()->getArgc() > 1) && DI::args()->getArgv()[1] === 'done') {
 		return;
 	}
 
-	$url = ((!empty($_REQUEST['url']))
-		? urlencode(Strings::escapeTags(trim($_REQUEST['url']))) : '');
-	$title = ((!empty($_REQUEST['title']))
-		? '&title=' . urlencode(Strings::escapeTags(trim($_REQUEST['title']))) : '');
-	$description = ((!empty($_REQUEST['description']))
-		? '&description=' . urlencode(Strings::escapeTags(trim($_REQUEST['description']))) : '');
-	$tags = ((!empty($_REQUEST['tags']))
-		? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
+	$url         = !empty($_REQUEST['url'])         ? trim($_REQUEST['url'])         : '';
+	$title       = !empty($_REQUEST['title'])       ? trim($_REQUEST['title'])       : '';
+	$description = !empty($_REQUEST['description']) ? trim($_REQUEST['description']) : '';
+	$tags        = !empty($_REQUEST['tags'])        ? trim($_REQUEST['tags'])        : '';
 
-	$s = DI::httpRequest()->fetch(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
+	$s = \Friendica\Content\Text\BBCode::embedURL($url, true, $title, $description, $tags);
 
 	if (!strlen($s)) {
 		return;