Skip to content

Commit

Permalink
MDL-15614 Add 3 missing PHP error codes to get_file_upload_error()
Browse files Browse the repository at this point in the history
The get_file_upload_error() function was missing the following error codes:

    UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder.',
    UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk.',
    UPLOAD_ERR_EXTENSION => 'File upload stopped by extension.',

(see http://www.php.net/manual/en/features.file-upload.errors.php)
  • Loading branch information
fmarier committed Jul 14, 2008
1 parent 07e9a30 commit a8e352c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lang/en_utf8/moodle.php
Expand Up @@ -1536,15 +1536,18 @@
$string['updatingain'] = 'Updating $a->what in $a->in';
$string['upload'] = 'Upload';
$string['uploadafile'] = 'Upload a file';
$string['uploadcantwrite'] = 'Failed to write file to disk';
$string['uploadedfile'] = 'File uploaded successfully';
$string['uploadedfileto'] = 'Uploaded $a->file to $a->directory';
$string['uploadedfiletoobig'] = 'Sorry, but that file is too big (limit is $a bytes)';
$string['uploadextension'] = 'File upload stopped by extension';
$string['uploadfailednotrecovering'] = 'Your file upload has failed because there was a problem with one of the files, $a->name.<br /> Here is a log of the problems:<br />$a->problem<br />Not recovering.';
$string['uploadfilelog'] = 'Upload log for file $a';
$string['uploadformlimit'] = 'Uploaded file exceeded the maximum size limit set by the form';
$string['uploadlabel'] = 'Title:';
$string['uploadnofilefound'] = 'No file was found - are you sure you selected one to upload?';
$string['uploadnotallowed'] = 'Uploads are not allowed';
$string['uploadnotempdir'] = 'Missing a temporary folder';
$string['uploadoldfilesdeleted'] = 'The old file(s) in your upload area have been deleted';
$string['uploadpartialfile'] = 'File was only partially uploaded';
$string['uploadproblem'] = 'An unknown problem occurred while uploading the file \'$a\' (perhaps it was too large?)';
Expand Down
14 changes: 14 additions & 0 deletions lib/uploadlib.php
Expand Up @@ -392,6 +392,20 @@ function get_file_upload_error(&$file) {
$errmessage = get_string('uploadnofilefound');
break;

// Note: there is no error with a value of 5

case 6: // UPLOAD_ERR_NO_TMP_DIR
$errmessage = get_string('uploadnotempdir');
break;

case 7: // UPLOAD_ERR_CANT_WRITE
$errmessage = get_string('uploadcantwrite');
break;

case 8: // UPLOAD_ERR_EXTENSION
$errmessage = get_string('uploadextension');
break;

default:
$errmessage = get_string('uploadproblem', $file['name']);
}
Expand Down

0 comments on commit a8e352c

Please sign in to comment.