Skip to content

修复输入密码之后跳转空白 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DamonHu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

修复输入密码之后跳转空白 #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740a815
Update Plugin.php
DamonHu Mar 5, 2024
109f271
Update Plugin.php
DamonHu Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static function config(Typecho_Widget_Helper_Form $form) {
/** 密码区域 HTML */
$default = <<<TEXT
<div class="pp-block">
<form action="{targetUrl}" method="post" style="margin: 0;">
<form action="{targetUrl}" method="get" style="margin: 0;">
<input name="partiallyPassword" type="password" placeholder="{additionalContent}">
<input name="pid" type="hidden" value="{id}">
</form>
Expand Down Expand Up @@ -159,11 +159,11 @@ public static function footer(Widget_Archive $archive) {
private static function getRequestPassword($cid, $pid, $currentCid = -1) {
if ($currentCid == -1) $currentCid = $cid;
$request = new Typecho_Request();
$request_pid = isset($request->pid) ? intval($request->pid) : 0;
if ($request->isPost() && isset($request->partiallyPassword) && $request_pid === $pid) {
$request_pid = $request->get('pid') != null ? intval($request->get('pid')) : 0;
if ($request->get('pid') != null && $request_pid === $pid) {
if (@Helper::options()->plugin('PartiallyPassword')->checkReferer)
if (stripos($request->getReferer(), Helper::options()->rootUrl) !== 0) return;
return (new PasswordHash(8, true))->HashPassword($request->partiallyPassword);
return (new PasswordHash(8, true))->HashPassword($request->get('partiallyPassword'));
}
return Typecho_Cookie::get("partiallyPassword_{$cid}_{$pid}", '');
}
Expand Down Expand Up @@ -306,14 +306,14 @@ public static function pluginFields($layout) {
*/
public static function handleSubmit(Widget_Archive $archive, Typecho_Db_Query $select) {
if (!$archive->is('page') && !$archive->is('post')) return;
if ($archive->fields->pp_isEnabled && $archive->request->isPost() && isset($archive->request->partiallyPassword)) {
$pid = isset($archive->request->pid) ? intval($archive->request->pid) : 0;
if ($archive->fields->pp_isEnabled && $archive->request->get('partiallyPassword') != null) {
$pid = $archive->request->get('pid') != null ? intval($archive->request->get('pid')) : 0;
if ($pid < 0) return;
if (@Helper::options()->plugin('PartiallyPassword')->checkReferer)
if (stripos($archive->request->getReferer(), Helper::options()->rootUrl) !== 0) return;
Typecho_Cookie::set(
"partiallyPassword_{$archive->cid}_{$pid}",
(new PasswordHash(8, true))->HashPassword($archive->request->partiallyPassword)
(new PasswordHash(8, true))->HashPassword($archive->request->get('partiallyPassword'))
);
}
}
Expand Down