diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/auth_internal/init.php | 2 | ||||
| -rw-r--r-- | plugins/bookmarklets/init.php | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/auth_internal/init.php b/plugins/auth_internal/init.php index bc0527e7f..9155f8165 100644 --- a/plugins/auth_internal/init.php +++ b/plugins/auth_internal/init.php @@ -100,7 +100,7 @@ class Auth_Internal extends Auth_Base { <body class="flat ttrss_utility otp css_loading"> <h1><?= __("Authentication") ?></h1> <div class="content"> - <form dojoType="dijit.form.Form" action="public.php?return=<?= $return ?>" method="post" class="otpform"> + <form dojoType="dijit.form.Form" action="public.php?return=<?= urlencode(with_trailing_slash($return)) ?>" method="post" class="otpform"> <?php foreach (["login", "password", "bw_limit", "safe_mode", "remember_me", "profile"] as $key) { print \Controls\hidden_tag($key, $_POST[$key] ?? ""); diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php index ab88d48e7..4bd527623 100644 --- a/plugins/bookmarklets/init.php +++ b/plugins/bookmarklets/init.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(Config::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"> |