X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fshare.php;h=74de1967b44782542d7c081a654d59c90e159593;hb=dcb9bf41360d3f3b6949311254ff630187c4270a;hp=6c6098c83c07363e4aec0bdaa73630829b6b3355;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git
diff --git a/mod/share.php b/mod/share.php
index 6c6098c83c..74de1967b4 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,33 +1,57 @@
argc > 1) ? intval($a->argv[1]) : 0);
- if((! $post_id) || (! local_user()))
+
+ if (!$post_id || !local_user()) {
killme();
+ }
+
+ $fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
+ 'guid', 'created', 'plink', 'title'];
+ $item = Item::selectFirst($fields, ['id' => $post_id]);
- $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
- intval($post_id)
- );
- if(! count($r) || $r[0]['private'])
+ if (!DBA::isResult($item) || $item['private'] == 1) {
killme();
+ }
+
+ if (strpos($item['body'], "[/share]") !== false) {
+ $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']);
+
+ if ($item['title']) {
+ $o .= '[b]'.$item['title'].'[/b]'."\n";
+ }
+
+ $o .= $item['body'];
+ $o .= "[/share]";
+ }
- $o = '';
-
-// if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) {
- $o .= "\xE2\x99\xb2" . ' [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]' . "\n";
- if($r[0]['title'])
- $o .= '[b]' . $r[0]['title'] . '[/b]' . "\n";
- $o .= $r[0]['body'] . "\n";
-// }
-// else {
-// $o .= '♲ ' . $r[0]['author-name'] . '
';
-// if($r[0]['title'])
-// $o .= '' . $r[0]['title'] . '
';
-// $o .= $r[0]['body'] . "\n";
-// }
echo $o;
- killme();
+ killme();
+}
+
+/// @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;
}