Merge pull request #2148 from annando/issue-1871

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index e307294a6db8aa5fe5e8ff8dd23da4a862c7ae91..085da4e30d8a8b6f15e343a480d6743f733def15 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,7 +1,4 @@
 <?php
-
-require_once('bbcode.php');
-
 function share_init(&$a) {
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
@@ -9,7 +6,7 @@ function share_init(&$a) {
                killme();
 
        $r = q("SELECT item.*, contact.network FROM `item` 
-               left join contact on `item`.`contact-id` = `contact`.`id` 
+               inner join contact on `item`.`contact-id` = `contact`.`id` 
                WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
 
                intval($post_id),
@@ -18,15 +15,13 @@ function share_init(&$a) {
        if(! count($r) || ($r[0]['private'] == 1))
                killme();
 
-       if (intval(get_config('system','new_share'))) {
+       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 author='".str_replace("'", "&#039;",$r[0]['author-name']).
-                               "' profile='".$r[0]['author-link'].
-                               "' avatar='".$r[0]['author-avatar'].
-                               "' link='".$r[0]['plink']."']\n";
+                       $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'];
@@ -45,3 +40,19 @@ function share_init(&$a) {
        echo $o;
        killme();
 }
+
+function share_header($author, $profile, $avatar, $guid, $posted, $link) {
+       $header = "[share author='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$author).
+               "' profile='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$profile).
+               "' avatar='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$avatar);
+
+       if ($guid)
+               $header .= "' guid='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$guid);
+
+       if ($posted)
+               $header .= "' posted='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$posted);
+
+       $header .= "' link='".str_replace(array("'", "[", "]"), array("&#x27;", "&#x5B;", "&#x5D;"),$link)."']";
+
+       return $header;
+}