X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=085da4e30d8a8b6f15e343a480d6743f733def15;hb=beb2346cfc8e3aa57ed0203e35034241e814b61a;hp=6c6098c83c07363e4aec0bdaa73630829b6b3355;hpb=cb05801a9031254f5882038de07a3ee4d5f89dd0;p=friendica.git
diff --git a/mod/share.php b/mod/share.php
index 6c6098c83c..085da4e30d 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,33 +1,58 @@
argc > 1) ? intval($a->argv[1]) : 0);
if((! $post_id) || (! local_user()))
killme();
- $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
- intval($post_id)
+ $r = q("SELECT item.*, contact.network FROM `item`
+ inner join contact on `item`.`contact-id` = `contact`.`id`
+ WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
+
+ intval($post_id),
+ intval(local_user())
);
- if(! count($r) || $r[0]['private'])
+ if(! count($r) || ($r[0]['private'] == 1))
killme();
- $o = '';
+ if (!intval(get_config('system','old_share'))) {
+ if (strpos($r[0]['body'], "[/share]") !== false) {
+ $pos = strpos($r[0]['body'], "[share");
+ $o = substr($r[0]['body'], $pos);
+ } else {
+ $o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']);
+
+ if($r[0]['title'])
+ $o .= '[b]'.$r[0]['title'].'[/b]'."\n";
+ $o .= $r[0]['body'];
+ $o.= "[/share]";
+ }
+ } else {
+ $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";
-// }
+ $o .= $r[0]['body'] . "\n" ;
+
+ $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
+ }
echo $o;
- killme();
+ killme();
+}
+
+function share_header($author, $profile, $avatar, $guid, $posted, $link) {
+ $header = "[share author='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$author).
+ "' profile='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$profile).
+ "' avatar='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$avatar);
+
+ if ($guid)
+ $header .= "' guid='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$guid);
+
+ if ($posted)
+ $header .= "' posted='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$posted);
+
+ $header .= "' link='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$link)."']";
+
+ return $header;
}