From 6eb1507fb84b61907f84d0788e7a0a628aa84233 Mon Sep 17 00:00:00 2001 From: Robert Lyon Date: Wed, 18 Sep 2013 09:11:10 +1200 Subject: [PATCH] Leap2a file being bigger than upload_max_filesize bad error (bug #525632) - when the importing of a too big leap2a file the form error message was wrong - have got it to give the 'file too big' message Change-Id: Ied2770b057a4fd7c51cc71db98e43808139b5985 Signed-off-by: Robert Lyon --- htdocs/admin/users/add.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/users/add.php b/htdocs/admin/users/add.php index 501b100eea..1e569443b0 100644 --- a/htdocs/admin/users/add.php +++ b/htdocs/admin/users/add.php @@ -221,8 +221,14 @@ function adduser_validate(Pieform $form, $values) { $form->set_error('firstname', null); $form->set_error('lastname', null); $form->set_error('email', null); - - if (!$values['leap2afile']) { + if (!$values['leap2afile'] && ($_FILES['leap2afile']['error'] == UPLOAD_ERR_INI_SIZE || $_FILES['leap2afile']['error'] == UPLOAD_ERR_FORM_SIZE)) { + $form->reply(PIEFORM_ERR, array( + 'message' => get_string('uploadedfiletoobig'), + 'goto' => '/admin/users/add.php')); + $form->set_error('leap2afile', get_string('uploadedfiletoobig')); + return; + } + else if (!$values['leap2afile']) { $form->set_error('leap2afile', $form->i18n('rule', 'required', 'required')); return; } -- GitLab