Normalize item body template variable name

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 14b1f548f82f4a30ee84c68c14c84c7a28b344ad..fd7303fa46f4d97090c539ea0df68d6eca2306f4 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -546,8 +546,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
                                $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
                                Hook::callAll('render_location',$locate);
-
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
+                               $location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
 
                                localize_item($item);
                                if ($mode === 'network-new') {
@@ -577,7 +576,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        unset($likebuttons['dislike']);
                                }
 
-                               $body = Item::prepareBody($item, true, $preview);
+                               $body_html = Item::prepareBody($item, true, $preview);
 
                                list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
 
@@ -602,7 +601,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'lock' => $lock,
                                        'thumb' => DI::baseUrl()->remove($item['author-avatar']),
                                        'title' => $title,
-                                       'body' => $body,
+                                       'body_html' => $body_html,
                                        'tags' => $tags['tags'],
                                        'hashtags' => $tags['hashtags'],
                                        'mentions' => $tags['mentions'],
@@ -613,10 +612,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'has_folders' => ((count($folders)) ? 'true' : ''),
                                        'categories' => $categories,
                                        'folders' => $folders,
-                                       'text' => strip_tags($body),
+                                       'text' => strip_tags($body_html),
                                        'localtime' => DateTimeFormat::local($item['created'], 'r'),
                                        'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
-                                       'location' => $location,
+                                       'location_html' => $location_html,
                                        'indent' => '',
                                        'owner_name' => $owner_name,
                                        'owner_url' => $owner_url,
@@ -727,7 +726,12 @@ function conversation_fetch_comments($thread_items, $pinned) {
                        && ($row['thr-parent'] == $row['parent-uri']) && ($row['received'] > $received)
                        && Contact::isSharing($row['author-id'], $row['uid'])) {
                        $direction = ['direction' => 3, 'title' => DI::l10n()->t('%s reshared this.', $row['author-name'])];
-                       $actor = ['link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
+
+                       $author = ['uid' => 0, 'id' => $row['author-id'],
+                               'network' => $row['author-network'], 'url' => $row['author-link']];
+                       $url = '<a href="'. htmlentities(Contact::magicLinkByContact($author)) .'">' . htmlentities($row['author-name']) . '</a>';
+
+                       $actor = ['url' => $url, 'link' => $row['author-link'], 'avatar' => $row['author-avatar'], 'name' => $row['author-name']];
                        $received = $row['received'];
                }
 
@@ -736,12 +740,38 @@ function conversation_fetch_comments($thread_items, $pinned) {
                        $direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])];
                }
 
-               if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])
-                       && !Contact::isSharing($row['author-id'], $row['uid'])) {
-                       if ($row['post-type'] == Item::PT_TAG) {
+               switch ($row['post-type']) {
+                       case Item::PT_TO:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'to')];
+                               break;
+                       case Item::PT_CC:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'cc')];
+                               break;
+                       case Item::PT_BTO:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bto')];
+                               break;
+                       case Item::PT_BCC:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bcc')];
+                               break;
+                       case Item::PT_FOLLOWER:
+                               $row['direction'] = ['direction' => 6, 'title' => DI::l10n()->t('You are following %s.', $row['author-name'])];
+                               break;
+                       case Item::PT_TAG:
                                $row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
-                       }
-               
+                               break;
+                       case Item::PT_ANNOUNCEMENT:
+                               $row['direction'] = ['direction' => 3, 'title' => DI::l10n()->t('Reshared')];
+                               break;
+                       case Item::PT_COMMENT:
+                               $row['direction'] = ['direction' => 5, 'title' => DI::l10n()->t('%s is participating in this thread.', $row['author-name'])];
+                               break;
+                       case Item::PT_STORED:
+                               $row['direction'] = ['direction' => 8, 'title' => DI::l10n()->t('Stored')];
+                               break;
+               }
+
+               if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) &&
+                       !Contact::isSharing($row['author-id'], $row['uid'])) {
                        $parentlines[] = $lineno;
                }
 
@@ -758,10 +788,13 @@ function conversation_fetch_comments($thread_items, $pinned) {
        if (!empty($direction)) {
                foreach ($parentlines as $line) {
                        $comments[$line]['direction'] = $direction;
-                       if (!empty($actor) && DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
-                               $comments[$line]['owner-link'] = $actor['link'];
-                               $comments[$line]['owner-avatar'] = $actor['avatar'];
-                               $comments[$line]['owner-name'] = $actor['name'];
+                       if (!empty($actor)) {
+                               $comments[$line]['reshared'] = DI::l10n()->t('%s reshared this.', $actor['url']);
+                               if (DI::pConfig()->get(local_user(), 'system', 'display_resharer')  ) {
+                                       $comments[$line]['owner-link'] = $actor['link'];
+                                       $comments[$line]['owner-avatar'] = $actor['avatar'];
+                                       $comments[$line]['owner-name'] = $actor['name'];
+                               }
                        }
                }
        }
@@ -1137,17 +1170,12 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
        $jotplugins = '';
        Hook::callAll('jot_tool', $jotplugins);
 
-       $query_str = DI::args()->getQueryString();
-       if (strpos($query_str, 'public=1') !== false) {
-               $query_str = str_replace(['?public=1', '&public=1'], ['', ''], $query_str);
-       }
-
        // $tpl = Renderer::replaceMacros($tpl,array('$jotplugins' => $jotplugins));
        $tpl = Renderer::getMarkupTemplate("jot.tpl");
 
        $o .= Renderer::replaceMacros($tpl,[
                '$new_post' => DI::l10n()->t('New Post'),
-               '$return_path'  => $query_str,
+               '$return_path'  => DI::args()->getQueryString(),
                '$action'       => 'item',
                '$share'        => ($x['button'] ?? '') ?: DI::l10n()->t('Share'),
                '$loading'      => DI::l10n()->t('Loading...'),
@@ -1173,7 +1201,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
                '$placeholdercategory' => Feature::isEnabled(local_user(), 'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : '',
                '$wait'         => DI::l10n()->t('Please wait'),
                '$permset'      => DI::l10n()->t('Permission settings'),
-               '$shortpermset' => DI::l10n()->t('permissions'),
+               '$shortpermset' => DI::l10n()->t('Permissions'),
                '$wall'         => $notes_cid ? 0 : 1,
                '$posttype'     => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE,
                '$content'      => $x['content'] ?? '',
@@ -1468,13 +1496,3 @@ function sort_thr_commented(array $a, array $b)
 {
        return strcmp($b['commented'], $a['commented']);
 }
-
-function render_location_dummy(array $item) {
-       if (!empty($item['location']) && !empty($item['location'])) {
-               return $item['location'];
-       }
-
-       if (!empty($item['coord']) && !empty($item['coord'])) {
-               return $item['coord'];
-       }
-}