X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=f68fe6f2d2dbd09bf25f0a4ca98bb1a8282f1334;hb=a7b07b6e2ea43134e670ca4a7959d0f25dff85b3;hp=19617391dd6837fe072d68f9992e1667c8af964c;hpb=26b335ef3d8b1ec4e1b4e22cd7d3c34e66d2549d;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 19617391dd..f68fe6f2d2 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,55 +1,72 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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\System;
-use Friendica\Module\Login;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
+use Friendica\Util\Strings;
 
 function oexchange_init(App $a) {
 
 	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
-		$tpl = get_markup_template('oexchange_xrd.tpl');
+		$tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-		$o = replace_macros($tpl, ['$base' => System::baseUrl()]);
+		$o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
 		echo $o;
-		killme();
+		exit();
 	}
 }
 
 function oexchange_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		$o = Login::form();
 		return $o;
 	}
 
 	if (($a->argc > 1) && $a->argv[1] === 'done') {
-		info( t('Post successful.') . EOL);
 		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']))
+		? 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']))) : '');
 
-	$s = fetch_url(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+	$s = DI::httpRequest()->fetch(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
 
-	if (! strlen($s)) {
+	if (!strlen($s)) {
 		return;
 	}
 
-	require_once('include/html2bbcode.php');
-
 	$post = [];
 
 	$post['profile_uid'] = local_user();
-	$post['return'] = '/oexchange/done' ;
-	$post['body'] = html2bbcode($s);
-	$post['type'] = 'wall';
+	$post['return'] = '/oexchange/done';
+	$post['body'] = Friendica\Content\Text\HTML::toBBCode($s);
 
 	$_REQUEST = $post;
 	require_once('mod/item.php');