Merge remote-tracking branch 'origin/new_image_presentation' into new_image_presentation

# Conflicts:
#	src/Model/Item.php

diff --cc src/Model/Item.php
index 152543b91668f3cc49c67d556eb2e5021caeefef,634dbbd0ea76c13275aec6b9f65a6716259378f7..b7e7fe92c9b2015e2d5e0bb8bf2cf4a56b13b24d
--- 1/src/Model/Item.php
--- 2/src/Model/Item.php
+++ b/src/Model/Item.php
@@@ -3131,44 -3134,66 +3134,104 @@@ class Ite
                return $hook_data['html'];
        }
  
 +      private function make_image_grid(array &$data)
 +      {
 +              $item = $data['item'];
 +              if ($item['has-media']) {
 +                      $attachments = Post\Media::splitAttachments($item['uri-id'], [], $item['has-media'] ?? false);
 +                      if (count($attachments['visual']) > 1) {
 +                              $img_tags_fc = array();
 +                              $img_tags_sc = array();
 +                              $count = 0;
 +                              foreach ($attachments['visual'] as $attachment) {
 +                                      $src_url = Post\Media::getUrlForId($attachment['id']);
 +                                      $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
 +                                      $img_tag = array(
 +                                              '$image' => [
 +                                                      'src' => $src_url,
 +                                                      'preview' => $preview_url,
 +                                                      'attachment' => $attachment,
 +                                      ]);
 +                                      if ($count % 2 == 0) {
 +                                              $img_tags_fc[] = $img_tag;
 +                                      } else {
 +                                              $img_tags_sc[] = $img_tag;
 +                                      }
 +                                      ++$count;
 +                              }
 +
 +                              $img_grid = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
 +                                      'columns' => [
 +                                              'fc' => $img_tags_fc,
 +                                              'sc' => $img_tags_sc,
 +                                      ],
 +                              ]);
 +                              return $img_grid;
 +                      }
 +              }
 +
 +      }
 +
+       /**
+        * This function removes images at the very end of a post based on the assumption that this images are interpreted
+        * as attachments
+        * @param array $rendered_html
+        * @return array
+        */
+       private function cutAttachedImages(array &$rendered_html) {
+               $doc = new DOMDocument();
+               $doc->loadHTML($rendered_html);
+ 
+               $xpathsearch = new DOMXPath($doc);
+               $nodes = $xpathsearch->query("*");
+ 
+               return $nodes;
+       }
+ 
+       /**
+        * @param array $data
+        * @return string|void
+        * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
+        */
+       private function make_image_grid(array &$data)
+       {
+               $item = $data['item'];
+               if ($item['has-media']) {
+                       $attachments = Post\Media::splitAttachments($item['uri-id'], [], $item['has-media'] ?? false);
+                       if (count($attachments['visual']) > 1) {
+                               $img_tags_fc = array();
+                               $img_tags_sc = array();
+                               $count = 0;
+                               foreach ($attachments['visual'] as $attachment) {
+                                       $src_url = Post\Media::getUrlForId($attachment['id']);
+                                       $preview_url = Post\Media::getPreviewUrlForId($attachment['id'], ($attachment['width'] > $attachment['height']) ? Proxy::SIZE_MEDIUM : Proxy::SIZE_LARGE);
+                                       $img_tag = array(
+                                               '$image' => [
+                                                       'src' => $src_url,
+                                                       'preview' => $preview_url,
+                                                       'attachment' => $attachment,
+                                       ]);
+                                       // @todo add some fany ai to divide images equally on both columns
+                                       if ($count % 2 == 0) {
+                                               $img_tags_fc[] = $img_tag;
+                                       } else {
+                                               $img_tags_sc[] = $img_tag;
+                                       }
+                                       ++$count;
+                               }
+ 
+                               $img_grid = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
+                                       'columns' => [
+                                               'fc' => $img_tags_fc,
+                                               'sc' => $img_tags_sc,
+                                       ],
+                               ]);
+                               return $img_grid;
+                       }
+               }
+ 
+       }
+ 
        /**
         * Check if the body contains a link
         *