Fix for author-thumb/owner-thumb - DFRN: Relocate stuff

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index 8ef144ea0fc1b4af04d5133405d65f3929f9f998..84425e8ef65d961ef92a0ea33493f36a6dfb2c55 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -396,18 +396,22 @@ function bb_ShareAttributes($share, $simplehtml) {
 
        $itemcache = get_itemcachepath();
 
-       // relative dates only make sense when they aren't cached
-       if ($itemcache == "") {
-               preg_match("/posted='(.*?)'/ism", $attributes, $matches);
-               if ($matches[1] != "")
-                       $posted = $matches[1];
+       preg_match("/posted='(.*?)'/ism", $attributes, $matches);
+       if ($matches[1] != "")
+               $posted = $matches[1];
 
-               preg_match('/posted="(.*?)"/ism', $attributes, $matches);
-               if ($matches[1] != "")
-                       $posted = $matches[1];
+       preg_match('/posted="(.*?)"/ism', $attributes, $matches);
+       if ($matches[1] != "")
+               $posted = $matches[1];
 
+       // relative dates only make sense when they aren't cached
+       if ($itemcache == "")
                $reldate = (($posted) ? " " . relative_date($posted) : '');
-       }
+
+       // We only call this so that a previously unknown contact can be added.
+       // This is important for the function "get_contact_details_by_url".
+       // This function then can fetch an entry from the contact table.
+       get_contact($profile, 0);
 
        $data = get_contact_details_by_url($profile);
 
@@ -424,8 +428,8 @@ function bb_ShareAttributes($share, $simplehtml) {
        if (isset($data["name"]))
                $author = $data["name"];
 
-       if (isset($data["photo"]))
-               $avatar = $data["photo"];
+       if (isset($data["thumb"]))
+               $avatar = $data["thumb"];
 
        $preshare = trim($share[1]);
 
@@ -489,16 +493,22 @@ function bb_ShareAttributes($share, $simplehtml) {
                                $text .= "<br /><br />".$link;
                        break;
                default:
-                       $headline = trim($share[1])."\n";
-                       $headline .= '<div class="shared-wrapper">'."\n";
-                       $headline .= '<div class="shared_header">'."\n";
-                       if ($avatar != "")
-                               $headline .= '<img src="'.proxy_url($avatar, false, PROXY_SIZE_MICRO).'" height="32" width="32" >';
-
-                       $headline .= sprintf(t('<span><a href="%s" target="_blank">%s</a> wrote the following <a href="%s" target="_blank">post</a>'.$reldate.':</span>'), $profile, $author, $link);
-                       $headline .= "</div>\n";
-                       $text = $headline.'<blockquote class="shared_content">'.trim($share[3])."</blockquote>\n";
-                       $text .= "<div>\n";
+                       $text = trim($share[1])."\n";
+
+                       $avatar = proxy_url($avatar, false, PROXY_SIZE_THUMB);
+
+                       $tpl = get_markup_template('shared_content.tpl');
+                       $text .= replace_macros($tpl,
+                                       array(
+                                               '$profile' => $profile,
+                                               '$avatar' => $avatar,
+                                               '$author' => $author,
+                                               '$link' => $link,
+                                               '$posted' => $posted,
+                                               '$reldate' => $reldate,
+                                               '$content' => trim($share[3])
+                                       )
+                               );
                        break;
        }
        return($text);
@@ -812,7 +822,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
                $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
                        '$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
                        $Text);
-
+       elseif (!$simplehtml)
+               $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+                       '$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
+                       $Text);
 
        // Bookmarks in red - will be converted to bookmarks in friendica
        $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text);
@@ -854,6 +867,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
        if ($tryoembed)
                $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text);
 
+       $Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+                               '$1<a href="$2" class="tag" title="$3">$3</a>', $Text);
+
        $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$1</a>', $Text);
        $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
        //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);