Do not add escaped lightbox group identifiers

markocupic · Nov 16, 2023 · e6e7fa6 · e6e7fa6
1 parent 5810926
commit e6e7fa6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,7 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text eol=lf
+
+#* text=auto
 
 # Custom for Visual Studio
 *.cs     diff=csharp

diff --git a/contao/templates/component/_album.html.twig b/contao/templates/component/_album.html.twig
@@ -6,7 +6,9 @@
     <div{{ attrs(album_inner_attributes|default).addClass('gc-album-list-inner') }}>
         {% block album_figure %}
             <div{{ attrs(album_figure_attributes|default).addClass('gc-album-list-figure') }}>
-                {{ contao_figure(album.figureUuid, album.figureSize, album.figureOptions) }}
+                {% include "@Contao/component/_figure.html.twig" with {
+                    figure: figure(album.figureUuid, album.figureSize, album.figureOptions)
+                } %}
             </div>
         {% endblock %}
 

diff --git a/contao/templates/component/_album_detail_view.html.twig b/contao/templates/component/_album_detail_view.html.twig
@@ -72,7 +72,9 @@
                     <{{ album_detail_picture_list_tag_name }}{{ attrs(album_detail_picture_list_attributes|default).addClass('gc-album-detail-picture-list') }}>
                         {% for picture in arrPictures %}
                             <{{ album_detail_picture_list_item_tag_name }}{{ attrs(album_detail_picture_list_item_attributes|default).addClass('gc-album-detail-picture-list-item') }}>
-                                {{ contao_figure(picture.figureUuid, picture.figureSize, picture.figureOptions) }}
+                                {% include "@Contao/component/_figure.html.twig" with {
+                                    figure: figure(picture.figureUuid, picture.figureSize, picture.figureOptions)
+                                } %}
                             </{{ album_detail_picture_list_item_tag_name }}>
                         {% endfor %}
                     </{{ album_detail_picture_list_tag_name }}>

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

diff --git a/src/DataContainer/GalleryCreatorAlbums.php b/src/DataContainer/GalleryCreatorAlbums.php
@@ -47,11 +47,11 @@
 use Markocupic\GalleryCreatorBundle\Revise\ReviseAlbumDatabase;
 use Markocupic\GalleryCreatorBundle\Security\GalleryCreatorAlbumPermissions;
 use Markocupic\GalleryCreatorBundle\Util\FileUtil;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment as TwigEnvironment;
 use Twig\Error\LoaderError;
@@ -71,7 +71,6 @@ class GalleryCreatorAlbums
     private Adapter $system;
     private Adapter $config;
 
-
     /**
      * @throws DoctrineDBALException
      * @throws Exception

diff --git a/src/DataContainer/GalleryCreatorPictures.php b/src/DataContainer/GalleryCreatorPictures.php
@@ -38,9 +38,9 @@
 use Markocupic\GalleryCreatorBundle\Model\GalleryCreatorPicturesModel;
 use Markocupic\GalleryCreatorBundle\Security\GalleryCreatorAlbumPermissions;
 use Markocupic\GalleryCreatorBundle\Util\FileUtil;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Twig\Environment as TwigEnvironment;
 

diff --git a/src/Util/PictureUtil.php b/src/Util/PictureUtil.php
@@ -101,15 +101,14 @@ public function getPictureData(GalleryCreatorPicturesModel $pictureModel, Conten
             '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)),
+            'singleImageUrl' => StringUtil::ampersand($objPage->getFrontendUrl((Config::get('useAutoItem') ? '/' : '/items/').Input::get('items').'/img/'.$filesModel->name)),
             'figureUuid' => $pictureModel->addCustomThumb && $pictureModel->customThumb ? $pictureModel->customThumb : $filesModel->uuid,
             'figureSize' => !empty($arrSize) ? $arrSize : null,
             'figureHref' => $href,
             'figureOptions' => [
                 'metadata' => new Metadata($arrMeta),
                 'enableLightbox' => (bool) $contentElementModel->gcFullSize,
-                'lightboxGroupIdentifier' => sprintf('data-lightbox="lb%s"', $pictureModel->pid),
-                //'lightboxSize' => '_big_size',
+                'lightboxGroupIdentifier' => sprintf('lb%s', $pictureModel->pid),
                 'linkHref' => $href,
             ],
         ];

diff --git a/src/Util/SecurityUtil.php b/src/Util/SecurityUtil.php
@@ -18,8 +18,8 @@
 use Contao\FrontendUser;
 use Contao\StringUtil;
 use Markocupic\GalleryCreatorBundle\Model\GalleryCreatorAlbumsModel;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 class SecurityUtil
 {