Merge pull request #12425 from MrPetovan/task/11774-frio-remove-banner-setting

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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index f24771375d890c94fa199d26d4cfbb36b83e7709..28a45fbf0640707ea4f38ffe0aa784e392ba032c 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3096,7 +3096,7 @@ class Item
                ];
                Hook::callAll('prepare_body', $hook_data);
                $s = $hook_data['html'];
-               
+
                unset($hook_data);
 
                if (!$attach) {
@@ -3146,18 +3146,18 @@ class Item
         */
        public static function makeImageGrid(array $images): string
        {
-               $landscapeimages = array();
-               $portraitimages = array();
+               $landscapeimages = [];
+               $portraitimages  = [];
 
                foreach ($images as $image) {
                        ($image['attachment']['width'] > $image['attachment']['height']) ? ($landscapeimages[] = $image) : ($portraitimages[] = $image);
                }
 
                // Image for first column (fc) and second column (sc)
-               $images_fc = array();
-               $images_sc = array();
-               $lcount = count($landscapeimages);
-               $pcount = count($portraitimages);
+               $images_fc = [];
+               $images_sc = [];
+               $lcount    = count($landscapeimages);
+               $pcount    = count($portraitimages);
                if ($lcount == 0 || $pcount == 0) {
                        if ($lcount == 0) {
                                // only portrait
@@ -3175,13 +3175,22 @@ class Item
                        // Mix of landscape and portrait images.
                        if ($lcount == $pcount) {
                                // equal amount of landscapes and portraits
-                               for ($l = 0; $l < $lcount; $l++) {
-                                       if ($l % 2 == 0) {
-                                               $images_fc[] = $landscapeimages[$l];
-                                               $images_fc[] = $portraitimages[$l];
-                                       } else {
-                                               $images_sc[] = $portraitimages[$l];
-                                               $images_sc[] = $landscapeimages[$l];
+                               if ($lcount == 1) {
+                                       // one left / one right
+                                       $images_fc[] = $landscapeimages[0];
+                                       $images_sc[] = $portraitimages[0];
+                               } else {
+                                       // Distribute equal to both columns
+                                       for ($l = 0; $l < $lcount; $l++) {
+                                               if ($l % 2 == 0) {
+                                                       // landscape left and portrait right for even numbers
+                                                       $images_fc[] = $landscapeimages[$l];
+                                                       $images_fc[] = $portraitimages[$l];
+                                               } else {
+                                                       // portraits left and landscape right for odd numbers
+                                                       $images_sc[] = $portraitimages[$l];
+                                                       $images_sc[] = $landscapeimages[$l];
+                                               }
                                        }
                                }
                        }
@@ -3415,9 +3424,8 @@ class Item
                $media = '';
                if (count($images) > 1) {
                        $media = self::makeImageGrid($images);
-               }
-               elseif (count($images) == 1) {
-                       $media = $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
+               } elseif (count($images) == 1) {
+                       $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image.tpl'), [
                                '$image' => $images[0],
                        ]);
                }
@@ -3430,15 +3438,15 @@ class Item
                }
 
                if ($shared) {
-                       $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . BBCode::TOP_ANCHOR, $content);
-                       $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>' . BBCode::BOTTOM_ANCHOR, $content);
+                       $content = str_replace(BBCode::TOP_ANCHOR, '<div class="body-attach">' . $leading . '</div>' . BBCode::TOP_ANCHOR, $content);
+                       $content = str_replace(BBCode::BOTTOM_ANCHOR, '<div class="body-attach">' . $trailing . '</div>' . BBCode::BOTTOM_ANCHOR, $content);
                } else {
                        if ($leading != '') {
-                               $content = '<div class="body-attach">' . $leading . '<div class="clear"></div></div>' . $content;
+                               $content = '<div class="body-attach">' . $leading . '</div>' . $content;
                        }
 
                        if ($trailing != '') {
-                               $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+                               $content .= '<div class="body-attach">' . $trailing . '</div>';
                        }
                }
 
@@ -3598,7 +3606,7 @@ class Item
                }
 
                if ($trailing != '') {
-                       $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+                       $content .= '<div class="body-attach">' . $trailing . '</div>';
                }
 
                DI::profiler()->stopRecording();