mirror of
https://github.com/sbrl/Pepperminty-Wiki.git
synced 2024-11-22 16:33:00 +00:00
Fix file preview paths (#147)
* Catch errors when uploading files Check if error code is greater than 0, and generate appropriate error message. * Fix File Preview Paths In cases where the wiki does not sit in the root directory, grab the current filepath of the request and use that to generate a valid filepath. * Reworded error a bit * Fix File Preview Paths Adjust this to work with both relative and absolute file paths
This commit is contained in:
Isabeau Kisler
parent
5859a8dd70
commit
285d39e2ac
2 changed files with 194 additions and 2 deletions
181
build/index.php
181
build/index.php
|
|
@ -4375,6 +4375,19 @@ register_module([
|
||||||
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because you are not logged in.</p><p>Try <a href='?action=login&returnto=" . rawurlencode("?action=upload") . "'>logging in</a> first."));
|
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because you are not logged in.</p><p>Try <a href='?action=login&returnto=" . rawurlencode("?action=upload") . "'>logging in</a> first."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for php upload errors
|
||||||
|
if($_FILES["file"]["error"] > 0)
|
||||||
|
{
|
||||||
|
if(!empty($_FILES["file"]))
|
||||||
|
unlink($_FILES["file"]["tmp_name"]);
|
||||||
|
if($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2)
|
||||||
|
http_response_code(413); // file is too large
|
||||||
|
else
|
||||||
|
http_response_code(500); // something else went wrong
|
||||||
|
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because " . (($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2) ? "the file is too large" : "an error occurred") . ".</p><p>Please contact the administrator for assistance.</p>"));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// Calculate the target name, removing any characters we
|
// Calculate the target name, removing any characters we
|
||||||
// are unsure about.
|
// are unsure about.
|
||||||
$target_name = makepathsafe($_POST["name"] ?? "Users/$env->user/Avatar");
|
$target_name = makepathsafe($_POST["name"] ?? "Users/$env->user/Avatar");
|
||||||
|
|
@ -4547,7 +4560,7 @@ register_module([
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
$filepath = $env->storage_prefix . $pageindex->{$env->page}->uploadedfilepath;
|
$filepath = getcwd() . "/" . $env->storage_prefix . $pageindex->{$env->page}->uploadedfilepath;
|
||||||
$mime_type = $pageindex->{$env->page}->uploadedfilemime;
|
$mime_type = $pageindex->{$env->page}->uploadedfilemime;
|
||||||
$shortFilename = substr($filepath, 1 + (strrpos($filepath, '/') !== false ? strrpos($filepath, '/') : -1));
|
$shortFilename = substr($filepath, 1 + (strrpos($filepath, '/') !== false ? strrpos($filepath, '/') : -1));
|
||||||
|
|
||||||
|
|
@ -6932,6 +6945,172 @@ register_module([
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
register_module([
|
||||||
|
"name" => "Old Default Parser",
|
||||||
|
"version" => "0.10",
|
||||||
|
"author" => "Johnny Broadway & Starbeamrainbowlabs",
|
||||||
|
"description" => "The *old* default parser for Pepperminty Wiki. Based on Johnny Broadway's Slimdown (with more than a few modifications). This parser's features are documented in the help page. Superceded by a customised extension of parsedown extra.",
|
||||||
|
"id" => "parser-default-old",
|
||||||
|
"optional" => true,
|
||||||
|
"code" => function() {
|
||||||
|
global $settings;
|
||||||
|
|
||||||
|
add_parser("default", function($markdown) {
|
||||||
|
return Slimdown::render($markdown);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Register the help section
|
||||||
|
if($settings->parser != "default")
|
||||||
|
return; // Don't register the help section if we aren't the currently set parser.
|
||||||
|
add_help_section("20-parser-default", "Editor Syntax", "<p>$settings->sitename's editor uses a modified version of slimdown, a flavour of markdown that is implementated using regular expressions. See the credits page for more information and links to the original source for this. A quick reference can be found below:</p>
|
||||||
|
<table>
|
||||||
|
<tr><th>Type This</th><th>To get this</th>
|
||||||
|
<tr><td><code>_italics_</code></td><td><em>italics</em></td></tr>
|
||||||
|
<tr><td><code>*bold*</code></td><td><strong>bold</strong></td></tr>
|
||||||
|
<tr><td><code>~~Strikethrough~~</code></td><td><del>Strikethough</del></td></tr>
|
||||||
|
<tr><td><code>`code`</code></td><td><code>code</code></td></tr>
|
||||||
|
<tr><td><code># Heading</code></td><td><h2>Heading</h2></td></tr>
|
||||||
|
<tr><td><code>## Sub Heading</code></td><td><h3>Sub Heading</h3></td></tr>
|
||||||
|
<tr><td><code>[[Internal Link]]</code></td><td><a href='index.php?page=Internal Link'>Internal Link</a></td></tr>
|
||||||
|
<tr><td><code>[[Display Text|Internal Link]]</code></td><td><a href='index.php?page=Internal Link'>Display Text</a></td></tr>
|
||||||
|
<tr><td><code>[Display text](//google.com/)</code></td><td><a href='//google.com/'>Display Text</a></td></tr>
|
||||||
|
<tr><td><code>> Blockquote<br />> Some text</code></td><td><blockquote> Blockquote<br />Some text</td></tr>
|
||||||
|
<tr><td><code> - Apples<br /> * Oranges</code></td><td><ul><li>Apples</li><li>Oranges</li></ul></td></tr>
|
||||||
|
<tr><td><code>1. This is<br />2. an ordered list</code></td><td><ol><li>This is</li><li>an ordered list</li></ol></td></tr>
|
||||||
|
<tr><td><code>
|
||||||
|
---
|
||||||
|
</code></td><td><hr /></td></tr>
|
||||||
|
<!--<tr><tds><code> - One
|
||||||
|
- Two
|
||||||
|
- Three</code></td><td><ul><li>One</li><li>Two</li><li>Three</li></ul></td></tr>-->
|
||||||
|
<tr><td><code></code></td><td><img src='//starbeamrainbowlabs.com/favicon-small.png' alt='Alt text' /></td></code>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<p>In addition, the following extra syntax is supported for images:</p>
|
||||||
|
|
||||||
|
<pre><code>Size the image to at most 250 pixels wide:
|
||||||
|
|
||||||
|
|
||||||
|
Size the image to at most 120px wide and have it float at the right ahnd size of the page:
|
||||||
|
</code></pre>");
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
* ███████ ██ ██ ███ ███ ██████ ██████ ██ ██ ███ ██ *
|
||||||
|
* ██ ██ ██ ████ ████ ██ ██ ██ ██ ██ ██ ████ ██ *
|
||||||
|
* ███████ ██ ██ ██ ████ ██ ██ ██ ██ ██ ██ █ ██ ██ ██ ██ *
|
||||||
|
* ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ███ ██ ██ ██ ██ *
|
||||||
|
* ███████ ███████ ██ ██ ██ ██████ ██████ ███ ███ ██ ████ *
|
||||||
|
***********************************************************************/
|
||||||
|
/**
|
||||||
|
* Slimdown - A very basic regex-based Markdown parser. Supports the
|
||||||
|
* following elements (and can be extended via Slimdown::add_rule()):
|
||||||
|
*
|
||||||
|
* - Headers
|
||||||
|
* - Links
|
||||||
|
* - Bold
|
||||||
|
* - Emphasis
|
||||||
|
* - Deletions
|
||||||
|
* - Quotes
|
||||||
|
* - Inline code
|
||||||
|
* - Blockquotes
|
||||||
|
* - Ordered/unordered lists
|
||||||
|
* - Horizontal rules
|
||||||
|
*
|
||||||
|
* Author: Johnny Broadway <johnny@johnnybroadway.com>
|
||||||
|
* Website: https://gist.github.com/jbroadway/2836900
|
||||||
|
* License: MIT
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Modified by Starbeamrainbowlabs (starbeamrainbowlabs)
|
||||||
|
*
|
||||||
|
* Changed bold to use single asterisks
|
||||||
|
* Changed italics to use single underscores
|
||||||
|
* Added one to add the heading levels (no <h1> tags allowed)
|
||||||
|
* Added wiki style internal link parsing
|
||||||
|
* Added wiki style internal link parsing with display text
|
||||||
|
* Added image support
|
||||||
|
*/
|
||||||
|
class Slimdown {
|
||||||
|
public static $rules = array (
|
||||||
|
'/\r\n/' => "\n", // new line normalisation
|
||||||
|
'/^(#+)(.*)/' => 'self::header', // headers
|
||||||
|
'/(\*+)(.*?)\1/' => '<strong>\2</strong>', // bold
|
||||||
|
'/(_)(.*?)\1/' => '<em>\2</em>', // emphasis
|
||||||
|
|
||||||
|
'/!\[(.*)\]\(([^\s]+)\s(\d+.+)\s(left|right)\)/' => '<img src="\2" alt="\1" style="max-width: \3; float: \4;" />', // images with size
|
||||||
|
'/!\[(.*)\]\(([^\s]+)\s(\d+.+)\)/' => '<img src="\2" alt="\1" style="max-width: \3;" />', // images with size
|
||||||
|
'/!\[(.*)\]\((.*)\)/' => '<img src="\2" alt="\1" />', // basic images
|
||||||
|
|
||||||
|
'/\[\[([a-zA-Z0-9\_\- ]+)\|([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\2</a>', //internal links with display text
|
||||||
|
'/\[\[([a-zA-Z0-9\_\- ]+)\]\]/' => '<a href=\'index.php?page=\1\'>\1</a>', //internal links
|
||||||
|
'/\[([^\[]+)\]\(([^\)]+)\)/' => '<a href=\'\2\' target=\'_blank\'>\1</a>', // links
|
||||||
|
'/\~\~(.*?)\~\~/' => '<del>\1</del>', // del
|
||||||
|
'/\:\"(.*?)\"\:/' => '<q>\1</q>', // quote
|
||||||
|
'/`(.*?)`/' => '<code>\1</code>', // inline code
|
||||||
|
'/\n\s*(\*|-)(.*)/' => 'self::ul_list', // ul lists
|
||||||
|
'/\n[0-9]+\.(.*)/' => 'self::ol_list', // ol lists
|
||||||
|
'/\n(>|\>)(.*)/' => 'self::blockquote', // blockquotes
|
||||||
|
'/\n-{3,}/' => "\n<hr />", // horizontal rule
|
||||||
|
'/\n([^\n]+)\n\n/' => 'self::para', // add paragraphs
|
||||||
|
'/<\/ul>\s?<ul>/' => '', // fix extra ul
|
||||||
|
'/<\/ol>\s?<ol>/' => '', // fix extra ol
|
||||||
|
'/<\/blockquote><blockquote>/' => "\n" // fix extra blockquote
|
||||||
|
);
|
||||||
|
private static function para ($regs) {
|
||||||
|
$line = $regs[1];
|
||||||
|
$trimmed = trim ($line);
|
||||||
|
if (preg_match ('/^<\/?(ul|ol|li|h|p|bl)/', $trimmed)) {
|
||||||
|
return "\n" . $line . "\n";
|
||||||
|
}
|
||||||
|
return sprintf ("\n<p>%s</p>\n", $trimmed);
|
||||||
|
}
|
||||||
|
private static function ul_list ($regs) {
|
||||||
|
$item = $regs[2];
|
||||||
|
return sprintf ("\n<ul>\n\t<li>%s</li>\n</ul>", trim($item));
|
||||||
|
}
|
||||||
|
private static function ol_list ($regs) {
|
||||||
|
$item = $regs[1];
|
||||||
|
return sprintf ("\n<ol>\n\t<li>%s</li>\n</ol>", trim($item));
|
||||||
|
}
|
||||||
|
private static function blockquote ($regs) {
|
||||||
|
$item = $regs[2];
|
||||||
|
return sprintf ("\n<blockquote>%s</blockquote>", trim($item));
|
||||||
|
}
|
||||||
|
private static function header ($regs) {
|
||||||
|
list ($tmp, $chars, $header) = $regs;
|
||||||
|
$level = strlen ($chars);
|
||||||
|
return sprintf ('<h%d>%s</h%d>', $level + 1, trim($header), $level + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a rule.
|
||||||
|
*/
|
||||||
|
public static function add_rule ($regex, $replacement) {
|
||||||
|
self::$rules[$regex] = $replacement;
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Render some Markdown into HTML.
|
||||||
|
*/
|
||||||
|
public static function render ($text) {
|
||||||
|
foreach (self::$rules as $regex => $replacement) {
|
||||||
|
if (is_callable ( $replacement)) {
|
||||||
|
$text = preg_replace_callback ($regex, $replacement, $text);
|
||||||
|
} else {
|
||||||
|
$text = preg_replace ($regex, $replacement, $text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return trim ($text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
register_module([
|
register_module([
|
||||||
"name" => "Parsedown",
|
"name" => "Parsedown",
|
||||||
"version" => "0.9.9",
|
"version" => "0.9.9",
|
||||||
|
|
|
||||||
|
|
@ -119,6 +119,19 @@ register_module([
|
||||||
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because you are not logged in.</p><p>Try <a href='?action=login&returnto=" . rawurlencode("?action=upload") . "'>logging in</a> first."));
|
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because you are not logged in.</p><p>Try <a href='?action=login&returnto=" . rawurlencode("?action=upload") . "'>logging in</a> first."));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for php upload errors
|
||||||
|
if($_FILES["file"]["error"] > 0)
|
||||||
|
{
|
||||||
|
if(!empty($_FILES["file"]))
|
||||||
|
unlink($_FILES["file"]["tmp_name"]);
|
||||||
|
if($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2)
|
||||||
|
http_response_code(413); // file is too large
|
||||||
|
else
|
||||||
|
http_response_code(500); // something else went wrong
|
||||||
|
exit(page_renderer::render("Upload failed - $settings->sitename", "<p>Your upload couldn't be processed because " . (($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2) ? "the file is too large" : "an error occurred") . ".</p><p>Please contact $settings->admindetails_name, $settings->sitename's administrator for help.</p>"));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// Calculate the target name, removing any characters we
|
// Calculate the target name, removing any characters we
|
||||||
// are unsure about.
|
// are unsure about.
|
||||||
$target_name = makepathsafe($_POST["name"] ?? "Users/$env->user/Avatar");
|
$target_name = makepathsafe($_POST["name"] ?? "Users/$env->user/Avatar");
|
||||||
|
|
@ -291,7 +304,7 @@ register_module([
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
$filepath = $env->storage_prefix . $pageindex->{$env->page}->uploadedfilepath;
|
$filepath = realpath($env->storage_prefix . $pageindex->{$env->page}->uploadedfilepath);
|
||||||
$mime_type = $pageindex->{$env->page}->uploadedfilemime;
|
$mime_type = $pageindex->{$env->page}->uploadedfilemime;
|
||||||
$shortFilename = substr($filepath, 1 + (strrpos($filepath, '/') !== false ? strrpos($filepath, '/') : -1));
|
$shortFilename = substr($filepath, 1 + (strrpos($filepath, '/') !== false ? strrpos($filepath, '/') : -1));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue