public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 16:15:55 +00:00
Code Issues Releases Wiki Activity

fix a bunch of bookmarklets login forms not leading back

Browse Source
This commit is contained in:
Andrew Dolgov
2021-03-04 13:40:54 +03:00
parent 30765805fd
commit 4fda5ccd0e
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/auth_internal/init.php
View File

@@ -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] ?? "");

8
plugins/bookmarklets/init.php
View File

@@ -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">