Remove deprecated code

[friendica.git] / src / Content / OEmbed.php

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 7adff8908682d26e189dec42198f870f0496a1c0..14253b490ca34067c56168252192cbc97025c34a 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -10,13 +10,11 @@ use DOMNode;
 use DOMText;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
+use Friendica\Core\Cache\Duration;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
@@ -45,7 +43,7 @@ class OEmbed
        }
 
        /**
-        * @brief Get data from an URL to embed its content.
+        * Get data from an URL to embed its content.
         *
         * @param string $embedurl     The URL from which the data should be fetched.
         * @param bool   $no_rich_type If set to true rich type content won't be fetched.
@@ -57,7 +55,7 @@ class OEmbed
        {
                $embedurl = trim($embedurl, '\'"');
 
-               $a = \get_app();
+               $a = DI::app();
 
                $cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl;
 
@@ -66,7 +64,7 @@ class OEmbed
                if (DBA::isResult($oembed_record)) {
                        $json_string = $oembed_record['content'];
                } else {
-                       $json_string = Cache::get($cache_key);
+                       $json_string = DI::cache()->get($cache_key);
                }
 
                // These media files should now be caught in bbcode.php
@@ -83,11 +81,9 @@ class OEmbed
 
                        if (!in_array($ext, $noexts)) {
                                // try oembed autodiscovery
-                               $redirects = 0;
-                               $html_text = Network::fetchUrl($embedurl, false, $redirects, 15, 'text/*');
+                               $html_text = Network::fetchUrl($embedurl, false, 15, 'text/*');
                                if ($html_text) {
-                                       $dom = new DOMDocument();
-                                       $dom->loadHTML($html_text);
+                                       $dom = @DOMDocument::loadHTML($html_text);
                                        if ($dom) {
                                                $xpath = new DOMXPath($dom);
                                                $entries = $xpath->query("//link[@type='application/json+oembed']");
@@ -122,12 +118,12 @@ class OEmbed
                                        'content' => $json_string,
                                        'created' => DateTimeFormat::utcNow()
                                ], true);
-                               $cache_ttl = Cache::DAY;
+                               $cache_ttl = Duration::DAY;
                        } else {
-                               $cache_ttl = Cache::FIVE_MINUTES;
+                               $cache_ttl = Duration::FIVE_MINUTES;
                        }
 
-                       Cache::set($cache_key, $json_string, $cache_ttl);
+                       DI::cache()->set($cache_key, $json_string, $cache_ttl);
                }
 
                if ($oembed->type == 'error') {
@@ -182,7 +178,6 @@ class OEmbed
                                        $tw = $th * $tr;
                                        $tpl = Renderer::getMarkupTemplate('oembed_video.tpl');
                                        $ret .= Renderer::replaceMacros($tpl, [
-                                               '$baseurl' => System::baseUrl(),
                                                '$embedurl' => $oembed->embed_url,
                                                '$escapedhtml' => base64_encode($oembed->html),
                                                '$tw' => $tw,
@@ -252,9 +247,9 @@ class OEmbed
 
        public static function BBCode2HTML($text)
        {
-               $stopoembed = Config::get("system", "no_oembed");
+               $stopoembed = DI::config()->get("system", "no_oembed");
                if ($stopoembed == true) {
-                       return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>" . L10n::t('Embedding disabled') . " : $1</i><!-- /oembed $1 -->", $text);
+                       return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "<!-- oembed $1 --><i>" . DI::l10n()->t('Embedding disabled') . " : $1</i><!-- /oembed $1 -->", $text);
                }
                return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", ['self', 'replaceCallback'], $text);
        }
@@ -275,8 +270,7 @@ class OEmbed
                        $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text));
 
                        // If it doesn't parse at all, just return the text.
-                       $dom = new DOMDocument();
-                       $dom->loadHTML($html_text);
+                       $dom = @DOMDocument::loadHTML($html_text);
                        if (!$dom) {
                                return $text;
                        }
@@ -301,14 +295,13 @@ class OEmbed
        /**
         * Determines if rich content OEmbed is allowed for the provided URL
         *
-        * @brief Determines if rich content OEmbed is allowed for the provided URL
         * @param string $url
         * @return boolean
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isAllowedURL($url)
        {
-               if (!Config::get('system', 'no_oembed_rich_content')) {
+               if (!DI::config()->get('system', 'no_oembed_rich_content')) {
                        return true;
                }
 
@@ -317,7 +310,7 @@ class OEmbed
                        return false;
                }
 
-               $str_allowed = Config::get('system', 'allowed_oembed', '');
+               $str_allowed = DI::config()->get('system', 'allowed_oembed', '');
                if (empty($str_allowed)) {
                        return false;
                }
@@ -349,7 +342,7 @@ class OEmbed
        }
 
        /**
-        * @brief Generates the iframe HTML for an oembed attachment.
+        * Generates the iframe HTML for an oembed attachment.
         *
         * Width and height are given by the remote, and are regularly too small for
         * the generated iframe.
@@ -377,16 +370,16 @@ class OEmbed
                }
                $width = '100%';
 
-               $src = System::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src);
-               return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $src . '" allowfullscreen scrolling="no" frameborder="no">' . L10n::t('Embedded content') . '</iframe>';
+               $src = DI::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src);
+               return '<iframe onload="resizeIframe(this);" class="embed_rich" height="' . $height . '" width="' . $width . '" src="' . $src . '" allowfullscreen scrolling="no" frameborder="no">' . DI::l10n()->t('Embedded content') . '</iframe>';
        }
 
        /**
+        * Generates attribute search XPath string
+        *
         * Generates an XPath query to select elements whose provided attribute contains
         * the provided value in a space-separated list.
         *
-        * @brief Generates attribute search XPath string
-        *
         * @param string $attr Name of the attribute to seach
         * @param string $value Value to search in a space-separated list
         * @return string
@@ -400,8 +393,6 @@ class OEmbed
        /**
         * Returns the inner XML string of a provided DOMNode
         *
-        * @brief Returns the inner XML string of a provided DOMNode
-        *
         * @param DOMNode $node
         * @return string
         */