Fixed max value check, improved request value fetching

[friendica.git] / mod / oexchange.php

diff --git a/mod/oexchange.php b/mod/oexchange.php
index f68fe6f2d2dbd09bf25f0a4ca98bb1a8282f1334..31306a608e9e378c7e4465b7ddb8f98e95fb6269 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,11 +23,10 @@ use Friendica\App;
 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')) {
+       if ((DI::args()->getArgc() > 1) && (DI::args()->getArgv()[1] === 'xrd')) {
                $tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl');
 
                $o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]);
@@ -43,20 +42,16 @@ function oexchange_content(App $a) {
                return $o;
        }
 
-       if (($a->argc > 1) && $a->argv[1] === 'done') {
+       if ((DI::args()->getArgc() > 1) && DI::args()->getArgv()[1] === 'done') {
                return;
        }
 
-       $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']))) : '');
+       $url         = !empty($_REQUEST['url'])         ? trim($_REQUEST['url'])         : '';
+       $title       = !empty($_REQUEST['title'])       ? trim($_REQUEST['title'])       : '';
+       $description = !empty($_REQUEST['description']) ? trim($_REQUEST['description']) : '';
+       $tags        = !empty($_REQUEST['tags'])        ? trim($_REQUEST['tags'])        : '';
 
-       $s = DI::httpRequest()->fetch(DI::baseUrl() . '/parse_url?url=' . $url . $title . $description . $tags);
+       $s = \Friendica\Content\Text\BBCode::embedURL($url, true, $title, $description, $tags);
 
        if (!strlen($s)) {
                return;