Merge pull request #11972 from annando/issue-11969

[friendica.git] / mod / share.php

diff --git a/mod/share.php b/mod/share.php
index b18655aef88f16561c8da97cf6035e76115a2c9f..8f55781e52f540fc3249cd417bfb55b9c2383963 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -21,29 +21,34 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\Post;
+use Friendica\Util\Network;
 
 function share_init(App $a) {
        $post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
 
        if (!$post_id || !local_user()) {
-               exit();
+               System::exit();
        }
 
        $fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar',
-               'guid', 'created', 'plink', 'title'];
+               'guid', 'created', 'plink', 'uri', 'title', 'network'];
        $item = Post::selectFirst($fields, ['id' => $post_id]);
 
        if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
-               exit();
+               System::exit();
        }
 
        if (strpos($item['body'], "[/share]") !== false) {
                $pos = strpos($item['body'], "[share");
                $o = substr($item['body'], $pos);
+       } elseif (Network::isValidHttpUrl($item['uri']) && in_array($item['network'], Protocol::FEDERATED)) {
+               $o = "[share]" . $item['uri'] . "[/share]";
        } else {
                $o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
 
@@ -56,5 +61,5 @@ function share_init(App $a) {
        }
 
        echo $o;
-       exit();
+       System::exit();
 }