admin mail list seems wrong escaped

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index e6c787915fb5dd14367fe8d5fcead8c7ea7fe4eb..37752c083e66d6ab8c7e8cdd4fc359ad7da13f8f 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -210,8 +210,8 @@ function localize_item(&$item)
                foreach ($links->link as $l) {
                        $atts = $l->attributes();
                        switch ($atts['rel']) {
-                               case "alternate": $Blink = $atts['href'];
-                               case "photo": $Bphoto = $atts['href'];
+                               case "alternate": $Blink = $atts['href']; break;
+                               case "photo": $Bphoto = $atts['href']; break;
                        }
                }
 
@@ -365,7 +365,7 @@ function localize_item(&$item)
 
        // Only create a redirection to a magic link when logged in
        if (!empty($item['plink']) && (local_user() || remote_user())) {
-               $item['plink'] = Contact::magicLinkbyContact($author, $item['plink']);
+               $item['plink'] = Contact::magicLinkByContact($author, $item['plink']);
        }
 }
 
@@ -625,7 +625,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
                                $author = ['uid' => 0, 'id' => $item['author-id'],
                                        'network' => $item['author-network'], 'url' => $item['author-link']];
-                               $profile_link = Contact::magicLinkbyContact($author);
+                               $profile_link = Contact::magicLinkByContact($author);
 
                                if (strpos($profile_link, 'redir/') === 0) {
                                        $sparkle = ' sparkle';
@@ -660,21 +660,12 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
 
                                list($categories, $folders) = get_cats_and_terms($item);
 
-                               $profile_name_e = $profile_name;
-
                                if (!empty($item['content-warning']) && PConfig::get(local_user(), 'system', 'disable_cw', false)) {
-                                       $title_e = ucfirst($item['content-warning']);
+                                       $title = ucfirst($item['content-warning']);
                                } else {
-                                       $title_e = $item['title'];
+                                       $title = $item['title'];
                                }
 
-                               $body_e = $body;
-                               $tags_e = $tags['tags'];
-                               $hashtags_e = $tags['hashtags'];
-                               $mentions_e = $tags['mentions'];
-                               $location_e = $location;
-                               $owner_name_e = $owner_name;
-
                                $tmp_item = [
                                        'template' => $tpl,
                                        'id' => ($preview ? 'P0' : $item['id']),
@@ -684,27 +675,28 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
                                        'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
                                        'profile_url' => $profile_link,
                                        'item_photo_menu' => item_photo_menu($item),
-                                       'name' => $profile_name_e,
+                                       'name' => $profile_name,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
                                        'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
-                                       'title' => $title_e,
-                                       'body' => $body_e,
-                                       'tags' => $tags_e,
-                                       'hashtags' => $hashtags_e,
-                                       'mentions' => $mentions_e,
+                                       'title' => $title,
+                                       'body' => $body,
+                                       'tags' => $tags['tags'],
+                                       'hashtags' => $tags['hashtags'],
+                                       'mentions' => $tags['mentions'],
+                                       'implicit_mentions' => $tags['implicit_mentions'],
                                        'txt_cats' => L10n::t('Categories:'),
                                        'txt_folders' => L10n::t('Filed under:'),
                                        'has_cats' => ((count($categories)) ? 'true' : ''),
                                        'has_folders' => ((count($folders)) ? 'true' : ''),
                                        'categories' => $categories,
                                        'folders' => $folders,
-                                       'text' => strip_tags($body_e),
+                                       'text' => strip_tags($body),
                                        'localtime' => DateTimeFormat::local($item['created'], 'r'),
                                        'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
-                                       'location' => $location_e,
+                                       'location' => $location,
                                        'indent' => '',
-                                       'owner_name' => $owner_name_e,
+                                       'owner_name' => $owner_name,
                                        'owner_url' => $owner_url,
                                        'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
                                        'plink' => Item::getPlink($item),
@@ -858,7 +850,7 @@ function item_photo_menu($item) {
 
        $author = ['uid' => 0, 'id' => $item['author-id'],
                'network' => $item['author-network'], 'url' => $item['author-link']];
-       $profile_link = Contact::magicLinkbyContact($author);
+       $profile_link = Contact::magicLinkByContact($author, $item['author-link']);
        $sparkle = (strpos($profile_link, 'redir/') === 0);
 
        $cid = 0;
@@ -873,9 +865,9 @@ function item_photo_menu($item) {
        }
 
        if ($sparkle) {
-               $status_link = $profile_link . '?url=status';
-               $photos_link = $profile_link . '?url=photos';
-               $profile_link = $profile_link . '?url=profile';
+               $status_link = $profile_link . '?tab=status';
+               $photos_link = str_replace('/profile/', '/photos/', $profile_link);
+               $profile_link = $profile_link . '?=profile';
        }
 
        if ($cid && !$item['self']) {
@@ -966,7 +958,7 @@ function builtin_activity_puller($item, &$conv_responses) {
                if (activity_match($item['verb'], $verb) && ($item['id'] != $item['parent'])) {
                        $author = ['uid' => 0, 'id' => $item['author-id'],
                                'network' => $item['author-network'], 'url' => $item['author-link']];
-                       $url = Contact::magicLinkbyContact($author);
+                       $url = Contact::magicLinkByContact($author);
                        if (strpos($url, 'redir/') === 0) {
                                $sparkle = ' class="sparkle" ';
                        }
@@ -1044,7 +1036,6 @@ function format_like($cnt, array $arr, $type, $id) {
                }
        }
 
-       $phrase = '';
        if ($cnt > 1) {
                $total = count($arr);
                if ($total < MAX_LIKERS) {
@@ -1083,10 +1074,9 @@ function format_like($cnt, array $arr, $type, $id) {
                                break;
                }
 
-               $expanded .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</div>';
+               $expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
        }
 
-       $phrase .= EOL;
        $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
                '$phrase' => $phrase,
                '$type' => $type,
@@ -1464,7 +1454,7 @@ function render_location_dummy(array $item) {
        }
 }
 
-function get_responses(array $conv_responses, array $response_verbs, $ob, array $item) {
+function get_responses(array $conv_responses, array $response_verbs, array $item, Post $ob = null) {
        $ret = [];
        foreach ($response_verbs as $v) {
                $ret[$v] = [];