X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Foexchange.php;h=d1b5523a42f373b4e05f9027e75318cf159a0770;hb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;hp=62d0bba078ef9fe00e9ddcb82a59e07bbb4f3b30;hpb=d4a02dc31408210ab9f67ecac1948dc22b95b8da;p=friendica.git

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 62d0bba078..d1b5523a42 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -5,8 +5,8 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Module\Login;
+use Friendica\DI;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
@@ -15,9 +15,9 @@ function oexchange_init(App $a) {
 	if (($a->argc > 1) && ($a->argv[1] === 'xrd')) {
 		$tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
-		$o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]);
+		$o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
 		echo $o;
-		killme();
+		exit();
 	}
 }
 
@@ -29,20 +29,20 @@ function oexchange_content(App $a) {
 	}
 
 	if (($a->argc > 1) && $a->argv[1] === 'done') {
-		info(L10n::t('Post successful.') . EOL);
+		info(DI::l10n()->t('Post successful.') . EOL);
 		return;
 	}
 
-	$url = ((x($_REQUEST,'url') && strlen($_REQUEST['url']))
+	$url = ((!empty($_REQUEST['url']))
 		? urlencode(Strings::escapeTags(trim($_REQUEST['url']))) : '');
-	$title = ((x($_REQUEST,'title') && strlen($_REQUEST['title']))
+	$title = ((!empty($_REQUEST['title']))
 		? '&title=' . urlencode(Strings::escapeTags(trim($_REQUEST['title']))) : '');
-	$description = ((x($_REQUEST,'description') && strlen($_REQUEST['description']))
+	$description = ((!empty($_REQUEST['description']))
 		? '&description=' . urlencode(Strings::escapeTags(trim($_REQUEST['description']))) : '');
-	$tags = ((x($_REQUEST,'tags') && strlen($_REQUEST['tags']))
+	$tags = ((!empty($_REQUEST['tags']))
 		? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : '');
 
-	$s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+	$s = Network::fetchUrl(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
 
 	if (!strlen($s)) {
 		return;