Merge pull request #8253 from tobiasd/20200208-msg

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 296869aac9eb0d9f1f12afd2b8285c9063522c4e..3eb13460d4727c4108277ad6d0cca3c36669bed3 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -3,20 +3,20 @@
  * @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\DI;
+use Friendica\Module\Security\Login;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 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();
        }
 }
 
@@ -28,20 +28,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']))
-               ? 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 = 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;