X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=2060ddd13a917122f6944182541c4e352aae2c7a;hb=805d6440e68233d75476c0d02d779987816a8439;hp=72577ab4ef67183fdbcbe3871159a789bba8e065;hpb=71ec84f6dc83f753fe80170cfdfd32d202850d90;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 72577ab4ef..2060ddd13a 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,21 +1,38 @@
 <?php
 /**
- * @file mod/oexchange.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 use Friendica\App;
-use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Module\Login;
-use Friendica\Util\Network;
+use Friendica\DI;
+use Friendica\Module\Response;
+use Friendica\Module\Security\Login;
 
 function oexchange_init(App $a) {
 
-	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-		$tpl = get_markup_template('oexchange_xrd.tpl');
+	if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'xrd')) {
+		$tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-		$o = replace_macros($tpl, ['$base' => System::baseUrl()]);
-		echo $o;
-		killme();
+		$o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
+		System::httpExit($o, Response::TYPE_XML, 'application/xrd+xml');
 	}
 }
 
@@ -26,21 +43,16 @@ function oexchange_content(App $a) {
 		return $o;
 	}
 
-	if (($a->argc > 1) && $a->argv[1] === 'done') {
-		info(L10n::t('Post successful.') . EOL);
+	if ((DI::args()->getArgc() > 1) && DI::args()->getArgv()[1] === 'done') {
 		return;
 	}
 
-	$url = ((x($_REQUEST,'url') && strlen($_REQUEST['url']))
-		? urlencode(notags(trim($_REQUEST['url']))) : '');
-	$title = ((x($_REQUEST,'title') && strlen($_REQUEST['title']))
-		? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
-	$description = ((x($_REQUEST,'description') && strlen($_REQUEST['description']))
-		? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
-	$tags = ((x($_REQUEST,'tags') && strlen($_REQUEST['tags']))
-		? '&tags=' . urlencode(notags(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 = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+	$s = \Friendica\Content\Text\BBCode::embedURL($url, true, $title, $description, $tags);
 
 	if (!strlen($s)) {
 		return;