From b129079bed8ebd1b5051dabe15eccdc17bf4b403 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Sat, 16 Apr 2011 23:28:50 +0200
Subject: [PATCH] show error code if file upload fails
---
files/ajax/upload.php | 4 +++-
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 b3facf9672..79b6c0b284 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 ba08e25434..9eeeb7f6bf 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();
}
--
GitLab