iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-06 21:42:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #767 - Return a 500 HTTP status when a file upload error occurs. (#768)

Browse Source 
* Return a 500 HTTP status when a file upload error occurs.
This commit is contained in:
Cosmin Stroe
2017-10-05 08:35:24 -05:00
committed by Pierrick Le Gall
parent 977588999a
commit ee4aae7e74
1 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/ws_functions/pwg.images.php
View File

@@ -740,7 +740,7 @@ UPDATE '. IMAGES_TABLE .'
* @option int rank * @option int rank
*/ */
function ws_images_setRank($params, $service) function ws_images_setRank($params, $service)
{ {
if (count($params['image_id']) > 1) if (count($params['image_id']) > 1)
{ {
include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@@ -773,7 +773,7 @@ SELECT
{ {
return new PwgError(WS_ERR_MISSING_PARAM, 'rank is missing'); return new PwgError(WS_ERR_MISSING_PARAM, 'rank is missing');
} }
// does the image really exist? // does the image really exist?
$query = ' $query = '
SELECT COUNT(*) SELECT COUNT(*)
@@ -1167,13 +1167,48 @@ SELECT id, name, permalink
*/ */
function ws_images_addSimple($params, $service) function ws_images_addSimple($params, $service)
{ {
global $conf; global $conf, $logger;
if (!isset($_FILES['image'])) if (!isset($_FILES['image']))
{ {
return new PwgError(405, 'The image (file) is missing'); return new PwgError(405, 'The image (file) is missing');
} }
if (isset($_FILES['image']['error']) && $_FILES['image']['error'] != 0)
{
switch($_FILES['image']['error'])
{
case UPLOAD_ERR_INI_SIZE:
$message = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.';
break;
case UPLOAD_ERR_FORM_SIZE:
$message = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.';
break;
case UPLOAD_ERR_PARTIAL:
$message = 'The uploaded file was only partially uploaded.';
break;
case UPLOAD_ERR_NO_FILE:
$message = 'No file was uploaded.';
break;
case UPLOAD_ERR_NO_TMP_DIR:
$message = 'Missing a temporary folder.';
break;
case UPLOAD_ERR_CANT_WRITE:
$message = 'Failed to write file to disk.';
break;
case UPLOAD_ERR_EXTENSION:
$message = 'A PHP extension stopped the file upload. ' .
'PHP does not provide a way to ascertain which extension caused the file ' .
'upload to stop; examining the list of loaded extensions with phpinfo() may help.';
break;
default:
$message = "Error number {$_FILES['image']['error']} occurred while uploading a file.";
}
$logger->error(__FUNCTION__ . " " . $message);
return new PwgError(500, $message);
}
if ($params['image_id'] > 0) if ($params['image_id'] > 0)
{ {
$query=' $query='