X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=039a106e7d1750a908258bb8df2228082a9d8815;hb=0ab5fed64cdd737817489434f0f008646a28a61d;hp=69b1595c2059de1c799f81a13c8dc083e804e482;hpb=290b14a000e794d0c0805453800b965a65cf26c4;p=friendica.git
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 69b1595c20..039a106e7d 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1,6 +1,6 @@
getSharedPost($item, $fields);
if (!empty($shared['post'])) {
$shared_item = $shared['post'];
+ $shared_item['body'] = Post\Media::removeFromEndOfBody($shared_item['body']);
$quote_uri_id = $shared['post']['uri-id'];
$shared_links[] = strtolower($shared['post']['uri']);
$item['body'] = BBCode::removeSharedData($item['body']);
@@ -3060,8 +3067,6 @@ class Item
$attachments = Post\Media::splitAttachments($item['uri-id'], $shared_links, $item['has-media'] ?? false);
$item['body'] = self::replaceVisualAttachments($attachments, $item['body'] ?? '');
- $item['body'] = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", "\n", $item['body']);
-
self::putInCache($item);
$item['body'] = $body;
$s = $item["rendered-html"];
@@ -3096,7 +3101,7 @@ class Item
];
Hook::callAll('prepare_body', $hook_data);
$s = $hook_data['html'];
-
+
unset($hook_data);
if (!$attach) {
@@ -3144,122 +3149,14 @@ class Item
* @return string
* @throws \Friendica\Network\HTTPException\ServiceUnavailableException
*/
- public static function makeImageGrid(array $images): string
+ private static function makeImageGrid(array $images): string
{
- $landscapeimages = array();
- $portraitimages = array();
-
- 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);
- if ($lcount == 0 || $pcount == 0) {
- if ($lcount == 0) {
- // only portrait
- for ($i = 0; $i < $pcount; $i++) {
- ($i % 2 == 0) ? ($images_fc[] = $portraitimages[$i]) : ($images_sc[] = $portraitimages[$i]);
- }
- }
- if ($pcount == 0) {
- // ony landscapes
- for ($i = 0; $i < $lcount; $i++) {
- ($i % 2 == 0) ? ($images_fc[] = $landscapeimages[$i]) : ($images_sc[] = $landscapeimages[$i]);
- }
- }
- } else {
- // Mix of landscape and portrait images.
- if ($lcount == $pcount) {
- // equal amount of landscapes and portraits
- 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];
- }
- }
- }
- }
- if ($lcount > $pcount) {
- // More landscapes than portraits
- $p = 0;
- $l = 0;
- while ($l < $lcount) {
- if (($lcount > $l + 1) && ($pcount > $l)) {
- // we have one more landscape that can be used for the l-th portrait
- $images_fc[] = $landscapeimages[$l++];
- }
- $images_fc[] = $landscapeimages[$l++];
- if ($pcount > $p) {
- $images_sc[] = $portraitimages[$p++];
- }
-
- }
- }
- if ($lcount < $pcount) {
- // More portraits than landscapes
- if ($lcount % 2 == 0 && $pcount % 2 == 0) {
- /*
- * even number of landscapes and portraits, but fewer landscapes than portraits. Iterate to the end
- * of landscapes array
- */
- $i = 0;
- while ($i < $lcount) {
- if ($i % 2 == 0) {
- $images_fc[] = $landscapeimages[$i];
- $images_fc[] = $portraitimages[$i];
- } else {
- $images_sc[] = $portraitimages[$i];
- $images_sc[] = $landscapeimages[$i];
- }
- $i++;
- }
- // Rest portraits
- while ($i < $pcount) {
- if ($i % 2 == 0) {
- $images_fc[] = $portraitimages[$i];
- } else {
- $images_sc[] = $portraitimages[$i];
- }
- $i++;
- }
+ $images_fc = [];
+ $images_sc = [];
- }
- if ($lcount % 2 != 0 && $pcount % 2 == 0) {
- // uneven landscapes count even portraits count.
- for ($p = 0; $p < $pcount; $p++) {
- // --> First all portraits until
- if ($p % 2 == 0) {
- $images_fc[] = $portraitimages[$p];
- } else {
- $images_sc[] = $portraitimages[$p];
- }
- }
- // and now the (uneven) landscapes
- for ($l = 0; $l < $lcount; $l++) {
- // --> First all portraits until
- if ($l % 2 == 0) {
- $images_fc[] = $landscapeimages[$l];
- } else {
- $images_sc[] = $landscapeimages[$l];
- }
- }
- }
- }
+ for ($i = 0; $i < count($images); $i++) {
+ ($i % 2 == 0) ? ($images_fc[] = $images[$i]) : ($images_sc[] = $images[$i]);
}
return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
@@ -3270,6 +3167,7 @@ class Item
]);
}
+
/**
* Check if the body contains a link
*
@@ -3424,9 +3322,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],
]);
}
@@ -3439,15 +3336,15 @@ class Item
}
if ($shared) {
- $content = str_replace(BBCode::TOP_ANCHOR, '' . BBCode::TOP_ANCHOR, $content);
- $content = str_replace(BBCode::BOTTOM_ANCHOR, '' . BBCode::BOTTOM_ANCHOR, $content);
+ $content = str_replace(BBCode::TOP_ANCHOR, '' . $leading . '
' . BBCode::TOP_ANCHOR, $content);
+ $content = str_replace(BBCode::BOTTOM_ANCHOR, '' . $trailing . '
' . BBCode::BOTTOM_ANCHOR, $content);
} else {
if ($leading != '') {
- $content = '' . $content;
+ $content = '' . $leading . '
' . $content;
}
if ($trailing != '') {
- $content .= '';
+ $content .= '' . $trailing . '
';
}
}
@@ -3552,13 +3449,15 @@ class Item
}
// @todo Use a template
- $preview_mode = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
+ $preview_mode = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'preview_mode', BBCode::PREVIEW_LARGE);
if ($preview_mode != BBCode::PREVIEW_NONE) {
$rendered = BBCode::convertAttachment('', BBCode::INTERNAL, false, $data, $uriid, $preview_mode);
+ } else {
+ $rendered = '';
}
} elseif (!self::containsLink($content, $data['url'], Post\Media::HTML)) {
$rendered = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/link.tpl'), [
- '$url' => $data['url'],
+ '$url' => $data['url'],
'$title' => $data['title'],
]);
} else {
@@ -3607,7 +3506,7 @@ class Item
}
if ($trailing != '') {
- $content .= '';
+ $content .= '' . $trailing . '
';
}
DI::profiler()->stopRecording();