new api for notifications

[friendica.git] / mod / bookmarklet.php

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index 96eb3702879736add9690bb20b5e94db27af8aaa..4db6bf401eef49d976e2f6e5f18c3abbb5590fb4 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -1,12 +1,14 @@
 <?php
-
 require_once('include/conversation.php');
 require_once('include/items.php');
 
+if(! function_exists('bookmarklet_init')) {
 function bookmarklet_init(&$a) {
        $_GET["mode"] = "minimal";
 }
+}
 
+if(! function_exists('bookmarklet_content')) {
 function bookmarklet_content(&$a) {
        if(!local_user()) {
                $o = '<h2>'.t('Login').'</h2>';
@@ -27,12 +29,12 @@ function bookmarklet_content(&$a) {
                        '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),
+                       'acl' => populate_acl($a->user,true),
                        'bang' => '',
                        'visitor' => 'block',
                        'profile_uid' => local_user(),
                        'acl_data' => construct_acl_data($a, $a->user), // For non-Javascript ACL selector
-                       'title' => $_REQUEST["title"],
+                       'title' => trim($_REQUEST["title"], "*"),
                        'content' => $content
                );
                $o = status_editor($a,$x, 0, false);
@@ -44,3 +46,4 @@ function bookmarklet_content(&$a) {
 
        return $o;
 }
+}