Do not list a picture without a valid uuid

Author: markocupic

src/Controller/ContentElement/AbstractGalleryCreatorController.php

@@ -314,8 +314,11 @@ protected function addAlbumPicturesToTemplate(GalleryCreatorAlbumsModel $albumMo
             }
 
             if (null !== ($picturesModel = GalleryCreatorPicturesModel::findByPk($rowPicture['id']))) {
-                // Prevent overriding items with same basename
-                $arrPictures[$basename.'-id-'.$rowPicture['id']] = $this->pictureUtil->getPictureData($picturesModel, $contentModel);
+                if($picturesModel->uuid && $this->pictureUtil->pictureExists($picturesModel))
+                {
+                    // Prevent overriding items with same basename
+                    $arrPictures[$basename.'-id-'.$rowPicture['id']] = $this->pictureUtil->getPictureData($picturesModel, $contentModel);
+                }
             }
         }
 

src/Util/PictureUtil.php

@@ -53,10 +53,6 @@ public function getPictureData(GalleryCreatorPicturesModel $pictureModel, Conten
             return null;
         }
 
-        if (!is_file($filesModel->getAbsolutePath())) {
-            return null;
-        }
-
         // Meta
         $arrMeta = Frontend::getMetaData($filesModel->meta, $objPage->language);
 
@@ -66,7 +62,7 @@ public function getPictureData(GalleryCreatorPicturesModel $pictureModel, Conten
 
         $arrMeta['title'] = $pictureModel->caption ?? $arrMeta['title'];
 
-        // Get thumb dimensions
+        // Get the thumb dimensions
         $arrSize = StringUtil::deserialize($contentElementModel->gcSizeDetailView);
 
         $href = null;
@@ -98,15 +94,15 @@ public function getPictureData(GalleryCreatorPicturesModel $pictureModel, Conten
         return [
             'ownerRow' => $ownerModel ? $ownerModel->row() : [],
             'filesRow' => $filesModel->row(),
-            'pictureRow' => $pictureModel->row,
+            'pictureRow' => $pictureModel->row(),
             'albumRow' => $pictureModel->getRelated('pid')->row(),
             'meta' => $arrMeta,
             'href' => $href,
             'localMediaSrc' => $localMediaSrc,
             'socialMediaSrc' => $socialMediaSrc,
             'exif' => $this->galleryCreatorReadExifMetaData ? $this->getExif(new File($filesModel->path)) : [],
             'singleImageUrl' => StringUtil::ampersand($objPage->getFrontendUrl((Config::get('useAutoItem') ? '/' : '/items/').Input::get('items').'/img/'.$filesModel->name, $objPage->language)),
-            'figureUuid' => $pictureModel->addCustomThumb ? $pictureModel->customThumb : $filesModel->uuid,
+            'figureUuid' => $pictureModel->addCustomThumb && $pictureModel->customThumb ? $pictureModel->customThumb : $filesModel->uuid,
             'figureSize' => !empty($arrSize) ? $arrSize : null,
             'figureHref' => $href,
             'figureOptions' => [
@@ -133,4 +129,15 @@ public function getExif(File $file): array
 
         return $exif;
     }
+
+    public function pictureExists(GalleryCreatorPicturesModel $picturesModel): bool
+    {
+        $objFile = FilesModel::findByUuid($picturesModel->uuid);
+
+        if (null !== $objFile) {
+            return is_file($objFile->getAbsolutePath());
+        }
+
+        return false;
+    }
 }