diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-04-16 23:28:50 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-04-16 23:28:50 +0200 |
| commit | b129079bed8ebd1b5051dabe15eccdc17bf4b403 (patch) | |
| tree | 12a75ee6c6e1333f37d97e9a4b073602393bbc28 | |
| parent | da5d38826625c59ee4fe4aaf9c1b5f35bd2bbbbb (diff) | |
| download | nextcloud-server-b129079bed8ebd1b5051dabe15eccdc17bf4b403.tar.gz nextcloud-server-b129079bed8ebd1b5051dabe15eccdc17bf4b403.zip | |
show error code if file upload fails
| -rw-r--r-- | files/ajax/upload.php | 4 | ||||
| -rw-r--r-- | files/js/files.js | 2 |
2 files changed, 4 insertions, 2 deletions
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(); } |