From: Arthur Schiwon Date: Sat, 16 Apr 2011 21:28:50 +0000 (+0200) Subject: show error code if file upload fails X-Git-Tag: v3.0~267^2~558^2~117^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b129079bed8ebd1b5051dabe15eccdc17bf4b403;p=nextcloud-server.git show error code if file upload fails --- diff --git a/files/ajax/upload.php b/files/ajax/upload.php index b3facf96723..79b6c0b284c 100644 --- a/files/ajax/upload.php +++ b/files/ajax/upload.php @@ -27,6 +27,8 @@ and $_SESSION['username'] and strpos($dir,'..') === false){ } } -echo json_encode(array( "status" => "error")); +$error = $_FILES['file']['error']; + +echo json_encode(array( 'status' => 'error', 'data' => array('error' => $error))); ?> diff --git a/files/js/files.js b/files/js/files.js index ba08e254349..9eeeb7f6bfd 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -53,7 +53,7 @@ function uploadFinished() { result = $('#file_upload_target').contents().text(); result = eval("(" + result + ");"); if(result.status == "error") { - alert('An error occcured, upload failed.'); + alert('An error occcured, upload failed.\nError code: ' + result.data.error); } else { location.href = 'index.php?dir=' + $('#dir').val(); }