Beatification:

- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/mod/share.php b/mod/share.php
index ed9b5f9d17c49ac48b06d870f599b0fce4d03cba..555273443c6fc668b4bca76a7ddecf0b6ff26998 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -5,6 +5,7 @@ use Friendica\Database\DBM;
 
 function share_init(App $a) {
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+
        if (!$post_id || !local_user()) {
                killme();
        }
@@ -14,9 +15,11 @@ function share_init(App $a) {
                WHERE `item`.`id` = %d LIMIT 1",
                intval($post_id)
        );
+
        if (!DBM::is_result($r) || ($r[0]['private'] == 1)) {
                killme();
        }
+
        if (strpos($r[0]['body'], "[/share]") !== false) {
                $pos = strpos($r[0]['body'], "[share");
                $o = substr($r[0]['body'], $pos);
@@ -26,6 +29,7 @@ function share_init(App $a) {
                if ($r[0]['title']) {
                        $o .= '[b]'.$r[0]['title'].'[/b]'."\n";
                }
+
                $o .= $r[0]['body'];
                $o .= "[/share]";
        }
@@ -34,6 +38,7 @@ function share_init(App $a) {
        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).
@@ -42,9 +47,11 @@ function share_header($author, $profile, $avatar, $guid, $posted, $link) {
        if ($guid) {
                $header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
        }
+
        if ($posted) {
                $header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
        }
+
        $header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
 
        return $header;

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 0f9cbeafabbcef512c20923b7849c59784862f35..00bb91f8deb926ce75edbb211a1349a236ebe875 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -181,6 +181,7 @@ class DFRN
                                for ($x = 0; $x < count($groups); $x ++) {
                                        $groups[$x] = '<' . intval($groups[$x]) . '>' ;
                                }
+
                                $gs = implode('|', $groups);
                        } else {
                                $gs = '<<>>' ; // Impossible to match