From: Roland Häder Date: Sun, 13 May 2018 12:20:15 +0000 (+0200) Subject: Beatification: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=99440f3c56d1a87aa5aa357d68e371c726f6ba0a;p=friendica.git Beatification: - added space after curly braces (MrPetovan) - added TODO for possible rewrite candidate Signed-off-by: Roland Häder --- diff --git a/mod/share.php b/mod/share.php index ed9b5f9d17..555273443c 100644 --- 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 0f9cbeafab..00bb91f8de 100644 --- 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