bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Beatification:

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

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-05-13 14:20:15 +02:00
parent 87dbe03521
commit 99440f3c56
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/share.php
View file

@ -5,6 +5,7 @@ use Friendica\Database\DBM;
function share_init(App $a) { function share_init(App $a) {
$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$post_id || !local_user()) { if (!$post_id || !local_user()) {
killme(); killme();
} }
@ -14,9 +15,11 @@ function share_init(App $a) {
WHERE `item`.`id` = %d LIMIT 1", WHERE `item`.`id` = %d LIMIT 1",
intval($post_id) intval($post_id)
); );
if (!DBM::is_result($r) || ($r[0]['private'] == 1)) { if (!DBM::is_result($r) || ($r[0]['private'] == 1)) {
killme(); killme();
} }
if (strpos($r[0]['body'], "[/share]") !== false) { if (strpos($r[0]['body'], "[/share]") !== false) {
$pos = strpos($r[0]['body'], "[share"); $pos = strpos($r[0]['body'], "[share");
$o = substr($r[0]['body'], $pos); $o = substr($r[0]['body'], $pos);
@ -26,6 +29,7 @@ function share_init(App $a) {
if ($r[0]['title']) { if ($r[0]['title']) {
$o .= '[b]'.$r[0]['title'].'[/b]'."\n"; $o .= '[b]'.$r[0]['title'].'[/b]'."\n";
} }
$o .= $r[0]['body']; $o .= $r[0]['body'];
$o .= "[/share]"; $o .= "[/share]";
} }
@ -34,6 +38,7 @@ function share_init(App $a) {
killme(); killme();
} }
/// @TODO Rewrite to handle over whole record array
function share_header($author, $profile, $avatar, $guid, $posted, $link) { function share_header($author, $profile, $avatar, $guid, $posted, $link) {
$header = "[share author='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $author). $header = "[share author='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $author).
"' profile='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $profile). "' profile='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $profile).
@ -42,9 +47,11 @@ function share_header($author, $profile, $avatar, $guid, $posted, $link) {
if ($guid) { if ($guid) {
$header .= "' guid='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $guid); $header .= "' guid='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $guid);
} }
if ($posted) { if ($posted) {
$header .= "' posted='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $posted); $header .= "' posted='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $posted);
} }
$header .= "' link='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $link)."']"; $header .= "' link='" . str_replace(["'", "[", "]"], ["&#x27;", "&#x5B;", "&#x5D;"], $link)."']";
return $header; return $header;

1
src/Protocol/DFRN.php
View file

@ -181,6 +181,7 @@ class DFRN
for ($x = 0; $x < count($groups); $x ++) { for ($x = 0; $x < count($groups); $x ++) {
$groups[$x] = '<' . intval($groups[$x]) . '>' ; $groups[$x] = '<' . intval($groups[$x]) . '>' ;
} }
$gs = implode('|', $groups); $gs = implode('|', $groups);
} else { } else {
$gs = '<<>>' ; // Impossible to match $gs = '<<>>' ; // Impossible to match