Merge pull request #9822 from annando/post-thread

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index 998ebe5fdeaa85c0a42358cd97aef64177ad26ee..b606c1a66916fb096c3c0841e67f1b44786c65e6 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -20,8 +20,10 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 
 function share_init(App $a) {
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
@@ -32,9 +34,9 @@ function share_init(App $a) {
 
        $fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
                'guid', 'created', 'plink', 'title'];
-       $item = Item::selectFirst($fields, ['id' => $post_id]);
+       $item = Post::selectFirst($fields, ['id' => $post_id]);
 
-       if (!DBA::isResult($item) || $item['private'] == 1) {
+       if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
                exit();
        }
 
@@ -42,7 +44,7 @@ function share_init(App $a) {
                $pos = strpos($item['body'], "[share");
                $o = substr($item['body'], $pos);
        } else {
-               $o = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
+               $o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
 
                if ($item['title']) {
                        $o .= '[h3]'.$item['title'].'[/h3]'."\n";
@@ -55,22 +57,3 @@ function share_init(App $a) {
        echo $o;
        exit();
 }
-
-/// @TODO Rewrite to handle over whole record array
-function share_header($author, $profile, $avatar, $guid, $posted, $link) {
-       $header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author).
-               "' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile).
-               "' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
-
-       if ($guid) {
-               $header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
-       }
-
-       if ($posted) {
-               $header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
-       }
-
-       $header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
-
-       return $header;
-}