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

Add rawurlencode() calls everywhere in the redirect logic to fix #139

This commit is contained in:
Starbeamrainbowlabs 2017-06-28 11:42:11 +01:00
parent 4ea4315c5a
commit 57acbc85b8
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/index.php
View File

@ -3038,7 +3038,7 @@ function render_recent_change($rchange)
register_module([ register_module([
"name" => "Redirect pages", "name" => "Redirect pages",
"version" => "0.3", "version" => "0.3.1",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds support for redirect pages. Uses the same syntax that Mediawiki does.", "description" => "Adds support for redirect pages. Uses the same syntax that Mediawiki does.",
"id" => "feature-redirect", "id" => "feature-redirect",
@ -3075,7 +3075,7 @@ register_module([
register_module([ register_module([
"name" => "Search", "name" => "Search",
"version" => "0.5", "version" => "0.5.1",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.", "description" => "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
"id" => "feature-search", "id" => "feature-search",
@ -6349,7 +6349,7 @@ register_module([
register_module([ register_module([
"name" => "Page viewer", "name" => "Page viewer",
"version" => "0.16.5", "version" => "0.16.6",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Allows you to view pages. You really should include this one.", "description" => "Allows you to view pages. You really should include this one.",
"id" => "page-view", "id" => "page-view",
@ -6412,7 +6412,7 @@ register_module([
{ {
// Todo send an explanatory page along with the redirect // Todo send an explanatory page along with the redirect
http_response_code(307); http_response_code(307);
$redirectUrl = "?action=$env->action&redirected_from=$env->page"; $redirectUrl = "?action=$env->action&redirected_from=" . rawurlencode($env->page);
$hashCode = ""; $hashCode = "";
$newPage = $pageindex->$page->redirect_target; $newPage = $pageindex->$page->redirect_target;
@ -6423,7 +6423,7 @@ register_module([
// Remove the hash from the new page name // Remove the hash from the new page name
$newPage = substr($newPage, 0, strpos($newPage, "#")); $newPage = substr($newPage, 0, strpos($newPage, "#"));
} }
$redirectUrl .= "&page=$newPage"; $redirectUrl .= "&page=" . rawurlencode($newPage);
if(!empty($pageindex->$newPage->redirect)) if(!empty($pageindex->$newPage->redirect))
$redirectUrl .= "&redirect=no"; $redirectUrl .= "&redirect=no";
if(strlen($hashCode) > 0) if(strlen($hashCode) > 0)

12
module_index.json
View File

@ -91,20 +91,20 @@
}, },
{ {
"name": "Redirect pages", "name": "Redirect pages",
"version": "0.3", "version": "0.3.1",
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds support for redirect pages. Uses the same syntax that Mediawiki does.", "description": "Adds support for redirect pages. Uses the same syntax that Mediawiki does.",
"id": "feature-redirect", "id": "feature-redirect",
"lastupdate": 1452949822, "lastupdate": 1498646092,
"optional": false "optional": false
}, },
{ {
"name": "Search", "name": "Search",
"version": "0.5", "version": "0.5.1",
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.", "description": "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
"id": "feature-search", "id": "feature-search",
"lastupdate": 1498645080, "lastupdate": 1498646440,
"optional": false "optional": false
}, },
{ {
@ -235,11 +235,11 @@
}, },
{ {
"name": "Page viewer", "name": "Page viewer",
"version": "0.16.5", "version": "0.16.6",
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Allows you to view pages. You really should include this one.", "description": "Allows you to view pages. You really should include this one.",
"id": "page-view", "id": "page-view",
"lastupdate": 1497797582, "lastupdate": 1498646088,
"optional": false "optional": false
}, },
{ {

2
modules/feature-redirect.php
View File

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Redirect pages", "name" => "Redirect pages",
"version" => "0.3", "version" => "0.3.1",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds support for redirect pages. Uses the same syntax that Mediawiki does.", "description" => "Adds support for redirect pages. Uses the same syntax that Mediawiki does.",
"id" => "feature-redirect", "id" => "feature-redirect",

2
modules/feature-search.php
View File

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Search", "name" => "Search",
"version" => "0.5", "version" => "0.5.1",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.", "description" => "Adds proper search functionality to Pepperminty Wiki using an inverted index to provide a full text search engine. If pages don't show up, then you might have hit a stop word. If not, try requesting the `invindex-rebuild` action to rebuild the inverted index from scratch.",
"id" => "feature-search", "id" => "feature-search",

6
modules/page-view.php
View File

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Page viewer", "name" => "Page viewer",
"version" => "0.16.5", "version" => "0.16.6",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Allows you to view pages. You really should include this one.", "description" => "Allows you to view pages. You really should include this one.",
"id" => "page-view", "id" => "page-view",
@ -64,7 +64,7 @@ register_module([
{ {
// Todo send an explanatory page along with the redirect // Todo send an explanatory page along with the redirect
http_response_code(307); http_response_code(307);
$redirectUrl = "?action=$env->action&redirected_from=$env->page"; $redirectUrl = "?action=$env->action&redirected_from=" . rawurlencode($env->page);
$hashCode = ""; $hashCode = "";
$newPage = $pageindex->$page->redirect_target; $newPage = $pageindex->$page->redirect_target;
@ -75,7 +75,7 @@ register_module([
// Remove the hash from the new page name // Remove the hash from the new page name
$newPage = substr($newPage, 0, strpos($newPage, "#")); $newPage = substr($newPage, 0, strpos($newPage, "#"));
} }
$redirectUrl .= "&page=$newPage"; $redirectUrl .= "&page=" . rawurlencode($newPage);
if(!empty($pageindex->$newPage->redirect)) if(!empty($pageindex->$newPage->redirect))
$redirectUrl .= "&redirect=no"; $redirectUrl .= "&redirect=no";
if(strlen($hashCode) > 0) if(strlen($hashCode) > 0)