From fc334bf43abf91dda22cf95b6c6ddbb3319083f7 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 11 Jul 2014 11:14:27 +0200 Subject: [PATCH] better error checking for uploaddocuments first check for upload error, than for filesize --- op/op.Ajax.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/op/op.Ajax.php b/op/op.Ajax.php index 27d12de78..7e248c51c 100644 --- a/op/op.Ajax.php +++ b/op/op.Ajax.php @@ -435,16 +435,16 @@ switch($command) { echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id"))); exit; } - if ($_FILES["userfile"]["size"]==0) { - header('Content-Type', 'application/json'); - echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_zerosize"))); - exit; - } if (!is_uploaded_file($_FILES["userfile"]["tmp_name"]) || $_FILES['userfile']['error']!=0){ header('Content-Type', 'application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_failed"))); exit; } + if ($_FILES["userfile"]["size"]==0) { + header('Content-Type', 'application/json'); + echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_zerosize"))); + exit; + } $userfiletmp = $_FILES["userfile"]["tmp_name"]; $userfiletype = $_FILES["userfile"]["type"]; @@ -543,7 +543,7 @@ switch($command) { } } header('Content-Type', 'application/json'); - echo json_encode(array('success'=>true, 'message'=>getMLText('upload_successful'), 'data'=>$document->getID())); + echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_added'), 'data'=>$document->getID())); } else { header('Content-Type', 'application/json'); echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));