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

Fix #39.

This commit is contained in:
Starbeamrainbowlabs 2015-11-14 15:48:30 +00:00
parent 1cca9a9f73
commit 10da7a3d60
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/index.php
View File

@ -52,13 +52,6 @@ $settings->updateurl = "https://raw.githubusercontent.com/sbrl/pepperminty-wiki/
// and deleting pages. It is strongly advised that you change this!
$settings->sitesecret = "ed420502615bac9037f8f12abd4c9f02";
// The directory in which to store all files, except this main index.php.
// A single dot ('.') denotes the current directory.
// Remember to omit the trailing slash from the directory name, as it is added
// automatically by Pepperminty Wiki.
// Note that this setting is currently experimental.
$settings->data_storage_dir = "../data_test";
// Determined whether edit is enabled. Set to false to disable disting for all
// users (anonymous or otherwise).
$settings->editing = true;
@ -109,7 +102,18 @@ $settings->users = [
"user" => "873ac9ffea4dd04fa719e8920cd6938f0c23cd678af330939cff53c3d2855f34" //cheese
];
$settings->require_login_view = true;
// Whether to require that users login before they do anything else. If you
// combine this setting with the `data_storage_dir` option to move the storage
// directory outside your web root, this will completely hide your wiki from
// anyone who isn't logged in.
$settings->require_login_view = false;
// The directory in which to store all files, except this main index.php.
// A single dot ('.') denotes the current directory.
// Remember to omit the trailing slash from the directory name, as it is added
// automatically by Pepperminty Wiki.
// Note that this setting is currently experimental.
$settings->data_storage_dir = "./";
// Whether to use the new sha3 hashing algorithm that was standardised on the
// 8th August 2015. Only works if you have strawbrary's sha3 extension
@ -1080,7 +1084,7 @@ class page_renderer
$result .= page_renderer::$nav_divider;
}
else
$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login'>Login</a></span>" . page_renderer::$nav_divider;
$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>" . page_renderer::$nav_divider;
break;
case "search": // Displays a search bar

2
core.php
View File

@ -740,7 +740,7 @@ class page_renderer
$result .= page_renderer::$nav_divider;
}
else
$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login'>Login</a></span>" . page_renderer::$nav_divider;
$result .= "<span class='inflexible'>Browsing as Anonymous.</span>" . /*page_renderer::$nav_divider . */"<span><a href='index.php?action=login&returnto=" . rawurlencode($_SERVER["REQUEST_URI"]) . "'>Login</a></span>" . page_renderer::$nav_divider;
break;
case "search": // Displays a search bar

20
settings.fragment.php
View File

@ -41,13 +41,6 @@ $settings->updateurl = "https://raw.githubusercontent.com/sbrl/pepperminty-wiki/
// and deleting pages. It is strongly advised that you change this!
$settings->sitesecret = "ed420502615bac9037f8f12abd4c9f02";
// The directory in which to store all files, except this main index.php.
// A single dot ('.') denotes the current directory.
// Remember to omit the trailing slash from the directory name, as it is added
// automatically by Pepperminty Wiki.
// Note that this setting is currently experimental.
$settings->data_storage_dir = "../data_test";
// Determined whether edit is enabled. Set to false to disable disting for all
// users (anonymous or otherwise).
$settings->editing = true;
@ -98,7 +91,18 @@ $settings->users = [
"user" => "873ac9ffea4dd04fa719e8920cd6938f0c23cd678af330939cff53c3d2855f34" //cheese
];
$settings->require_login_view = true;
// Whether to require that users login before they do anything else. If you
// combine this setting with the `data_storage_dir` option to move the storage
// directory outside your web root, this will completely hide your wiki from
// anyone who isn't logged in.
$settings->require_login_view = false;
// The directory in which to store all files, except this main index.php.
// A single dot ('.') denotes the current directory.
// Remember to omit the trailing slash from the directory name, as it is added
// automatically by Pepperminty Wiki.
// Note that this setting is currently experimental.
$settings->data_storage_dir = "./";
// Whether to use the new sha3 hashing algorithm that was standardised on the
// 8th August 2015. Only works if you have strawbrary's sha3 extension