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

Fiddle with the file uploader to fix #100.

This commit is contained in:
Starbeamrainbowlabs 2016-08-22 14:56:34 +01:00
parent 215fe4461a
commit 2861731c83
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/index.php
View File

@ -2677,7 +2677,7 @@ class search
register_module([ register_module([
"name" => "Uploader", "name" => "Uploader",
"version" => "0.5.6", "version" => "0.5.7",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File/' prefix.", "description" => "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File/' prefix.",
"id" => "feature-upload", "id" => "feature-upload",
@ -2805,8 +2805,8 @@ register_module([
// Override the detected file extension if a file extension // Override the detected file extension if a file extension
// is explicitly specified in the settings // is explicitly specified in the settings
if(isset($settings->mime_mappings_overrides[$mime_type])) if(isset($settings->mime_mappings_overrides->$mime_type))
$file_extension = $settings->mime_mappings_overrides[$mime_type]; $file_extension = $settings->mime_mappings_overrides->$mime_type;
if(in_array($file_extension, [ "php", ".htaccess", "asp" ])) if(in_array($file_extension, [ "php", ".htaccess", "asp" ]))
{ {
@ -2821,8 +2821,8 @@ register_module([
if(isset($pageindex->$new_filename)) if(isset($pageindex->$new_filename))
exit(page_renderer::render("Upload Error - $settings->sitename", "<p>A page or file has already been uploaded with the name '$new_filename'. Try deleting it first. If you do not have permission to delete things, try contacting one of the moderators.</p>")); exit(page_renderer::render("Upload Error - $settings->sitename", "<p>A page or file has already been uploaded with the name '$new_filename'. Try deleting it first. If you do not have permission to delete things, try contacting one of the moderators.</p>"));
if(!file_exists("Files")) if(!file_exists($env->storage_prefix . "Files"))
mkdir("Files", 0664); mkdir($env->storage_prefix . "Files", 0775);
if(!move_uploaded_file($temp_filename, $env->storage_prefix . $new_filename)) if(!move_uploaded_file($temp_filename, $env->storage_prefix . $new_filename))
{ {
@ -2871,7 +2871,7 @@ register_module([
"timestamp" => time(), "timestamp" => time(),
"page" => $new_filename, "page" => $new_filename,
"user" => $env->user, "user" => $env->user,
"filesize" => filesize($entry->uploadedfilepath) "filesize" => filesize($env->storage_prefix . $entry->uploadedfilepath)
]); ]);
} }
@ -3110,7 +3110,7 @@ register_module([
$fileInfo = []; $fileInfo = [];
$fileInfo["Name"] = str_replace("File/", "", $filepath); $fileInfo["Name"] = str_replace("File/", "", $filepath);
$fileInfo["Type"] = $mime_type; $fileInfo["Type"] = $mime_type;
$fileInfo["Size"] = human_filesize(filesize($filepath)); $fileInfo["Size"] = human_filesize(filesize($env->storage_prefix . $filepath));
switch($fileTypeDisplay) switch($fileTypeDisplay)
{ {
case "image": case "image":

6
module_index.json
View File

@ -73,11 +73,11 @@
}, },
{ {
"name": "Uploader", "name": "Uploader",
"version": "0.5.6", "version": "0.5.7",
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.", "description": "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File\/' prefix.",
"id": "feature-upload", "id": "feature-upload",
"lastupdate": 1466582736, "lastupdate": 1471874150,
"optional": false "optional": false
}, },
{ {
@ -203,7 +203,7 @@
"author": "Emanuil Rusev & Starbeamrainbowlabs", "author": "Emanuil Rusev & Starbeamrainbowlabs",
"description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.", "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.",
"id": "parser-parsedown", "id": "parser-parsedown",
"lastupdate": 1471860654, "lastupdate": 1471860869,
"optional": false "optional": false
} }
] ]

14
modules/feature-upload.php
View File

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Uploader", "name" => "Uploader",
"version" => "0.5.6", "version" => "0.5.7",
"author" => "Starbeamrainbowlabs", "author" => "Starbeamrainbowlabs",
"description" => "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File/' prefix.", "description" => "Adds the ability to upload files to Pepperminty Wiki. Uploaded files act as pages and have the special 'File/' prefix.",
"id" => "feature-upload", "id" => "feature-upload",
@ -129,8 +129,8 @@ register_module([
// Override the detected file extension if a file extension // Override the detected file extension if a file extension
// is explicitly specified in the settings // is explicitly specified in the settings
if(isset($settings->mime_mappings_overrides[$mime_type])) if(isset($settings->mime_mappings_overrides->$mime_type))
$file_extension = $settings->mime_mappings_overrides[$mime_type]; $file_extension = $settings->mime_mappings_overrides->$mime_type;
if(in_array($file_extension, [ "php", ".htaccess", "asp" ])) if(in_array($file_extension, [ "php", ".htaccess", "asp" ]))
{ {
@ -145,8 +145,8 @@ register_module([
if(isset($pageindex->$new_filename)) if(isset($pageindex->$new_filename))
exit(page_renderer::render("Upload Error - $settings->sitename", "<p>A page or file has already been uploaded with the name '$new_filename'. Try deleting it first. If you do not have permission to delete things, try contacting one of the moderators.</p>")); exit(page_renderer::render("Upload Error - $settings->sitename", "<p>A page or file has already been uploaded with the name '$new_filename'. Try deleting it first. If you do not have permission to delete things, try contacting one of the moderators.</p>"));
if(!file_exists("Files")) if(!file_exists($env->storage_prefix . "Files"))
mkdir("Files", 0664); mkdir($env->storage_prefix . "Files", 0775);
if(!move_uploaded_file($temp_filename, $env->storage_prefix . $new_filename)) if(!move_uploaded_file($temp_filename, $env->storage_prefix . $new_filename))
{ {
@ -195,7 +195,7 @@ register_module([
"timestamp" => time(), "timestamp" => time(),
"page" => $new_filename, "page" => $new_filename,
"user" => $env->user, "user" => $env->user,
"filesize" => filesize($entry->uploadedfilepath) "filesize" => filesize($env->storage_prefix . $entry->uploadedfilepath)
]); ]);
} }
@ -434,7 +434,7 @@ register_module([
$fileInfo = []; $fileInfo = [];
$fileInfo["Name"] = str_replace("File/", "", $filepath); $fileInfo["Name"] = str_replace("File/", "", $filepath);
$fileInfo["Type"] = $mime_type; $fileInfo["Type"] = $mime_type;
$fileInfo["Size"] = human_filesize(filesize($filepath)); $fileInfo["Size"] = human_filesize(filesize($env->storage_prefix . $filepath));
switch($fileTypeDisplay) switch($fileTypeDisplay)
{ {
case "image": case "image":