sbrl-github/Pepperminty-Wiki
sbrl-github
/
Pepperminty-Wiki
mirror of https://github.com/sbrl/Pepperminty-Wiki.git
1
0
Fork 0
Code

Bugfix: Correct is logged in check when restoring page revisions

This commit is contained in:
Starbeamrainbowlabs 2018-07-03 11:57:53 +01:00
parent 6e7698b4a9
commit 819489a7fb
Signed by: sbrl
GPG Key ID: 1BE5172E637709C2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/index.php
View File

@ -404,7 +404,7 @@ if($settings->sessionprefix == "auto")
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** The version of Pepperminty Wiki currently running. */ /** The version of Pepperminty Wiki currently running. */
$version = "v0.17-dev"; $version = "v0.17-dev";
$commit = "06c2b3886826e915f709df06714c79b3a7a6dd18"; $commit = "6e7698b4a9210cd3198ee1bd2a117e7bcf162819";
/// Environment /// /// Environment ///
/** Holds information about the current request environment. */ /** Holds information about the current request environment. */
$env = new stdClass(); $env = new stdClass();
@ -3322,9 +3322,9 @@ register_module([
global $env, $settings, $pageindex; global $env, $settings, $pageindex;
if((!$env->is_admin && $settings->history_revert_require_moderator) || if((!$env->is_admin && $settings->history_revert_require_moderator) ||
$env->is_logged_in) { !$env->is_logged_in) {
http_response_code(401); http_response_code(401);
exit(page_renderer::render_main("Unauthorised - $settings->sitename", "<p>You can't revert pages to a previous revision because " . ($settings->history_revert_require_moderator && $env->is_logged_in ? "you aren't logged in as a moderator. You can try <a href='?action=logout'>logging out</a> and then" : "you aren't logged in. You can try") . " <a href='?action=login&returnto=" . rawurlencode("?action=history-revert&revision={$env->history->revision_number}&page=" . rawurlencode($env->page)) . "logging in</a>.")); exit(page_renderer::render_main("Unauthorised - $settings->sitename", "<p>You can't revert pages to a previous revision because " . ($settings->history_revert_require_moderator && $env->is_logged_in ? "you aren't logged in as a moderator. You can try <a href='?action=logout'>logging out</a> and then" : "you aren't logged in. You can try") . " <a href='?action=login&returnto=" . rawurlencode("?action=history-revert&revision={$env->history->revision_number}&page=" . rawurlencode($env->page)) . "'>logging in</a>.</p>"));
} }
$current_revision_filepath = "$env->storage_prefix/{$pageindex->{$env->page}->filename}"; $current_revision_filepath = "$env->storage_prefix/{$pageindex->{$env->page}->filename}";

2
module_index.json
View File

@ -77,7 +77,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to keep unlimited page history, limited only by your disk space. Note that this doesn't store file history (yet). Currently depends on feature-recent-changes for rendering of the history page.", "description": "Adds the ability to keep unlimited page history, limited only by your disk space. Note that this doesn't store file history (yet). Currently depends on feature-recent-changes for rendering of the history page.",
"id": "feature-history", "id": "feature-history",
"lastupdate": 1530615218, "lastupdate": 1530615427,
"optional": false "optional": false
}, },
{ {

4
modules/feature-history.php
View File

@ -116,9 +116,9 @@ register_module([
global $env, $settings, $pageindex; global $env, $settings, $pageindex;
if((!$env->is_admin && $settings->history_revert_require_moderator) || if((!$env->is_admin && $settings->history_revert_require_moderator) ||
$env->is_logged_in) { !$env->is_logged_in) {
http_response_code(401); http_response_code(401);
exit(page_renderer::render_main("Unauthorised - $settings->sitename", "<p>You can't revert pages to a previous revision because " . ($settings->history_revert_require_moderator && $env->is_logged_in ? "you aren't logged in as a moderator. You can try <a href='?action=logout'>logging out</a> and then" : "you aren't logged in. You can try") . " <a href='?action=login&returnto=" . rawurlencode("?action=history-revert&revision={$env->history->revision_number}&page=" . rawurlencode($env->page)) . "logging in</a>.")); exit(page_renderer::render_main("Unauthorised - $settings->sitename", "<p>You can't revert pages to a previous revision because " . ($settings->history_revert_require_moderator && $env->is_logged_in ? "you aren't logged in as a moderator. You can try <a href='?action=logout'>logging out</a> and then" : "you aren't logged in. You can try") . " <a href='?action=login&returnto=" . rawurlencode("?action=history-revert&revision={$env->history->revision_number}&page=" . rawurlencode($env->page)) . "'>logging in</a>.</p>"));
} }
$current_revision_filepath = "$env->storage_prefix/{$pageindex->{$env->page}->filename}"; $current_revision_filepath = "$env->storage_prefix/{$pageindex->{$env->page}->filename}";