diff --git a/.gitignore b/.gitignore
index a11236a..708599b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,10 +41,26 @@ build/diff.min.js
# The testing zone for the $paths
data_test
-
-# Created by https://www.gitignore.io/api/git
-
-### Git ###
-*.orig
-
-# End of https://www.gitignore.io/api/git
+
+# phpdoc - Can't believe I committed this by accident :P
+phpdoc
+
+# Created by https://www.gitignore.io/api/git
+
+### Git ###
+*.orig
+
+# End of https://www.gitignore.io/api/git
+
+# Created by https://www.gitignore.io/api/composer
+
+### Composer ###
+composer.phar
+/vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
+
+
+# End of https://www.gitignore.io/api/composer
diff --git a/docs/ModuleApi/classes/PeppermintParsedown.html b/docs/ModuleApi/classes/PeppermintParsedown.html
index 02034ea..15c30ba 100644
--- a/docs/ModuleApi/classes/PeppermintParsedown.html
+++ b/docs/ModuleApi/classes/PeppermintParsedown.html
@@ -111,7 +111,7 @@
@@ -365,7 +365,7 @@ with a URL encoded version of the page name.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/classes/Slimdown.html b/docs/ModuleApi/classes/Slimdown.html
index 3d9d443..8005fe1 100644
--- a/docs/ModuleApi/classes/Slimdown.html
+++ b/docs/ModuleApi/classes/Slimdown.html
@@ -111,7 +111,7 @@
@@ -414,7 +414,7 @@ Added image support
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/classes/ids.html b/docs/ModuleApi/classes/ids.html
index 9011d38..0dece07 100644
--- a/docs/ModuleApi/classes/ids.html
+++ b/docs/ModuleApi/classes/ids.html
@@ -111,7 +111,7 @@
@@ -525,7 +525,7 @@ index.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/classes/page_renderer.html b/docs/ModuleApi/classes/page_renderer.html
index 062f63b..fb08c10 100644
--- a/docs/ModuleApi/classes/page_renderer.html
+++ b/docs/ModuleApi/classes/page_renderer.html
@@ -111,7 +111,7 @@
@@ -943,7 +943,7 @@ navigation bar.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/classes/search.html b/docs/ModuleApi/classes/search.html
index 9080289..51bad47 100644
--- a/docs/ModuleApi/classes/search.html
+++ b/docs/ModuleApi/classes/search.html
@@ -111,7 +111,7 @@
@@ -919,7 +919,7 @@ in a list of search results.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/core.html b/docs/ModuleApi/files/core.html
index 1f18fef..99914a6 100644
--- a/docs/ModuleApi/files/core.html
+++ b/docs/ModuleApi/files/core.html
@@ -111,7 +111,7 @@
@@ -2487,7 +2487,7 @@ an edit is saved.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/download.html b/docs/ModuleApi/files/download.html
index 052470d..6a2b504 100644
--- a/docs/ModuleApi/files/download.html
+++ b/docs/ModuleApi/files/download.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.action-hash.html b/docs/ModuleApi/files/modules.action-hash.html
index b0c29ea..b4be607 100644
--- a/docs/ModuleApi/files/modules.action-hash.html
+++ b/docs/ModuleApi/files/modules.action-hash.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.action-protect.html b/docs/ModuleApi/files/modules.action-protect.html
index 0d5e9ff..02d3ebe 100644
--- a/docs/ModuleApi/files/modules.action-protect.html
+++ b/docs/ModuleApi/files/modules.action-protect.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.action-random.html b/docs/ModuleApi/files/modules.action-random.html
index 3628d39..1e313f5 100644
--- a/docs/ModuleApi/files/modules.action-random.html
+++ b/docs/ModuleApi/files/modules.action-random.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.action-raw.html b/docs/ModuleApi/files/modules.action-raw.html
index 88b64b9..68fa00b 100644
--- a/docs/ModuleApi/files/modules.action-raw.html
+++ b/docs/ModuleApi/files/modules.action-raw.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.api-status.html b/docs/ModuleApi/files/modules.api-status.html
index 8fe5216..c6f018d 100644
--- a/docs/ModuleApi/files/modules.api-status.html
+++ b/docs/ModuleApi/files/modules.api-status.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.extra-sidebar.html b/docs/ModuleApi/files/modules.extra-sidebar.html
index 42c6a32..87c0409 100644
--- a/docs/ModuleApi/files/modules.extra-sidebar.html
+++ b/docs/ModuleApi/files/modules.extra-sidebar.html
@@ -111,7 +111,7 @@
@@ -298,7 +298,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-comments.html b/docs/ModuleApi/files/modules.feature-comments.html
index 651ff8e..f712319 100644
--- a/docs/ModuleApi/files/modules.feature-comments.html
+++ b/docs/ModuleApi/files/modules.feature-comments.html
@@ -111,7 +111,7 @@
@@ -544,7 +544,7 @@ at which the comments are being rendered.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-guiconfig.html b/docs/ModuleApi/files/modules.feature-guiconfig.html
index 7f9a2ba..d37a7f2 100644
--- a/docs/ModuleApi/files/modules.feature-guiconfig.html
+++ b/docs/ModuleApi/files/modules.feature-guiconfig.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-history.html b/docs/ModuleApi/files/modules.feature-history.html
index 0db4b4a..2271191 100644
--- a/docs/ModuleApi/files/modules.feature-history.html
+++ b/docs/ModuleApi/files/modules.feature-history.html
@@ -111,7 +111,7 @@
@@ -304,7 +304,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-recent-changes.html b/docs/ModuleApi/files/modules.feature-recent-changes.html
index 528b0cc..b5c6b7f 100644
--- a/docs/ModuleApi/files/modules.feature-recent-changes.html
+++ b/docs/ModuleApi/files/modules.feature-recent-changes.html
@@ -111,7 +111,7 @@
@@ -384,7 +384,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-redirect.html b/docs/ModuleApi/files/modules.feature-redirect.html
index 3c467cb..b1ff9da 100644
--- a/docs/ModuleApi/files/modules.feature-redirect.html
+++ b/docs/ModuleApi/files/modules.feature-redirect.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-search.html b/docs/ModuleApi/files/modules.feature-search.html
index 1605675..7ee5939 100644
--- a/docs/ModuleApi/files/modules.feature-search.html
+++ b/docs/ModuleApi/files/modules.feature-search.html
@@ -111,7 +111,7 @@
@@ -246,7 +246,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-stats.html b/docs/ModuleApi/files/modules.feature-stats.html
index b1f964f..e0d6c6a 100644
--- a/docs/ModuleApi/files/modules.feature-stats.html
+++ b/docs/ModuleApi/files/modules.feature-stats.html
@@ -111,7 +111,7 @@
@@ -381,7 +381,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-upload.html b/docs/ModuleApi/files/modules.feature-upload.html
index aa80da1..51b9b9c 100644
--- a/docs/ModuleApi/files/modules.feature-upload.html
+++ b/docs/ModuleApi/files/modules.feature-upload.html
@@ -111,7 +111,7 @@
@@ -503,7 +503,7 @@ the image.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.feature-user-preferences.html b/docs/ModuleApi/files/modules.feature-user-preferences.html
index 6e303fc..46d42b9 100644
--- a/docs/ModuleApi/files/modules.feature-user-preferences.html
+++ b/docs/ModuleApi/files/modules.feature-user-preferences.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-credits.html b/docs/ModuleApi/files/modules.page-credits.html
index fef4aed..ea2a14f 100644
--- a/docs/ModuleApi/files/modules.page-credits.html
+++ b/docs/ModuleApi/files/modules.page-credits.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-debug-info.html b/docs/ModuleApi/files/modules.page-debug-info.html
index dfbb205..59428ed 100644
--- a/docs/ModuleApi/files/modules.page-debug-info.html
+++ b/docs/ModuleApi/files/modules.page-debug-info.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-delete.html b/docs/ModuleApi/files/modules.page-delete.html
index 02526c2..8c2c760 100644
--- a/docs/ModuleApi/files/modules.page-delete.html
+++ b/docs/ModuleApi/files/modules.page-delete.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-edit.html b/docs/ModuleApi/files/modules.page-edit.html
index ca94ea2..af12094 100644
--- a/docs/ModuleApi/files/modules.page-edit.html
+++ b/docs/ModuleApi/files/modules.page-edit.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-export.html b/docs/ModuleApi/files/modules.page-export.html
index cb2e206..6e8c2db 100644
--- a/docs/ModuleApi/files/modules.page-export.html
+++ b/docs/ModuleApi/files/modules.page-export.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-help.html b/docs/ModuleApi/files/modules.page-help.html
index e821bc6..aca777c 100644
--- a/docs/ModuleApi/files/modules.page-help.html
+++ b/docs/ModuleApi/files/modules.page-help.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-list.html b/docs/ModuleApi/files/modules.page-list.html
index d9eeb92..da28900 100644
--- a/docs/ModuleApi/files/modules.page-list.html
+++ b/docs/ModuleApi/files/modules.page-list.html
@@ -111,7 +111,7 @@
@@ -340,7 +340,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-login.html b/docs/ModuleApi/files/modules.page-login.html
index 4514e5e..2ebdd30 100644
--- a/docs/ModuleApi/files/modules.page-login.html
+++ b/docs/ModuleApi/files/modules.page-login.html
@@ -111,7 +111,7 @@
@@ -295,7 +295,7 @@ enabled, or sha256 otherwise.
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-logout.html b/docs/ModuleApi/files/modules.page-logout.html
index f34abba..ef80e4d 100644
--- a/docs/ModuleApi/files/modules.page-logout.html
+++ b/docs/ModuleApi/files/modules.page-logout.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-move.html b/docs/ModuleApi/files/modules.page-move.html
index a27c557..bc2f391 100644
--- a/docs/ModuleApi/files/modules.page-move.html
+++ b/docs/ModuleApi/files/modules.page-move.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-update.html b/docs/ModuleApi/files/modules.page-update.html
index c8b6ca3..3f4dff7 100644
--- a/docs/ModuleApi/files/modules.page-update.html
+++ b/docs/ModuleApi/files/modules.page-update.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-user-list.html b/docs/ModuleApi/files/modules.page-user-list.html
index 78ade2e..94f3ab8 100644
--- a/docs/ModuleApi/files/modules.page-user-list.html
+++ b/docs/ModuleApi/files/modules.page-user-list.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.page-view.html b/docs/ModuleApi/files/modules.page-view.html
index ac3a746..1205c0f 100644
--- a/docs/ModuleApi/files/modules.page-view.html
+++ b/docs/ModuleApi/files/modules.page-view.html
@@ -111,7 +111,7 @@
@@ -239,7 +239,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.parser-default-old.html b/docs/ModuleApi/files/modules.parser-default-old.html
index 06525ff..8fd6b41 100644
--- a/docs/ModuleApi/files/modules.parser-default-old.html
+++ b/docs/ModuleApi/files/modules.parser-default-old.html
@@ -111,7 +111,7 @@
@@ -246,7 +246,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules.parser-parsedown.html b/docs/ModuleApi/files/modules.parser-parsedown.html
index 2b5aa9b..bad9fa5 100644
--- a/docs/ModuleApi/files/modules.parser-parsedown.html
+++ b/docs/ModuleApi/files/modules.parser-parsedown.html
@@ -111,7 +111,7 @@
@@ -246,7 +246,7 @@
Documentation is powered by phpDocumentor and authored
- on November 20th, 2017 at 20:40.
+ on February 14th, 2018 at 22:17.
diff --git a/docs/ModuleApi/files/modules/feature-comments.php.txt b/docs/ModuleApi/files/modules/feature-comments.php.txt
index 950cf34..ed92098 100644
--- a/docs/ModuleApi/files/modules/feature-comments.php.txt
+++ b/docs/ModuleApi/files/modules/feature-comments.php.txt
@@ -1,7 +1,7 @@
"Page Comments",
- "version" => "0.2.3",
+ "version" => "0.3.1",
"author" => "Starbeamrainbowlabs",
"description" => "Adds threaded comments to the bottom of every page.",
"id" => "feature-comments",
@@ -214,7 +214,7 @@ register_module([
else {
$comments_html .= "\n";
diff --git a/docs/ModuleApi/files/modules/feature-history.php.txt b/docs/ModuleApi/files/modules/feature-history.php.txt
index 0d2f740..918e6b7 100644
--- a/docs/ModuleApi/files/modules/feature-history.php.txt
+++ b/docs/ModuleApi/files/modules/feature-history.php.txt
@@ -1,13 +1,13 @@
"Page History",
- "version" => "0.3",
+ "version" => "0.3.1",
"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.",
"id" => "feature-history",
"code" => function() {
/**
- * @api {get} ?action=history&page={pageName} Get a list of revisions for a page
+ * @api {get} ?action=history&page={pageName}[&format={format}] Get a list of revisions for a page
* @apiName History
* @apiGroup Page
* @apiPermission Anonymous
diff --git a/docs/ModuleApi/files/modules/feature-search.php.txt b/docs/ModuleApi/files/modules/feature-search.php.txt
index 7447031..2ed0708 100644
--- a/docs/ModuleApi/files/modules/feature-search.php.txt
+++ b/docs/ModuleApi/files/modules/feature-search.php.txt
@@ -1,7 +1,7 @@
"Search",
- "version" => "0.6",
+ "version" => "0.6.1",
"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.",
"id" => "feature-search",
@@ -528,7 +528,7 @@ class search
public static function tokenize($source)
{
$source = strtolower($source);
- $source = str_replace([ '[', ']', '|', '{', '}' ], " ", $source);
+ $source = str_replace([ '[', ']', '|', '{', '}', '/' ], " ", $source);
return preg_split("/((^\p{P}+)|(\p{P}*\s+\p{P}*)|(\p{P}+$))|\|/u", $source, -1, PREG_SPLIT_NO_EMPTY);
}
diff --git a/docs/ModuleApi/files/modules/feature-upload.php.txt b/docs/ModuleApi/files/modules/feature-upload.php.txt
index 7b26d97..5f96716 100644
--- a/docs/ModuleApi/files/modules/feature-upload.php.txt
+++ b/docs/ModuleApi/files/modules/feature-upload.php.txt
@@ -1,7 +1,7 @@
"Uploader",
- "version" => "0.5.11",
+ "version" => "0.5.14",
"author" => "Starbeamrainbowlabs",
"description" => "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File/' prefix.",
"id" => "feature-upload",
@@ -101,6 +101,10 @@ register_module([
case "POST":
// Recieve file
+ if(!$settings->editing) {
+ exit(page_renderer::render_main("Upload failed - $settings->sitename", "
Your upload couldn't be processed because editing is currently disabled on $settings->sitename. Please contact $settings->admindetails_name, $settings->sitename's administrator for more information - their contact details can be found at the bottom of this page. Go back to the main page."));
+ }
+
// Make sure uploads are enabled
if(!$settings->upload_enabled)
{
@@ -311,7 +315,7 @@ register_module([
header("content-disposition: inline; filename=\"$shortFilename\"");
header("last-modified: " . gmdate('D, d M Y H:i:s T', $pageindex->{$env->page}->lastmodified));
- // If the size is set or original, then send (or redirect to) the original image
+ // If the size is set to original, then send (or redirect to) the original image
// Also do the same for SVGs if svg rendering is disabled.
if(isset($_GET["size"]) and $_GET["size"] == "original" or
(empty($settings->render_svg_previews) && $mime_type == "image/svg+xml"))
@@ -476,7 +480,7 @@ register_module([
if($mime_type == "application/pdf")
$fileTypeDisplay = "file";
- $preview_sizes = [ 256, 512, 768, 1024, 1440 ];
+ $preview_sizes = [ 256, 512, 768, 1024, 1440, 1920 ];
$preview_html .= "\t\t\t