issue 1283 - Share-it button support for friendica

diff --git a/include/conversation.php b/include/conversation.php
index 558942063f9382e7e95c66b3749625b910510eb7..c97eb6e4af22dfc3061ded1606410abce307ceb6 100644 (file)
--- 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 (file)
index 0000000..96eb370
--- /dev/null
+++ b/mod/bookmarklet.php
@@ -0,0 +1,46 @@
+<?php
+
+require_once('include/conversation.php');
+require_once('include/items.php');
+
+function bookmarklet_init(&$a) {
+       $_GET["mode"] = "minimal";
+}
+
+function bookmarklet_content(&$a) {
+       if(!local_user()) {
+               $o = '<h2>'.t('Login').'</h2>';
+               $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 .= "<script>window.resizeTo(800,550);</script>";
+       } else {
+               $o = '<h2>'.t('The post was created').'</h2>';
+               $o .= "<script>window.close()</script>";
+       }
+
+       return $o;
+}