sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-22 04:23:01 +00:00
Code Activity

feature-upload: squash unlink() warning when file fails to upload

Browse source
This commit is contained in:
Starbeamrainbowlabs 2020-04-21 20:08:17 +01:00
parent 698a666061
commit d294c7e89a
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -37,6 +37,7 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t
- Multiple tags in search results and on page lists now have a margin between them - Multiple tags in search results and on page lists now have a margin between them
- Newline characters (`\r` and `\n`) are now replaced with spaces in internal links (#186, thanks @SeanFromIT!) - Newline characters (`\r` and `\n`) are now replaced with spaces in internal links (#186, thanks @SeanFromIT!)
- Inbuilt help documentation corrections (#185, thanks @SeanFromIT!) - Inbuilt help documentation corrections (#185, thanks @SeanFromIT!)
- Fixed a warning message when a file fails to upload (thanks for the test file, @SeanFromIT)
### Changed ### Changed
- Improved the search indexing system performance - again - Improved the search indexing system performance - again

8
modules/feature-upload.php
View file

@ -1,7 +1,7 @@
<?php <?php
register_module([ register_module([
"name" => "Uploader", "name" => "Uploader",
"version" => "0.6.2", "version" => "0.6.3",
"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",
@ -117,7 +117,7 @@ register_module([
// Make sure that the user is logged in // Make sure that the user is logged in
if(!$env->is_logged_in) if(!$env->is_logged_in)
{ {
if(!empty($_FILES["file"])) if(!empty($_FILES["file"]) && file_exists($_FILES["file"]))
unlink($_FILES["file"]["tmp_name"]); unlink($_FILES["file"]["tmp_name"]);
http_response_code(401); http_response_code(401);
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."));
@ -126,7 +126,7 @@ register_module([
// Check for php upload errors // Check for php upload errors
if($_FILES["file"]["error"] > 0) if($_FILES["file"]["error"] > 0)
{ {
if(!empty($_FILES["file"])) if(!empty($_FILES["file"]) && file_exists($_FILES["file"]))
unlink($_FILES["file"]["tmp_name"]); unlink($_FILES["file"]["tmp_name"]);
if($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2) if($_FILES["file"]["error"] == 1 || $_FILES["file"]["error"] == 2)
http_response_code(413); // file is too large http_response_code(413); // file is too large
@ -216,7 +216,7 @@ register_module([
if($is_avatar && isset($pageindex->$new_pagepath) && $pageindex->$new_pagepath->uploadedfile) if($is_avatar && isset($pageindex->$new_pagepath) && $pageindex->$new_pagepath->uploadedfile)
unlink($pageindex->$new_pagepath->uploadedfilepath); unlink($pageindex->$new_pagepath->uploadedfilepath);
// Make sure that the palce we're uploading to exists // Make sure that the place we're uploading to exists
if(!file_exists(dirname($env->storage_prefix . $new_filename))) if(!file_exists(dirname($env->storage_prefix . $new_filename)))
mkdir(dirname($env->storage_prefix . $new_filename), 0775, true); mkdir(dirname($env->storage_prefix . $new_filename), 0775, true);