From 91e68fedafff74e856b38279927b77e0a88db154 Mon Sep 17 00:00:00 2001
From: Michael Dale <dale@users.mediawiki.org>
Date: Mon, 17 Aug 2009 16:46:08 +0000
Subject: [PATCH] * updated missing or "bad" token error

---
 js2/mwEmbed/libAddMedia/mvFirefogg.js       | 11 ++++++++---
 js2/mwEmbed/libAddMedia/simpleUploadForm.js |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js
index 6f142dd062..3341e0a766 100644
--- a/js2/mwEmbed/libAddMedia/mvFirefogg.js
+++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js
@@ -14,10 +14,12 @@ loadGM({
 	"fogg-use_latest_fox"		: "Please first install <a href=\"http://www.mozilla.com/en-US/firefox/upgrade.html?from=firefogg\">Firefox 3.5</a> (or later). <i>then revisit this page to install the <b>firefogg</b> extention</i>",	
 	"fogg-passthrough_mode"	    : "Your selected file is already ogg or not a video file",
 	"fogg-transcoding"			: "Encoding Video to Ogg",
-	"fogg-encoding-done"		: "Encoding Done"
+	"fogg-encoding-done"		: "Encoding Done",
+	"fogg-badtoken"				: "Token is not valid"
+	
 });
 
-var firefogg_install_links =  {
+var firefogg_install_inks =  {
 	'macosx':	'http://firefogg.org/macosx/Firefogg.xpi',
 	'win32'	:	'http://firefogg.org/win32/Firefogg.xpi',
 	'linux' :	'http://firefogg.org/linux/Firefogg.xpi'
@@ -477,7 +479,10 @@ mvFirefogg.prototype = { //extends mvBaseUploadInterface
 					'File:'+ _this.formData['wpDestFile'], 
 					_this.api_url, 
 					function( eToken ){		
-						if(eToken==)								
+						if( !eToken || eToken == '+\\' ){
+							_this.updateProgressWin(gM('fogg-badtoken'), gM('fogg-badtoken'));
+							return false;
+						}							
 						_this.etoken = eToken;
 						_this.doChunkWithFormData();
 					}
diff --git a/js2/mwEmbed/libAddMedia/simpleUploadForm.js b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
index 0dfd001a1b..8495a02f6f 100644
--- a/js2/mwEmbed/libAddMedia/simpleUploadForm.js
+++ b/js2/mwEmbed/libAddMedia/simpleUploadForm.js
@@ -45,6 +45,7 @@ var default_form_options = {
 				$(this.selector).html( gM('error_not_loggedin') );
 				return false;
 			}
+			
 			//build the api based upload form: 
 			var o = '<div style="margin: 0 auto;width:450px;">'+
 				'<form id="suf-upload" enctype="multipart/form-data" action="' + opt.api_target + '" method="post">'  +
-- 
2.20.1