sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 04:23:01 +00:00
Code Activity

Add additional headers to save action

Browse source
This commit is contained in:
Starbeamrainbowlabs 2018-04-22 17:58:48 +01:00
parent 407d383a12
commit 3c21f371f6
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -12,6 +12,7 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t
- [Rest API] Added `format` parameter to `recentchanges` action - [Rest API] Added `format` parameter to `recentchanges` action
- [Rest API] Added `comments-fetch` action to return a page's comments as JSON - [Rest API] Added `comments-fetch` action to return a page's comments as JSON
- [Rest API] Added `acquire-edit-key` action to allow scripts and other automated services (e.g. bots and [mobile apps](https://github.com/sbrl/Pepperminty-Wiki-Client-Android)) to fetch an edit key for a specified page name. - [Rest API] Added `acquire-edit-key` action to allow scripts and other automated services (e.g. bots and [mobile apps](https://github.com/sbrl/Pepperminty-Wiki-Client-Android)) to fetch an edit key for a specified page name.
- [Rest API] Added extra headers to `save` action on failure to aid identification by automated services
### Fixed ### Fixed
- Fixed various issues with both the module api & the rest api docs. - Fixed various issues with both the module api & the rest api docs.

6
build/index.php
View file

@ -387,7 +387,7 @@ if($settings->css === "auto")
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
/** The version of Pepperminty Wiki currently running. */ /** The version of Pepperminty Wiki currently running. */
$version = "v0.16-dev"; $version = "v0.16-dev";
$commit = "121183a7fd298d52fa4d81a30a5f3e084ed66a33"; $commit = "407d383a12f9db677bbce71cfaaaf49f1a809ee5";
/// Environment /// /// Environment ///
/** Holds information about the current request environment. */ /** Holds information about the current request environment. */
$env = new stdClass(); $env = new stdClass();
@ -6518,6 +6518,7 @@ window.addEventListener("load", function(event) {
if(!$settings->editing) if(!$settings->editing)
{ {
header("x-failure-reason: editing-disabled");
header("location: index.php?page=" . rawurlencode($env->page)); header("location: index.php?page=" . rawurlencode($env->page));
exit(page_renderer::render_main("Error saving edit", "<p>Editing is currently disabled on this wiki.</p>")); exit(page_renderer::render_main("Error saving edit", "<p>Editing is currently disabled on this wiki.</p>"));
} }
@ -6525,6 +6526,7 @@ window.addEventListener("load", function(event) {
{ {
http_response_code(403); http_response_code(403);
header("refresh: 5; url=index.php?page=" . rawurlencode($env->page)); header("refresh: 5; url=index.php?page=" . rawurlencode($env->page));
header("x-login-required: yes");
exit("You are not logged in, so you are not allowed to save pages on $settings->sitename. Redirecting in 5 seconds...."); exit("You are not logged in, so you are not allowed to save pages on $settings->sitename. Redirecting in 5 seconds....");
} }
if(( if((
@ -6618,6 +6620,7 @@ DIFFSCRIPT;
$content .= "\n<script src='diff.min.js'></script> $content .= "\n<script src='diff.min.js'></script>
<script>$diffScript</script>\n"; <script>$diffScript</script>\n";
header("x-failure-reason: edit-conflict");
exit(page_renderer::render_main("Edit Conflict - $env->page - $settings->sitename", $content)); exit(page_renderer::render_main("Edit Conflict - $env->page - $settings->sitename", $content));
} }
} }
@ -6696,6 +6699,7 @@ DIFFSCRIPT;
} }
else else
{ {
header("x-failure-reason: server-error");
http_response_code(507); http_response_code(507);
exit(page_renderer::render_main("Error saving page - $settings->sitename", "<p>$settings->sitename failed to write your changes to the server's disk. Your changes have not been saved, but you might be able to recover your edit by pressing the back button in your browser.</p> exit(page_renderer::render_main("Error saving page - $settings->sitename", "<p>$settings->sitename failed to write your changes to the server's disk. Your changes have not been saved, but you might be able to recover your edit by pressing the back button in your browser.</p>
<p>Please tell the administrator of this wiki (" . $settings->admindetails_name . ") about this problem.</p>")); <p>Please tell the administrator of this wiki (" . $settings->admindetails_name . ") about this problem.</p>"));

2
module_index.json
View file

@ -167,7 +167,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.", "description": "Allows you to edit pages by adding the edit and save actions. You should probably include this one.",
"id": "page-edit", "id": "page-edit",
"lastupdate": 1524409010, "lastupdate": 1524416238,
"optional": false "optional": false
}, },
{ {

4
modules/page-edit.php
View file

@ -339,6 +339,7 @@ window.addEventListener("load", function(event) {
if(!$settings->editing) if(!$settings->editing)
{ {
header("x-failure-reason: editing-disabled");
header("location: index.php?page=" . rawurlencode($env->page)); header("location: index.php?page=" . rawurlencode($env->page));
exit(page_renderer::render_main("Error saving edit", "<p>Editing is currently disabled on this wiki.</p>")); exit(page_renderer::render_main("Error saving edit", "<p>Editing is currently disabled on this wiki.</p>"));
} }
@ -346,6 +347,7 @@ window.addEventListener("load", function(event) {
{ {
http_response_code(403); http_response_code(403);
header("refresh: 5; url=index.php?page=" . rawurlencode($env->page)); header("refresh: 5; url=index.php?page=" . rawurlencode($env->page));
header("x-login-required: yes");
exit("You are not logged in, so you are not allowed to save pages on $settings->sitename. Redirecting in 5 seconds...."); exit("You are not logged in, so you are not allowed to save pages on $settings->sitename. Redirecting in 5 seconds....");
} }
if(( if((
@ -439,6 +441,7 @@ DIFFSCRIPT;
$content .= "\n<script src='diff.min.js'></script> $content .= "\n<script src='diff.min.js'></script>
<script>$diffScript</script>\n"; <script>$diffScript</script>\n";
header("x-failure-reason: edit-conflict");
exit(page_renderer::render_main("Edit Conflict - $env->page - $settings->sitename", $content)); exit(page_renderer::render_main("Edit Conflict - $env->page - $settings->sitename", $content));
} }
} }
@ -517,6 +520,7 @@ DIFFSCRIPT;
} }
else else
{ {
header("x-failure-reason: server-error");
http_response_code(507); http_response_code(507);
exit(page_renderer::render_main("Error saving page - $settings->sitename", "<p>$settings->sitename failed to write your changes to the server's disk. Your changes have not been saved, but you might be able to recover your edit by pressing the back button in your browser.</p> exit(page_renderer::render_main("Error saving page - $settings->sitename", "<p>$settings->sitename failed to write your changes to the server's disk. Your changes have not been saved, but you might be able to recover your edit by pressing the back button in your browser.</p>
<p>Please tell the administrator of this wiki (" . $settings->admindetails_name . ") about this problem.</p>")); <p>Please tell the administrator of this wiki (" . $settings->admindetails_name . ") about this problem.</p>"));