X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fshare.php;h=f2e016708fef321a74937e3c8c9be93e5ba87401;hb=c99247ddabe7e8383aa86f94d4ffae73e382a710;hp=e9127b647d4a9d321d3d2f3c2e019f37d33e5415;hpb=29092ace4428aeb796b31856aafa14cef1632bac;p=friendica.git diff --git a/mod/share.php b/mod/share.php index e9127b647d..f2e016708f 100644 --- a/mod/share.php +++ b/mod/share.php @@ -1,8 +1,5 @@ argc > 1) ? intval($a->argv[1]) : 0); if((! $post_id) || (! local_user())) @@ -15,7 +12,7 @@ function share_init(&$a) { intval($post_id), intval(local_user()) ); - if(! count($r) || ($r[0]['private'] == 1)) + if(! dbm::is_result($r) || ($r[0]['private'] == 1)) killme(); if (!intval(get_config('system','old_share'))) { @@ -23,11 +20,8 @@ function share_init(&$a) { $pos = strpos($r[0]['body'], "[share"); $o = substr($r[0]['body'], $pos); } else { - $o = "[share author='".str_replace("'", "'",$r[0]['author-name']). - "' profile='".$r[0]['author-link']. - "' avatar='".$r[0]['author-avatar']. - "' link='".$r[0]['plink']. - "' posted='".$r[0]['created']."']\n"; + $o = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']); + if($r[0]['title']) $o .= '[b]'.$r[0]['title'].'[/b]'."\n"; $o .= $r[0]['body']; @@ -46,3 +40,19 @@ function share_init(&$a) { echo $o; killme(); } + +function share_header($author, $profile, $avatar, $guid, $posted, $link) { + $header = "[share author='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$author). + "' profile='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$profile). + "' avatar='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$avatar); + + if ($guid) + $header .= "' guid='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$guid); + + if ($posted) + $header .= "' posted='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$posted); + + $header .= "' link='".str_replace(array("'", "[", "]"), array("'", "[", "]"),$link)."']"; + + return $header; +}