namespace Friendica\Model;
-use DOMDocument;
-use DOMXPath;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Hook;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
-use Friendica\Model\Tag;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\DI;
if (($uid != 0) && (($item['gravity'] == self::GRAVITY_PARENT) || $is_reshare) &&
DI::pConfig()->get($uid, 'system', 'accept_only_sharer') == self::COMPLETION_NONE &&
- !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC])) {
+ !in_array($item['post-reason'], [self::PR_FOLLOWER, self::PR_TAG, self::PR_TO, self::PR_CC, self::PR_ACTIVITY])) {
Logger::info('Contact is not a follower, thread will not be stored', ['author' => $item['author-link'], 'uid' => $uid, 'uri-id' => $uri_id, 'post-reason' => $item['post-reason']]);
return 0;
}
return;
}
- if (!DBA::exists('contact', ['id' => $item['contact-id'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
+ $cdata = Contact::getPublicAndUserContactID($item['author-id'], $item['uid']);
+ if (empty($cdata['user']) || ($cdata['user'] != $item['contact-id'])) {
+ return;
+ }
+
+ if (!DBA::exists('contact', ['id' => $cdata['user'], 'remote_self' => Contact::MIRROR_NATIVE_RESHARE])) {
return;
}
'filter_reasons' => $filter_reasons
];
Hook::callAll('prepare_body', $hook_data);
+ $s = $hook_data['html'];
+
unset($hook_data);
if (!$attach) {
*/
public static function makeImageGrid(array $images): string
{
- $img_tags_landscape = array();
- $img_tags_portrait = array();
+ $landscapeimages = [];
+ $portraitimages = [];
+
foreach ($images as $image) {
- ($image['attachment']['width'] > $image['attachment']['height']) ? ($img_tags_landscape[] = $image) : ($img_tags_portrait[] = $image);
- }
+ ($image['attachment']['width'] > $image['attachment']['height']) ? ($landscapeimages[] = $image) : ($portraitimages[] = $image);
+ }
+
+ // Image for first column (fc) and second column (sc)
+ $images_fc = [];
+ $images_sc = [];
+ $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++];
+ }
- // @todo add some fany ai to divide images equally on both columns
- $img_tags_fc = array();
- $img_tags_sc = array();
- if (count($img_tags_landscape) == 0) {
- // only portrait
- for ($i = 0; $i < count($img_tags_portrait); $i++) {
- ($i % 2 == 0) ? ($img_tags_fc[] = $img_tags_portrait[$i]) : ($img_tags_sc[] = $img_tags_portrait[$i]);
+ }
}
- }
- if (count($img_tags_portrait) == 0) {
- // ony landscapes
- for ($i = 0; $i < count($img_tags_landscape); $i++) {
- ($i % 2 == 0) ? ($img_tags_fc[] = $img_tags_landscape[$i]) : ($img_tags_sc[] = $img_tags_landscape[$i]);
+ 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++;
+ }
+
+ }
+ 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];
+ }
+ }
+ }
}
}
- $media = Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
+ return Renderer::replaceMacros(Renderer::getMarkupTemplate('content/image_grid.tpl'), [
'columns' => [
- 'fc' => $img_tags_fc,
- 'sc' => $img_tags_sc,
+ 'fc' => $images_fc,
+ 'sc' => $images_sc,
],
]);
- return $media;
}
/**
$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],
]);
}
}
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>';
}
}
}
if ($trailing != '') {
- $content .= '<div class="body-attach">' . $trailing . '<div class="clear"></div></div>';
+ $content .= '<div class="body-attach">' . $trailing . '</div>';
}
DI::profiler()->stopRecording();
projects / friendica.git / blobdiff