Merge https://github.com/friendica/friendica into pull

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
old mode 100755 (executable)
new mode 100644 (file)
index f6c025e..8358f67
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('bbcode.php');
+require_once('include/bbcode.php');
 
 function share_init(&$a) {
 
@@ -8,26 +8,41 @@ function share_init(&$a) {
        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` 
+               left 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','new_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'].
+                               "' posted='".$r[0]['created']."']\n";
+                       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 .= '&#x2672; [url=' . $r[0]['author-link'] . ']' . $r[0]['author-name'] . '[/url]';
+               $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 .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-               if($r[0]['title'])
-                       $o .= '<strong>' . $r[0]['title'] . '</strong><br />';
-               $o .= bbcode($r[0]['body'], true) . '<br />';
+               $o .= $r[0]['body'] . "\n" ;
+
+               $o .= (($r[0]['plink']) ? '[url=' . $r[0]['plink'] . ']' . t('link') . '[/url]' . "\n" : '');
        }
        echo $o;
-       killme();  
+       killme();
 }