Fix file upload feedback

inc/spot.php

@@ -327,9 +327,9 @@ class Spot extends Main
 	public function upload()
 	{
 		$this->oClassManagement->incClass('uploader', true);
-		new Uploader($this->oPicture);
+		$oUploader = new Uploader($this->oPicture);
 		
-		return self::getJsonResult(true, '');
+		return $oUploader->sBody;
 	}
 	
 	public function getAdminSettings() {

inc/uploader.php

@@ -8,10 +8,13 @@ class Uploader extends UploadHandler
 	 */
 	private $oPicture;
 	
+	public $sBody;
+
 	function __construct(&$oPicture)
 	{
 		$this->error_messages['wrong_project_mode'] = 'Le projet n\'est pas en mode "blog".';
 		$this->oPicture = &$oPicture;
+		$this->sBody = '';
 		parent::__construct(array('image_versions'=>array(), 'accept_file_types'=>'/\.(gif|jpe?g|png)$/i'));
 	}
 	
@@ -29,6 +32,7 @@ class Uploader extends UploadHandler
 	
 	protected function handle_file_upload($uploaded_file, $name, $size, $type, $error, $index = null, $content_range = null) {
 		$file = parent::handle_file_upload($uploaded_file, $name, $size, $type, $error, $index, $content_range);
+		
 		if(empty($file->error)) {
 			$sError = $this->oPicture->addPic($file->name);
 			if($sError!='') {
@@ -38,6 +42,10 @@ class Uploader extends UploadHandler
 		
 		return $file;
 	}
+	
+	protected function body($sBodyPart) {
+		$this->sBody .= $sBodyPart;
+	}
 }
 
 /*

masks/upload.html

@@ -16,20 +16,17 @@ oSpot.pageInit = function(asHash)
 			.fileupload({
 				dataType: 'json',
 				acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-				done: function (e, asResult) {
+				done: function (e, asData) {
 					var $Status = $('#status');
-					$.each(asResult.files, function(iKey, oFile) {
+					$.each(asData.result.files, function(iKey, oFile) {
 						var sMsg = ('error' in oFile)?oFile.error:(oFile.name+" uploaded successfully");
 						$Status.append($('<p>').text(sMsg));
 					});
 				},
 				progressall: function (e, data) {
-			        var progress = parseInt(data.loaded / data.total * 100, 10);
-			        $('#progress .bar').css(
-			            'width',
-			            progress + '%'
-			        );
-			    }
+					var progress = parseInt(data.loaded / data.total * 100, 10);
+					$('#progress .bar').css('width', progress+'%');
+				}
 			});
 	}
 	else $('#messages').empty().append('Le projet "'+asProject.name+'" n\'est pas en mode blog. Aucun upload possible.');