Move L10n::t() calls to DI::l10n()->t() calls

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index 2e1d7a2dbc9f15b4e0e25a054f0843102123fec3..d1b5523a42f373b4e05f9027e75318cf159a0770 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -4,56 +4,55 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Module\Login;
+use Friendica\Core\Renderer;
+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 = 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(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)) {
+       if (!strlen($s)) {
                return;
        }
 
-       require_once('include/html2bbcode.php');
-
        $post = [];
 
        $post['profile_uid'] = local_user();
-       $post['return'] = '/oexchange/done' ;
+       $post['return'] = '/oexchange/done';
        $post['body'] = Friendica\Content\Text\HTML::toBBCode($s);
-       $post['type'] = 'wall';
 
        $_REQUEST = $post;
        require_once('mod/item.php');