Index: trunk/core/admin_templates/js/uploader.js
===================================================================
diff -u -N -r8178 -r8402
--- trunk/core/admin_templates/js/uploader.js	(.../uploader.js)	(revision 8178)
+++ trunk/core/admin_templates/js/uploader.js	(.../uploader.js)	(revision 8402)
@@ -33,7 +33,7 @@
 	this.uploaded = 0;
 
 	this.flash_id = UploadsManager.NextFlashId();
-	this.swf = new SWFObject('SWFUpload.swf', this.flash_id, "0", "0", "8", "#000000");
+	this.swf = new SWFObject('swfupload.swf', this.flash_id, "0", "0", "8", "#000000");
 	this.swf.setAttribute('style', '');
 	this.swf.addVariable("uploadScript", '');
 	this.swf.addVariable("maxFiles", escape(this.params.multiple));
@@ -48,7 +48,6 @@
   this.swf.addVariable("uploadFileCancelCallback",  escape('UploadsManager.FileCancelled'));
   this.swf.addVariable("uploadQueueCompleteCallback",  escape('UploadsManager.UploadQueueComplete'));
   this.swf.addVariable("uploadFileErrorCallback",  escape('UploadsManager.UploadError'));
-  this.swf.addVariable("uploadCancelCallback",  escape('uploadCancel'));
   this.swf.addVariable("autoUpload",  escape('false'));
 //  this.swf.addVariable("flashLoadedCallback",  'flashLoadedCallback');
 
@@ -310,7 +309,7 @@
 			upl.files.push(file);
 			upl.total += file.size;
 			if (upl.files[0].uploaded) {
-				UploadsManager.DeleteFile(file.uploader_id, upl.files[0].name);
+				UploadsManager.DeleteFile(file.uploader_id, upl.files[0].name, true);
 			}
 			else {
 				upl.flash.cancelFile(upl.files[0].id);
@@ -337,15 +336,25 @@
 
 UploadsManager.UploadError = function(errno, file, msg)
 {
-	alert('error '+errno)
-	alert('Error: '+msg+' on file '+file.name);
+	this.Uploaders[file.uploader_id].RemoveFile(file);
+	if (errno == -10) {
+		switch (msg.toString()) {
+			case '403':
+				msg = 'You don\'t have permission to upload';
+				break;
+			case '500':
+				msg = 'Write permissions not set on the server, please contact server administrator';
+				break;
+		}
+	}
+	alert('Error: '+msg+'\nOccured on file '+file.name);
 }
 
-UploadsManager.DeleteFile = function(mov, fname)
+UploadsManager.DeleteFile = function(mov, fname, confirmed)
 {
-	if (!confirm('Are you sure you want to delete this file?')) return;
+	if (!confirmed && !confirm('Are you sure you want to delete this file?')) return;
 	Request.makeRequest(
-		this.Uploaders[mov].deleteURL.replace('#FILE#', fname),
+		this.Uploaders[mov].deleteURL.replace('#FILE#', fname).replace('#FIELD#', this.Uploaders[mov].params.field),
 		false, '',
 		function(req, fname, upl) {
 			upl.RemoveFile({id:fname})