Merge pull request #7958 from tobiasd/20191216-lng

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 5de7358f75b4e88ea6c37397fba84d66227035b2..db3c4d429bb29680989524d419ae4f4d0b939e40 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -404,9 +404,9 @@ class Photo extends BaseObject
                        "photo", ["resource-id"], ["uid" => $uid, "contact-id" => $cid, "scale" => 4, "album" => "Contact Photos"]
                );
                if (!empty($photo['resource-id'])) {
-                       $hash = $photo["resource-id"];
+                       $resource_id = $photo["resource-id"];
                } else {
-                       $hash = self::newResource();
+                       $resource_id = self::newResource();
                }
 
                $photo_failure = false;
@@ -432,7 +432,7 @@ class Photo extends BaseObject
                if ($Image->isValid()) {
                        $Image->scaleToSquare(300);
 
-                       $r = self::store($Image, $uid, $cid, $hash, $filename, "Contact Photos", 4);
+                       $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 4);
 
                        if ($r === false) {
                                $photo_failure = true;
@@ -440,7 +440,7 @@ class Photo extends BaseObject
 
                        $Image->scaleDown(80);
 
-                       $r = self::store($Image, $uid, $cid, $hash, $filename, "Contact Photos", 5);
+                       $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 5);
 
                        if ($r === false) {
                                $photo_failure = true;
@@ -448,7 +448,7 @@ class Photo extends BaseObject
 
                        $Image->scaleDown(48);
 
-                       $r = self::store($Image, $uid, $cid, $hash, $filename, "Contact Photos", 6);
+                       $r = self::store($Image, $uid, $cid, $resource_id, $filename, "Contact Photos", 6);
 
                        if ($r === false) {
                                $photo_failure = true;
@@ -456,24 +456,24 @@ class Photo extends BaseObject
 
                        $suffix = "?ts=" . time();
 
-                       $image_url = System::baseUrl() . "/photo/" . $hash . "-4." . $Image->getExt() . $suffix;
-                       $thumb = System::baseUrl() . "/photo/" . $hash . "-5." . $Image->getExt() . $suffix;
-                       $micro = System::baseUrl() . "/photo/" . $hash . "-6." . $Image->getExt() . $suffix;
+                       $image_url = System::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix;
+                       $thumb = System::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix;
+                       $micro = System::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
 
                        // Remove the cached photo
                        $a = \get_app();
                        $basepath = $a->getBasePath();
 
                        if (is_dir($basepath . "/photo")) {
-                               $filename = $basepath . "/photo/" . $hash . "-4." . $Image->getExt();
+                               $filename = $basepath . "/photo/" . $resource_id . "-4." . $Image->getExt();
                                if (file_exists($filename)) {
                                        unlink($filename);
                                }
-                               $filename = $basepath . "/photo/" . $hash . "-5." . $Image->getExt();
+                               $filename = $basepath . "/photo/" . $resource_id . "-5." . $Image->getExt();
                                if (file_exists($filename)) {
                                        unlink($filename);
                                }
-                               $filename = $basepath . "/photo/" . $hash . "-6." . $Image->getExt();
+                               $filename = $basepath . "/photo/" . $resource_id . "-6." . $Image->getExt();
                                if (file_exists($filename)) {
                                        unlink($filename);
                                }
@@ -715,4 +715,25 @@ class Photo extends BaseObject
 
                return DBA::exists('photo', ['resource-id' => $guid]);
        }
+
+       /**
+        * Tests if the link points to a locally stored picture page
+        *
+        * @param string $name Page link
+        * @return boolean
+        * @throws \Exception
+        */
+       public static function isLocalPage($name)
+       {
+               $a = \get_app();
+               $base = $a->getBaseURL();
+
+               $guid = str_replace(Strings::normaliseLink($base), '', Strings::normaliseLink($name));
+               $guid = preg_replace("=/photos/.*/image/(.*)=ism", '$1', $guid);
+               if (empty($guid)) {
+                       return false;
+               }
+
+               return DBA::exists('photo', ['resource-id' => $guid]);
+       }
 }