X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FModule%2FOembed.php;h=7a28115d449013a790482c7853257591209bc002;hb=e1dfcc35d7a93c54bf7b751b9c2a3654470f7b05;hp=452162ff208f3af7f9db16107674679f91500bd7;hpb=1fa37586caa351b3bdb44920649ba0fa90c36bd0;p=friendica.git diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php index 452162ff20..7a28115d44 100644 --- a/src/Module/Oembed.php +++ b/src/Module/Oembed.php @@ -1,9 +1,31 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Content; +use Friendica\Core\System; +use Friendica\DI; +use Friendica\Util\Strings; /** * Oembed module @@ -16,27 +38,26 @@ use Friendica\Content; */ class Oembed extends BaseModule { - public static function content() + protected function content(array $request = []): string { - $a = self::getApp(); - // Unused form: /oembed/b2h?url=... - if ($a->argv[1] == 'b2h') { + if (DI::args()->getArgv()[1] == 'b2h') { $url = ["", trim(hex2bin($_REQUEST['url']))]; echo Content\OEmbed::replaceCallback($url); - killme(); + System::exit(); } // Unused form: /oembed/h2b?text=... - if ($a->argv[1] == 'h2b') { + if (DI::args()->getArgv()[1] == 'h2b') { $text = trim(hex2bin($_REQUEST['text'])); echo Content\OEmbed::HTML2BBCode($text); - killme(); + System::exit(); } - if ($a->argc == 2) { + // @TODO: Replace with parameter from router + if (DI::args()->getArgc() == 2) { echo ''; - $url = base64url_decode($a->argv[1]); + $url = Strings::base64UrlDecode(DI::args()->getArgv()[1]); $j = Content\OEmbed::fetchURL($url); // workaround for media.ccc.de (and any other endpoint that return size 0) @@ -48,6 +69,6 @@ class Oembed extends BaseModule echo $j->html; echo ''; } - killme(); + System::exit(); } }