From 58d814b793a58a3fbdf1cf5b067d907194ae5661 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 25 Jan 2015 00:10:58 +0100 Subject: [PATCH] issue 1283 - Share-it button support for friendica --- include/conversation.php | 8 +++---- mod/bookmarklet.php | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 mod/bookmarklet.php diff --git a/include/conversation.php b/include/conversation.php index 558942063f..c97eb6e4af 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1102,16 +1102,16 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortsetloc' => t('set location'), '$noloc' => t('Clear browser location'), '$shortnoloc' => t('clear location'), - '$title' => "", + '$title' => $x['title'], '$placeholdertitle' => t('Set title'), - '$category' => "", + '$category' => $x['category'], '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), '$ptyp' => (($notes_cid) ? 'note' : 'wall'), - '$content' => '', - '$post_id' => '', + '$content' => $x['content'], + '$post_id' => $x['post_id'], '$baseurl' => $a->get_baseurl(true), '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php new file mode 100644 index 0000000000..96eb370287 --- /dev/null +++ b/mod/bookmarklet.php @@ -0,0 +1,46 @@ +'.t('Login').''; + $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); + return $o; + } + + $referer = normalise_link($_SERVER["HTTP_REFERER"]); + $page = normalise_link($a->get_baseurl()."/bookmarklet"); + + if (!strstr($referer, $page)) { + $content = add_page_info($_REQUEST["url"]); + + $x = array( + 'is_owner' => true, + 'allow_location' => $a->user['allow_location'], + 'default_location' => $a->user['default-location'], + 'nickname' => $a->user['nickname'], + 'lockstate' => ((is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))) ? 'lock' : 'unlock'), + 'default_perms' => get_acl_permissions($a->user), + 'acl' => populate_acl($a->user, $celeb), + 'bang' => '', + 'visitor' => 'block', + 'profile_uid' => local_user(), + 'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector + 'title' => $_REQUEST["title"], + 'content' => $content + ); + $o = status_editor($a,$x, 0, false); + $o .= ""; + } else { + $o = '

'.t('The post was created').'

'; + $o .= ""; + } + + return $o; +}