X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=e042a22f52038f9a47b4fe7f7edc821c429ea356;hb=1075bfb189b2c2fba0e73ffeefe4f127dfe5f084;hp=19617391dd6837fe072d68f9992e1667c8af964c;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 19617391dd..e042a22f52 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,55 +1,58 @@
 <?php
-
+/**
+ * @file mod/oexchange.php
+ */
 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\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' => System::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);
+		info(L10n::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 = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&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');