Hash the URL before using it as cache key in Util\Images::getInfoFromURLCached

[friendica.git] / src / Util / Network.php

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 2c9949ee23bd93061304b0eeb883f5cafb4630c1..7c7269fa8f7b2f0cfcc63d08b97afee09a6d4525 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -25,6 +25,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Network\HTTPException\NotModifiedException;
 
 class Network
 {
@@ -268,7 +269,7 @@ class Network
                        $avatar['url'] = DI::baseUrl() . Contact::DEFAULT_AVATAR_PHOTO;
                }
 
-               Logger::log('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], Logger::DEBUG);
+               Logger::info('Avatar: ' . $avatar['email'] . ' ' . $avatar['url']);
                return $avatar['url'];
        }
 
@@ -434,7 +435,8 @@ class Network
         *
         * @param array $parsed URL parts
         *
-        * @return string The glued URL
+        * @return string The glued URL.
+        * @deprecated since version 2021.12, use a UriInterface object like GuzzleHttp\Psr7\Uri instead
         */
        public static function unparseURL(array $parsed)
        {
@@ -544,8 +546,18 @@ class Network
                header('Last-Modified: ' . $last_modified);
 
                if ($flag_not_modified) {
-                       header("HTTP/1.1 304 Not Modified");
-                       exit;
+                       throw new NotModifiedException();
                }
        }
+
+       /**
+        * Check if the given URL is a local link
+        *
+        * @param string $url 
+        * @return bool 
+        */
+       public static function isLocalLink(string $url)
+       {
+               return (strpos(Strings::normaliseLink($url), Strings::normaliseLink(DI::baseUrl())) !== false);
+       }
 }