diff options
Diffstat (limited to 'plugins/bookmarklets/init.php')
| -rw-r--r-- | plugins/bookmarklets/init.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index 967918823..4bd527623 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.php @@ -3,7 +3,7 @@ class Bookmarklets extends Plugin { private $host; function about() { - return array(1.0, + return array(null, "Easy feed subscription and web page sharing using bookmarklets", "fox", false, @@ -146,7 +146,7 @@ class Bookmarklets extends Plugin { if ($feed_id) { ?> - <form method='GET' action="<?= htmlspecialchars(get_self_url_prefix() . "/prefs.php") ?>"> + <form method='GET' action="<?= htmlspecialchars(Config::get_self_url() . "/prefs.php") ?>"> <input type='hidden' name='tab' value='feeds'> <input type='hidden' name='method' value='editfeed'> <input type='hidden' name='methodparam' value="<?= $feed_id ?>"> @@ -154,7 +154,7 @@ class Bookmarklets extends Plugin { <a href='index.php'><?= __("Return to Tiny Tiny RSS") ?></a> </form> <?php - } else { + } else if (!$feed_urls) { ?> <a href='index.php'><?= __("Return to Tiny Tiny RSS") ?></a> <?php @@ -167,7 +167,7 @@ class Bookmarklets extends Plugin { </html> <?php } else { - Handler_Public::_render_login_form(); + Handler_Public::_render_login_form($this->host->get_public_method_url($this, "subscribe")); } } @@ -289,10 +289,12 @@ class Bookmarklets extends Plugin { } } else { - print_error("Not logged in"); + $return_to = $this->host->get_public_method_url($this, "sharepopup"); ?> - <form action="public.php?return=<?= urlencode(make_self_url()) ?>" method="post"> + <?= format_error("Not logged in") ?> + + <form action="public.php?return=<?= urlencode($return_to) ?>" method="post"> <input type="hidden" name="op" value="login"> |