aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/files/upload.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-07-16 00:21:23 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-09-09 08:28:05 +0200
commit845233fc626b0d5e6d9e61039fde8e31b4dd28aa (patch)
treeb035bcba8d133e726914a30a37854c2bfff4852a /phpBB/phpbb/files/upload.php
parenta09c6d1fb760151b1a6c654b597b4578c3136be1 (diff)
downloadforums-845233fc626b0d5e6d9e61039fde8e31b4dd28aa.tar
forums-845233fc626b0d5e6d9e61039fde8e31b4dd28aa.tar.gz
forums-845233fc626b0d5e6d9e61039fde8e31b4dd28aa.tar.bz2
forums-845233fc626b0d5e6d9e61039fde8e31b4dd28aa.tar.xz
forums-845233fc626b0d5e6d9e61039fde8e31b4dd28aa.zip
[ticket/13904] Improve test coverage and use constants instead of magic numbers
PHPBB3-13904
Diffstat (limited to 'phpBB/phpbb/files/upload.php')
-rw-r--r--phpBB/phpbb/files/upload.php30
1 files changed, 19 insertions, 11 deletions
diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php
index ceb7e1a741..234eb69735 100644
--- a/phpBB/phpbb/files/upload.php
+++ b/phpBB/phpbb/files/upload.php
@@ -210,7 +210,7 @@ class upload
{
switch ($errorcode)
{
- case 1:
+ case UPLOAD_ERR_INI_SIZE:
$max_filesize = @ini_get('upload_max_filesize');
$unit = 'MB';
@@ -223,29 +223,37 @@ class upload
}
$error = (empty($max_filesize)) ? $this->language->lang($this->error_prefix . 'PHP_SIZE_NA') : $this->language->lang($this->error_prefix . 'PHP_SIZE_OVERRUN', $max_filesize, $this->language->lang($unit));
- break;
+ break;
- case 2:
+ case UPLOAD_ERR_FORM_SIZE:
$max_filesize = get_formatted_filesize($this->max_filesize, false);
$error = $this->language->lang($this->error_prefix . 'WRONG_FILESIZE', $max_filesize['value'], $max_filesize['unit']);
- break;
+ break;
- case 3:
+ case UPLOAD_ERR_PARTIAL:
$error = $this->language->lang($this->error_prefix . 'PARTIAL_UPLOAD');
- break;
+ break;
- case 4:
+ case UPLOAD_ERR_NO_FILE:
$error = $this->language->lang($this->error_prefix . 'NOT_UPLOADED');
- break;
+ break;
- case 6:
+ case UPLOAD_ERR_NO_TMP_DIR:
$error = 'Temporary folder could not be found. Please check your PHP installation.';
- break;
+ break;
+
+ case UPLOAD_ERR_CANT_WRITE:
+ $error = 'Can’t write to temporary folder.';
+ break;
+
+ case UPLOAD_ERR_EXTENSION:
+ $error = 'A PHP extension has stopped the file upload.';
+ break;
default:
$error = false;
- break;
+ break;
}
return $error;