[TASK] Remove Flash Uploader Functionality 46/19146/2
authorBenjamin Mack <benni@typo3.org>
Thu, 21 Mar 2013 17:52:28 +0000 (18:52 +0100)
committerBenjamin Mack <benni@typo3.org>
Fri, 22 Mar 2013 15:51:37 +0000 (16:51 +0100)
As there is a better HTML5 alternative in the
Backend since TYPO3 CMS 6.0, the
flash uploader has only little benefits anymore.

The patch removes all occurrences (except labels)
that are related to swfupload, as well as swfupload
itself.

Releases: 6.1
Resolves: #46510
Change-Id: I76ce06900b74de2e3cdc79caf9984e050bf40990
Reviewed-on: https://review.typo3.org/19146
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Mattias Nilsson
Tested-by: Mattias Nilsson
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
Reviewed-by: Benjamin Mack
Tested-by: Benjamin Mack
17 files changed:
typo3/contrib/swfupload/license.txt [deleted file]
typo3/contrib/swfupload/plugins/swfobject_license.txt [deleted file]
typo3/contrib/swfupload/plugins/swfupload.cookies.js [deleted file]
typo3/contrib/swfupload/plugins/swfupload.queue.js [deleted file]
typo3/contrib/swfupload/plugins/swfupload.speed.js [deleted file]
typo3/contrib/swfupload/plugins/swfupload.swfobject.js [deleted file]
typo3/contrib/swfupload/swfupload.js [deleted file]
typo3/contrib/swfupload/swfupload.swf [deleted file]
typo3/js/flashupload.js [deleted file]
typo3/sysext/about/Resources/Private/Partials/ExternalLibraries.html
typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/setup/ext_tables.php
typo3/sysext/t3skin/stylesheets/structure/module_file_upload.css [deleted file]

diff --git a/typo3/contrib/swfupload/license.txt b/typo3/contrib/swfupload/license.txt
deleted file mode 100755 (executable)
index 80651f4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
\ No newline at end of file
diff --git a/typo3/contrib/swfupload/plugins/swfobject_license.txt b/typo3/contrib/swfupload/plugins/swfobject_license.txt
deleted file mode 100755 (executable)
index 189d009..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-/*     SWFObject v2.0 rc4 <http://code.google.com/p/swfobject/>
-       Copyright (c) 2007 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-       This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
diff --git a/typo3/contrib/swfupload/plugins/swfupload.cookies.js b/typo3/contrib/swfupload/plugins/swfupload.cookies.js
deleted file mode 100755 (executable)
index dd3b78b..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-       Cookie Plug-in
-       
-       This plug in automatically gets all the cookies for this site and adds them to the post_params.
-       Cookies are loaded only on initialization.  The refreshCookies function can be called to update the post_params.
-       The cookies will override any other post params with the same name.
-*/
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-       SWFUpload.prototype.initSettings = function (oldInitSettings) {
-               return function () {
-                       if (typeof(oldInitSettings) === "function") {
-                               oldInitSettings.call(this);
-                       }
-                       
-                       this.refreshCookies(false);     // The false parameter must be sent since SWFUpload has not initialzed at this point
-               };
-       }(SWFUpload.prototype.initSettings);
-       
-       // refreshes the post_params and updates SWFUpload.  The sendToFlash parameters is optional and defaults to True
-       SWFUpload.prototype.refreshCookies = function (sendToFlash) {
-               if (sendToFlash === undefined) {
-                       sendToFlash = true;
-               }
-               sendToFlash = !!sendToFlash;
-               
-               // Get the post_params object
-               var postParams = this.settings.post_params;
-               
-               // Get the cookies
-               var i, cookieArray = document.cookie.split(';'), caLength = cookieArray.length, c, eqIndex, name, value;
-               for (i = 0; i < caLength; i++) {
-                       c = cookieArray[i];
-                       
-                       // Left Trim spaces
-                       while (c.charAt(0) === " ") {
-                               c = c.substring(1, c.length);
-                       }
-                       eqIndex = c.indexOf("=");
-                       if (eqIndex > 0) {
-                               name = c.substring(0, eqIndex);
-                               value = c.substring(eqIndex + 1);
-                               postParams[name] = value;
-                       }
-               }
-               
-               if (sendToFlash) {
-                       this.setPostParams(postParams);
-               }
-       };
-
-}
diff --git a/typo3/contrib/swfupload/plugins/swfupload.queue.js b/typo3/contrib/swfupload/plugins/swfupload.queue.js
deleted file mode 100755 (executable)
index 69e619d..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-       Queue Plug-in
-       
-       Features:
-               *Adds a cancelQueue() method for cancelling the entire queue.
-               *All queued files are uploaded when startUpload() is called.
-               *If false is returned from uploadComplete then the queue upload is stopped.
-                If false is not returned (strict comparison) then the queue upload is continued.
-               *Adds a QueueComplete event that is fired when all the queued files have finished uploading.
-                Set the event handler with the queue_complete_handler setting.
-               
-       */
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-       SWFUpload.queue = {};
-       
-       SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-               return function () {
-                       if (typeof(oldInitSettings) === "function") {
-                               oldInitSettings.call(this);
-                       }
-                       
-                       this.queueSettings = {};
-                       
-                       this.queueSettings.queue_cancelled_flag = false;
-                       this.queueSettings.queue_upload_count = 0;
-                       
-                       this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-                       this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
-                       this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
-                       this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
-                       
-                       this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
-               };
-       })(SWFUpload.prototype.initSettings);
-
-       SWFUpload.prototype.startUpload = function (fileID) {
-               this.queueSettings.queue_cancelled_flag = false;
-               this.callFlash("StartUpload", [fileID]);
-       };
-
-       SWFUpload.prototype.cancelQueue = function () {
-               this.queueSettings.queue_cancelled_flag = true;
-               this.stopUpload();
-               
-               var stats = this.getStats();
-               while (stats.files_queued > 0) {
-                       this.cancelUpload();
-                       stats = this.getStats();
-               }
-       };
-       
-       SWFUpload.queue.uploadStartHandler = function (file) {
-               var returnValue;
-               if (typeof(this.queueSettings.user_upload_start_handler) === "function") {
-                       returnValue = this.queueSettings.user_upload_start_handler.call(this, file);
-               }
-               
-               // To prevent upload a real "FALSE" value must be returned, otherwise default to a real "TRUE" value.
-               returnValue = (returnValue === false) ? false : true;
-               
-               this.queueSettings.queue_cancelled_flag = !returnValue;
-
-               return returnValue;
-       };
-       
-       SWFUpload.queue.uploadCompleteHandler = function (file) {
-               var user_upload_complete_handler = this.queueSettings.user_upload_complete_handler;
-               var continueUpload;
-               
-               if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
-                       this.queueSettings.queue_upload_count++;
-               }
-
-               if (typeof(user_upload_complete_handler) === "function") {
-                       continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
-               } else if (file.filestatus === SWFUpload.FILE_STATUS.QUEUED) {
-                       // If the file was stopped and re-queued don't restart the upload
-                       continueUpload = false;
-               } else {
-                       continueUpload = true;
-               }
-               
-               if (continueUpload) {
-                       var stats = this.getStats();
-                       if (stats.files_queued > 0 && this.queueSettings.queue_cancelled_flag === false) {
-                               this.startUpload();
-                       } else if (this.queueSettings.queue_cancelled_flag === false) {
-                               this.queueEvent("queue_complete_handler", [this.queueSettings.queue_upload_count]);
-                               this.queueSettings.queue_upload_count = 0;
-                       } else {
-                               this.queueSettings.queue_cancelled_flag = false;
-                               this.queueSettings.queue_upload_count = 0;
-                       }
-               }
-       };
-}
\ No newline at end of file
diff --git a/typo3/contrib/swfupload/plugins/swfupload.speed.js b/typo3/contrib/swfupload/plugins/swfupload.speed.js
deleted file mode 100755 (executable)
index 3245c9c..0000000
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-       Speed Plug-in
-       
-       Features:
-               *Adds several properties to the 'file' object indicated upload speed, time left, upload time, etc.
-                       - currentSpeed -- String indicating the upload speed, bytes per second
-                       - averageSpeed -- Overall average upload speed, bytes per second
-                       - movingAverageSpeed -- Speed over averaged over the last several measurements, bytes per second
-                       - timeRemaining -- Estimated remaining upload time in seconds
-                       - timeElapsed -- Number of seconds passed for this upload
-                       - percentUploaded -- Percentage of the file uploaded (0 to 100)
-                       - sizeUploaded -- Formatted size uploaded so far, bytes
-               
-               *Adds setting 'moving_average_history_size' for defining the window size used to calculate the moving average speed.
-               
-               *Adds several Formatting functions for formatting that values provided on the file object.
-                       - SWFUpload.speed.formatBPS(bps) -- outputs string formatted in the best units (Gbps, Mbps, Kbps, bps)
-                       - SWFUpload.speed.formatTime(seconds) -- outputs string formatted in the best units (x Hr y M z S)
-                       - SWFUpload.speed.formatSize(bytes) -- outputs string formatted in the best units (w GB x MB y KB z B )
-                       - SWFUpload.speed.formatPercent(percent) -- outputs string formatted with a percent sign (x.xx %)
-                       - SWFUpload.speed.formatUnits(baseNumber, divisionArray, unitLabelArray, fractionalBoolean)
-                               - Formats a number using the division array to determine how to apply the labels in the Label Array
-                               - factionalBoolean indicates whether the number should be returned as a single fractional number with a unit (speed)
-                                   or as several numbers labeled with units (time)
-       */
-
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-       SWFUpload.speed = {};
-       
-       SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-               return function () {
-                       if (typeof(oldInitSettings) === "function") {
-                               oldInitSettings.call(this);
-                       }
-                       
-                       this.ensureDefault = function (settingName, defaultValue) {
-                               this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-                       };
-
-                       // List used to keep the speed stats for the files we are tracking
-                       this.fileSpeedStats = {};
-                       this.speedSettings = {};
-
-                       this.ensureDefault("moving_average_history_size", "10");
-                       
-                       this.speedSettings.user_file_queued_handler = this.settings.file_queued_handler;
-                       this.speedSettings.user_file_queue_error_handler = this.settings.file_queue_error_handler;
-                       this.speedSettings.user_upload_start_handler = this.settings.upload_start_handler;
-                       this.speedSettings.user_upload_error_handler = this.settings.upload_error_handler;
-                       this.speedSettings.user_upload_progress_handler = this.settings.upload_progress_handler;
-                       this.speedSettings.user_upload_success_handler = this.settings.upload_success_handler;
-                       this.speedSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
-                       
-                       this.settings.file_queued_handler = SWFUpload.speed.fileQueuedHandler;
-                       this.settings.file_queue_error_handler = SWFUpload.speed.fileQueueErrorHandler;
-                       this.settings.upload_start_handler = SWFUpload.speed.uploadStartHandler;
-                       this.settings.upload_error_handler = SWFUpload.speed.uploadErrorHandler;
-                       this.settings.upload_progress_handler = SWFUpload.speed.uploadProgressHandler;
-                       this.settings.upload_success_handler = SWFUpload.speed.uploadSuccessHandler;
-                       this.settings.upload_complete_handler = SWFUpload.speed.uploadCompleteHandler;
-                       
-                       delete this.ensureDefault;
-               };
-       })(SWFUpload.prototype.initSettings);
-
-       
-       SWFUpload.speed.fileQueuedHandler = function (file) {
-               if (typeof this.speedSettings.user_file_queued_handler === "function") {
-                       file = SWFUpload.speed.extendFile(file);
-                       
-                       return this.speedSettings.user_file_queued_handler.call(this, file);
-               }
-       };
-       
-       SWFUpload.speed.fileQueueErrorHandler = function (file, errorCode, message) {
-               if (typeof this.speedSettings.user_file_queue_error_handler === "function") {
-                       file = SWFUpload.speed.extendFile(file);
-                       
-                       return this.speedSettings.user_file_queue_error_handler.call(this, file, errorCode, message);
-               }
-       };
-
-       SWFUpload.speed.uploadStartHandler = function (file) {
-               if (typeof this.speedSettings.user_upload_start_handler === "function") {
-                       file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-                       return this.speedSettings.user_upload_start_handler.call(this, file);
-               }
-       };
-       
-       SWFUpload.speed.uploadErrorHandler = function (file, errorCode, message) {
-               file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-               SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
-
-               if (typeof this.speedSettings.user_upload_error_handler === "function") {
-                       return this.speedSettings.user_upload_error_handler.call(this, file, errorCode, message);
-               }
-       };
-       SWFUpload.speed.uploadProgressHandler = function (file, bytesComplete, bytesTotal) {
-               this.updateTracking(file, bytesComplete);
-               file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-
-               if (typeof this.speedSettings.user_upload_progress_handler === "function") {
-                       return this.speedSettings.user_upload_progress_handler.call(this, file, bytesComplete, bytesTotal);
-               }
-       };
-       
-       SWFUpload.speed.uploadSuccessHandler = function (file, serverData) {
-               if (typeof this.speedSettings.user_upload_success_handler === "function") {
-                       file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-                       return this.speedSettings.user_upload_success_handler.call(this, file, serverData);
-               }
-       };
-       SWFUpload.speed.uploadCompleteHandler = function (file) {
-               file = SWFUpload.speed.extendFile(file, this.fileSpeedStats);
-               SWFUpload.speed.removeTracking(file, this.fileSpeedStats);
-
-               if (typeof this.speedSettings.user_upload_complete_handler === "function") {
-                       return this.speedSettings.user_upload_complete_handler.call(this, file);
-               }
-       };
-       
-       // Private: extends the file object with the speed plugin values
-       SWFUpload.speed.extendFile = function (file, trackingList) {
-               var tracking;
-               
-               if (trackingList) {
-                       tracking = trackingList[file.id];
-               }
-               
-               if (tracking) {
-                       file.currentSpeed = tracking.currentSpeed;
-                       file.averageSpeed = tracking.averageSpeed;
-                       file.movingAverageSpeed = tracking.movingAverageSpeed;
-                       file.timeRemaining = tracking.timeRemaining;
-                       file.timeElapsed = tracking.timeElapsed;
-                       file.percentUploaded = tracking.percentUploaded;
-                       file.sizeUploaded = tracking.bytesUploaded;
-
-               } else {
-                       file.currentSpeed = 0;
-                       file.averageSpeed = 0;
-                       file.movingAverageSpeed = 0;
-                       file.timeRemaining = 0;
-                       file.timeElapsed = 0;
-                       file.percentUploaded = 0;
-                       file.sizeUploaded = 0;
-               }
-               
-               return file;
-       };
-       
-       // Private: Updates the speed tracking object, or creates it if necessary
-       SWFUpload.prototype.updateTracking = function (file, bytesUploaded) {
-               var tracking = this.fileSpeedStats[file.id];
-               if (!tracking) {
-                       this.fileSpeedStats[file.id] = tracking = {};
-               }
-               
-               // Sanity check inputs
-               bytesUploaded = bytesUploaded || tracking.bytesUploaded || 0;
-               if (bytesUploaded < 0) {
-                       bytesUploaded = 0;
-               }
-               if (bytesUploaded > file.size) {
-                       bytesUploaded = file.size;
-               }
-               
-               var tickTime = (new Date()).getTime();
-               if (!tracking.startTime) {
-                       tracking.startTime = (new Date()).getTime();
-                       tracking.lastTime = tracking.startTime;
-                       tracking.currentSpeed = 0;
-                       tracking.averageSpeed = 0;
-                       tracking.movingAverageSpeed = 0;
-                       tracking.movingAverageHistory = [];
-                       tracking.timeRemaining = 0;
-                       tracking.timeElapsed = 0;
-                       tracking.percentUploaded = bytesUploaded / file.size;
-                       tracking.bytesUploaded = bytesUploaded;
-               } else if (tracking.startTime > tickTime) {
-                       this.debug("When backwards in time");
-               } else {
-                       // Get time and deltas
-                       var now = (new Date()).getTime();
-                       var lastTime = tracking.lastTime;
-                       var deltaTime = now - lastTime;
-                       var deltaBytes = bytesUploaded - tracking.bytesUploaded;
-                       
-                       if (deltaBytes === 0 || deltaTime === 0) {
-                               return tracking;
-                       }
-                       
-                       // Update tracking object
-                       tracking.lastTime = now;
-                       tracking.bytesUploaded = bytesUploaded;
-                       
-                       // Calculate speeds
-                       tracking.currentSpeed = (deltaBytes * 8 ) / (deltaTime / 1000);
-                       tracking.averageSpeed = (tracking.bytesUploaded * 8) / ((now - tracking.startTime) / 1000);
-
-                       // Calculate moving average
-                       tracking.movingAverageHistory.push(tracking.currentSpeed);
-                       if (tracking.movingAverageHistory.length > this.settings.moving_average_history_size) {
-                               tracking.movingAverageHistory.shift();
-                       }
-                       
-                       tracking.movingAverageSpeed = SWFUpload.speed.calculateMovingAverage(tracking.movingAverageHistory);
-                       
-                       // Update times
-                       tracking.timeRemaining = (file.size - tracking.bytesUploaded) * 8 / tracking.movingAverageSpeed;
-                       tracking.timeElapsed = (now - tracking.startTime) / 1000;
-                       
-                       // Update percent
-                       tracking.percentUploaded = (tracking.bytesUploaded / file.size * 100);
-               }
-               
-               return tracking;
-       };
-       SWFUpload.speed.removeTracking = function (file, trackingList) {
-               try {
-                       trackingList[file.id] = null;
-                       delete trackingList[file.id];
-               } catch (ex) {
-               }
-       };
-       
-       SWFUpload.speed.formatUnits = function (baseNumber, unitDivisors, unitLabels, singleFractional) {
-               var i, unit, unitDivisor, unitLabel;
-
-               if (baseNumber === 0) {
-                       return "0 " + unitLabels[unitLabels.length - 1];
-               }
-               
-               if (singleFractional) {
-                       unit = baseNumber;
-                       unitLabel = unitLabels.length >= unitDivisors.length ? unitLabels[unitDivisors.length - 1] : "";
-                       for (i = 0; i < unitDivisors.length; i++) {
-                               if (baseNumber >= unitDivisors[i]) {
-                                       unit = (baseNumber / unitDivisors[i]).toFixed(2);
-                                       unitLabel = unitLabels.length >= i ? " " + unitLabels[i] : "";
-                                       break;
-                               }
-                       }
-                       
-                       return unit + unitLabel;
-               } else {
-                       var formattedStrings = [];
-                       var remainder = baseNumber;
-                       
-                       for (i = 0; i < unitDivisors.length; i++) {
-                               unitDivisor = unitDivisors[i];
-                               unitLabel = unitLabels.length > i ? " " + unitLabels[i] : "";
-                               
-                               unit = remainder / unitDivisor;
-                               if (i < unitDivisors.length -1) {
-                                       unit = Math.floor(unit);
-                               } else {
-                                       unit = unit.toFixed(2);
-                               }
-                               if (unit > 0) {
-                                       remainder = remainder % unitDivisor;
-                                       
-                                       formattedStrings.push(unit + unitLabel);
-                               }
-                       }
-                       
-                       return formattedStrings.join(" ");
-               }
-       };
-       
-       SWFUpload.speed.formatBPS = function (baseNumber) {
-               var bpsUnits = [1073741824, 1048576, 1024, 1], bpsUnitLabels = ["Gbps", "Mbps", "Kbps", "bps"];
-               return SWFUpload.speed.formatUnits(baseNumber, bpsUnits, bpsUnitLabels, true);
-       
-       };
-       SWFUpload.speed.formatTime = function (baseNumber) {
-               var timeUnits = [86400, 3600, 60, 1], timeUnitLabels = ["d", "h", "m", "s"];
-               return SWFUpload.speed.formatUnits(baseNumber, timeUnits, timeUnitLabels, false);
-       
-       };
-       SWFUpload.speed.formatBytes = function (baseNumber) {
-               var sizeUnits = [1073741824, 1048576, 1024, 1], sizeUnitLabels = ["GB", "MB", "KB", "bytes"];
-               return SWFUpload.speed.formatUnits(baseNumber, sizeUnits, sizeUnitLabels, true);
-       
-       };
-       SWFUpload.speed.formatPercent = function (baseNumber) {
-               return baseNumber.toFixed(2) + " %";
-       };
-       
-       SWFUpload.speed.calculateMovingAverage = function (history) {
-               var vals = [], size, sum = 0.0, mean = 0.0, varianceTemp = 0.0, variance = 0.0, standardDev = 0.0;
-               var i;
-               var mSum = 0, mCount = 0;
-               
-               size = history.length;
-               
-               // Check for sufficient data
-               if (size >= 8) {
-                       // Clone the array and Calculate sum of the values 
-                       for (i = 0; i < size; i++) {
-                               vals[i] = history[i];
-                               sum += vals[i];
-                       }
-
-                       mean = sum / size;
-
-                       // Calculate variance for the set
-                       for (i = 0; i < size; i++) {
-                               varianceTemp += Math.pow((vals[i] - mean), 2);
-                       }
-
-                       variance = varianceTemp / size;
-                       standardDev = Math.sqrt(variance);
-                       
-                       //Standardize the Data
-                       for (i = 0; i < size; i++) {
-                               vals[i] = (vals[i] - mean) / standardDev;
-                       }
-
-                       // Calculate the average excluding outliers
-                       var deviationRange = 2.0;
-                       for (i = 0; i < size; i++) {
-                               
-                               if (vals[i] <= deviationRange && vals[i] >= -deviationRange) {
-                                       mCount++;
-                                       mSum += history[i];
-                               }
-                       }
-                       
-               } else {
-                       // Calculate the average (not enough data points to remove outliers)
-                       mCount = size;
-                       for (i = 0; i < size; i++) {
-                               mSum += history[i];
-                       }
-               }
-
-               return mSum / mCount;
-       };
-       
-}
\ No newline at end of file
diff --git a/typo3/contrib/swfupload/plugins/swfupload.swfobject.js b/typo3/contrib/swfupload/plugins/swfupload.swfobject.js
deleted file mode 100755 (executable)
index ca0ca50..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-       SWFUpload.SWFObject Plugin
-
-       Summary:
-               This plugin uses SWFObject to embed SWFUpload dynamically in the page.  SWFObject provides accurate Flash Player detection and DOM Ready loading.
-               This plugin replaces the Graceful Degradation plugin.
-
-       Features:
-               * swfupload_load_failed_hander event
-               * swfupload_pre_load_handler event
-               * minimum_flash_version setting (default: "9.0.28")
-               * SWFUpload.onload event for early loading
-
-       Usage:
-               Provide handlers and settings as needed.  When using the SWFUpload.SWFObject plugin you should initialize SWFUploading
-               in SWFUpload.onload rather than in window.onload.  When initialized this way SWFUpload can load earlier preventing the UI flicker
-               that was seen using the Graceful Degradation plugin.
-
-               <script type="text/javascript">
-                       var swfu;
-                       SWFUpload.onload = function () {
-                               swfu = new SWFUpload({
-                                       minimum_flash_version: "9.0.28",
-                                       swfupload_pre_load_handler: swfuploadPreLoad,
-                                       swfupload_load_failed_handler: swfuploadLoadFailed
-                               });
-                       };
-               </script>
-               
-       Notes:
-               You must provide set minimum_flash_version setting to "8" if you are using SWFUpload for Flash Player 8.
-               The swfuploadLoadFailed event is only fired if the minimum version of Flash Player is not met.  Other issues such as missing SWF files, browser bugs
-                or corrupt Flash Player installations will not trigger this event.
-               The swfuploadPreLoad event is fired as soon as the minimum version of Flash Player is found.  It does not wait for SWFUpload to load and can
-                be used to prepare the SWFUploadUI and hide alternate content.
-               swfobject's onDomReady event is cross-browser safe but will default to the window.onload event when DOMReady is not supported by the browser.
-                Early DOM Loading is supported in major modern browsers but cannot be guaranteed for every browser ever made.
-*/
-
-
-/* SWFObject v2.1 <http://code.google.com/p/swfobject/>
-       Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-       This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
-*/
-var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("<script id=__ie_ondomload defer=true src=//:><\/script>");J=C("__ie_ondomload");if(J){I(J,"onreadystatechange",S)}}catch(q){}}if(h.webkit&&typeof K.readyState!=b){Z=setInterval(function(){if(/loaded|complete/.test(K.readyState)){E()}},10)}if(typeof K.addEventListener!=b){K.addEventListener("DOMContentLoaded",E,null)}R(E)}();function S(){if(J.readyState=="complete"){J.parentNode.removeChild(J);E()}}function E(){if(e){return }if(h.ie&&h.win){var v=a("span");try{var u=K.getElementsByTagName("body")[0].appendChild(v);u.parentNode.removeChild(u)}catch(w){return }}e=true;if(Z){clearInterval(Z);Z=null}var q=o.length;for(var r=0;r<q;r++){o[r]()}}function f(q){if(e){q()}else{o[o.length]=q}}function R(r){if(typeof j.addEventListener!=b){j.addEventListener("load",r,false)}else{if(typeof K.addEventListener!=b){K.addEventListener("load",r,false)}else{if(typeof j.attachEvent!=b){I(j,"onload",r)}else{if(typeof j.onload=="function"){var q=j.onload;j.onload=function(){q();r()}}else{j.onload=r}}}}}function H(){var t=N.length;for(var q=0;q<t;q++){var u=N[q].id;if(h.pv[0]>0){var r=C(u);if(r){N[q].width=r.getAttribute("width")?r.getAttribute("width"):"0";N[q].height=r.getAttribute("height")?r.getAttribute("height"):"0";if(c(N[q].swfVersion)){if(h.webkit&&h.webkit<312){Y(r)}W(u,true)}else{if(N[q].expressInstall&&!A&&c("6.0.65")&&(h.win||h.mac)){k(N[q])}else{O(r)}}}}else{W(u,true)}}}function Y(t){var q=t.getElementsByTagName(Q)[0];if(q){var w=a("embed"),y=q.attributes;if(y){var v=y.length;for(var u=0;u<v;u++){if(y[u].nodeName=="DATA"){w.setAttribute("src",y[u].nodeValue)}else{w.setAttribute(y[u].nodeName,y[u].nodeValue)}}}var x=q.childNodes;if(x){var z=x.length;for(var r=0;r<z;r++){if(x[r].nodeType==1&&x[r].nodeName=="PARAM"){w.setAttribute(x[r].getAttribute("name"),x[r].getAttribute("value"))}}}t.parentNode.replaceChild(w,t)}}function k(w){A=true;var u=C(w.id);if(u){if(w.altContentId){var y=C(w.altContentId);if(y){M=y;l=w.altContentId}}else{M=G(u)}if(!(/%$/.test(w.width))&&parseInt(w.width,10)<310){w.width="310"}if(!(/%$/.test(w.height))&&parseInt(w.height,10)<137){w.height="137"}K.title=K.title.slice(0,47)+" - Flash Player Installation";var z=h.ie&&h.win?"ActiveX":"PlugIn",q=K.title,r="MMredirectURL="+j.location+"&MMplayerType="+z+"&MMdoctitle="+q,x=w.id;if(h.ie&&h.win&&u.readyState!=4){var t=a("div");x+="SWFObjectNew";t.setAttribute("id",x);u.parentNode.insertBefore(t,u);u.style.display="none";var v=function(){u.parentNode.removeChild(u)};I(j,"onload",v)}U({data:w.expressInstall,id:m,width:w.width,height:w.height},{flashvars:r},x)}}function O(t){if(h.ie&&h.win&&t.readyState!=4){var r=a("div");t.parentNode.insertBefore(r,t);r.parentNode.replaceChild(G(t),r);t.style.display="none";var q=function(){t.parentNode.removeChild(t)};I(j,"onload",q)}else{t.parentNode.replaceChild(G(t),t)}}function G(v){var u=a("div");if(h.win&&h.ie){u.innerHTML=v.innerHTML}else{var r=v.getElementsByTagName(Q)[0];if(r){var w=r.childNodes;if(w){var q=w.length;for(var t=0;t<q;t++){if(!(w[t].nodeType==1&&w[t].nodeName=="PARAM")&&!(w[t].nodeType==8)){u.appendChild(w[t].cloneNode(true))}}}}}return u}function U(AG,AE,t){var q,v=C(t);if(v){if(typeof AG.id==b){AG.id=t}if(h.ie&&h.win){var AF="";for(var AB in AG){if(AG[AB]!=Object.prototype[AB]){if(AB.toLowerCase()=="data"){AE.movie=AG[AB]}else{if(AB.toLowerCase()=="styleclass"){AF+=' class="'+AG[AB]+'"'}else{if(AB.toLowerCase()!="classid"){AF+=" "+AB+'="'+AG[AB]+'"'}}}}}var AD="";for(var AA in AE){if(AE[AA]!=Object.prototype[AA]){AD+='<param name="'+AA+'" value="'+AE[AA]+'" />'}}v.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AF+">"+AD+"</object>";i[i.length]=AG.id;q=C(AG.id)}else{if(h.webkit&&h.webkit<312){var AC=a("embed");AC.setAttribute("type",P);for(var z in AG){if(AG[z]!=Object.prototype[z]){if(z.toLowerCase()=="data"){AC.setAttribute("src",AG[z])}else{if(z.toLowerCase()=="styleclass"){AC.setAttribute("class",AG[z])}else{if(z.toLowerCase()!="classid"){AC.setAttribute(z,AG[z])}}}}}for(var y in AE){if(AE[y]!=Object.prototype[y]){if(y.toLowerCase()!="movie"){AC.setAttribute(y,AE[y])}}}v.parentNode.replaceChild(AC,v);q=AC}else{var u=a(Q);u.setAttribute("type",P);for(var x in AG){if(AG[x]!=Object.prototype[x]){if(x.toLowerCase()=="styleclass"){u.setAttribute("class",AG[x])}else{if(x.toLowerCase()!="classid"){u.setAttribute(x,AG[x])}}}}for(var w in AE){if(AE[w]!=Object.prototype[w]&&w.toLowerCase()!="movie"){F(u,w,AE[w])}}v.parentNode.replaceChild(u,v);q=u}}}return q}function F(t,q,r){var u=a("param");u.setAttribute("name",q);u.setAttribute("value",r);t.appendChild(u)}function X(r){var q=C(r);if(q&&(q.nodeName=="OBJECT"||q.nodeName=="EMBED")){if(h.ie&&h.win){if(q.readyState==4){B(r)}else{j.attachEvent("onload",function(){B(r)})}}else{q.parentNode.removeChild(q)}}}function B(t){var r=C(t);if(r){for(var q in r){if(typeof r[q]=="function"){r[q]=null}}r.parentNode.removeChild(r)}}function C(t){var q=null;try{q=K.getElementById(t)}catch(r){}return q}function a(q){return K.createElement(q)}function I(t,q,r){t.attachEvent(q,r);d[d.length]=[t,q,r]}function c(t){var r=h.pv,q=t.split(".");q[0]=parseInt(q[0],10);q[1]=parseInt(q[1],10)||0;q[2]=parseInt(q[2],10)||0;return(r[0]>q[0]||(r[0]==q[0]&&r[1]>q[1])||(r[0]==q[0]&&r[1]==q[1]&&r[2]>=q[2]))?true:false}function V(v,r){if(h.ie&&h.mac){return }var u=K.getElementsByTagName("head")[0],t=a("style");t.setAttribute("type","text/css");t.setAttribute("media","screen");if(!(h.ie&&h.win)&&typeof K.createTextNode!=b){t.appendChild(K.createTextNode(v+" {"+r+"}"))}u.appendChild(t);if(h.ie&&h.win&&typeof K.styleSheets!=b&&K.styleSheets.length>0){var q=K.styleSheets[K.styleSheets.length-1];if(typeof q.addRule==Q){q.addRule(v,r)}}}function W(t,q){var r=q?"visible":"hidden";if(e&&C(t)){C(t).style.visibility=r}else{V("#"+t,"visibility:"+r)}}function g(s){var r=/[\\\"<>\.;]/;var q=r.exec(s)!=null;return q?encodeURIComponent(s):s}var D=function(){if(h.ie&&h.win){window.attachEvent("onunload",function(){var w=d.length;for(var v=0;v<w;v++){d[v][0].detachEvent(d[v][1],d[v][2])}var t=i.length;for(var u=0;u<t;u++){X(i[u])}for(var r in h){h[r]=null}h=null;for(var q in swfobject){swfobject[q]=null}swfobject=null})}}();return{registerObject:function(u,q,t){if(!h.w3cdom||!u||!q){return }var r={};r.id=u;r.swfVersion=q;r.expressInstall=t?t:false;N[N.length]=r;W(u,false)},getObjectById:function(v){var q=null;if(h.w3cdom){var t=C(v);if(t){var u=t.getElementsByTagName(Q)[0];if(!u||(u&&typeof t.SetVariable!=b)){q=t}else{if(typeof u.SetVariable!=b){q=u}}}}return q},embedSWF:function(x,AE,AB,AD,q,w,r,z,AC){if(!h.w3cdom||!x||!AE||!AB||!AD||!q){return }AB+="";AD+="";if(c(q)){W(AE,false);var AA={};if(AC&&typeof AC===Q){for(var v in AC){if(AC[v]!=Object.prototype[v]){AA[v]=AC[v]}}}AA.data=x;AA.width=AB;AA.height=AD;var y={};if(z&&typeof z===Q){for(var u in z){if(z[u]!=Object.prototype[u]){y[u]=z[u]}}}if(r&&typeof r===Q){for(var t in r){if(r[t]!=Object.prototype[t]){if(typeof y.flashvars!=b){y.flashvars+="&"+t+"="+r[t]}else{y.flashvars=t+"="+r[t]}}}}f(function(){U(AA,y,AE);if(AA.id==AE){W(AE,true)}})}else{if(w&&!A&&c("6.0.65")&&(h.win||h.mac)){A=true;W(AE,false);f(function(){var AF={};AF.id=AF.altContentId=AE;AF.width=AB;AF.height=AD;AF.expressInstall=w;k(AF)})}}},getFlashPlayerVersion:function(){return{major:h.pv[0],minor:h.pv[1],release:h.pv[2]}},hasFlashPlayerVersion:c,createSWF:function(t,r,q){if(h.w3cdom){return U(t,r,q)}else{return undefined}},removeSWF:function(q){if(h.w3cdom){X(q)}},createCSS:function(r,q){if(h.w3cdom){V(r,q)}},addDomLoadEvent:f,addLoadEvent:R,getQueryParamValue:function(v){var u=K.location.search||K.location.hash;if(v==null){return g(u)}if(u){var t=u.substring(1).split("&");for(var r=0;r<t.length;r++){if(t[r].substring(0,t[r].indexOf("="))==v){return g(t[r].substring((t[r].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(A&&M){var q=C(m);if(q){q.parentNode.replaceChild(M,q);if(l){W(l,true);if(h.ie&&h.win){M.style.display="block"}}M=null;l=null;A=false}}}}}();
-
-
-       
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-       SWFUpload.onload = function () {};
-       
-       swfobject.addDomLoadEvent(function () {
-               if (typeof(SWFUpload.onload) === "function") {
-                       SWFUpload.onload.call(window);
-               }
-       });
-       
-       SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-               return function () {
-                       if (typeof(oldInitSettings) === "function") {
-                               oldInitSettings.call(this);
-                       }
-
-                       this.ensureDefault = function (settingName, defaultValue) {
-                               this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-                       };
-
-                       this.ensureDefault("minimum_flash_version", "9.0.28");
-                       this.ensureDefault("swfupload_pre_load_handler", null);
-                       this.ensureDefault("swfupload_load_failed_handler", null);
-
-                       delete this.ensureDefault;
-
-               };
-       })(SWFUpload.prototype.initSettings);
-
-
-       SWFUpload.prototype.loadFlash = function (oldLoadFlash) {
-               return function () {
-                       var hasFlash = swfobject.hasFlashPlayerVersion(this.settings.minimum_flash_version);
-                       
-                       if (hasFlash) {
-                               this.queueEvent("swfupload_pre_load_handler");
-                               if (typeof(oldLoadFlash) === "function") {
-                                       oldLoadFlash.call(this);
-                               }
-                       } else {
-                               this.queueEvent("swfupload_load_failed_handler");
-                       }
-               };
-               
-       }(SWFUpload.prototype.loadFlash);
-                       
-       SWFUpload.prototype.displayDebugInfo = function (oldDisplayDebugInfo) {
-               return function () {
-                       if (typeof(oldDisplayDebugInfo) === "function") {
-                               oldDisplayDebugInfo.call(this);
-                       }
-                       
-                       this.debug(
-                               [
-                                       "SWFUpload.SWFObject Plugin settings:", "\n",
-                                       "\t", "minimum_flash_version:                      ", this.settings.minimum_flash_version, "\n",
-                                       "\t", "swfupload_pre_load_handler assigned:     ", (typeof(this.settings.swfupload_pre_load_handler) === "function").toString(), "\n",
-                                       "\t", "swfupload_load_failed_handler assigned:     ", (typeof(this.settings.swfupload_load_failed_handler) === "function").toString(), "\n",
-                               ].join("")
-                       );
-               };      
-       }(SWFUpload.prototype.displayDebugInfo);
-}
diff --git a/typo3/contrib/swfupload/swfupload.js b/typo3/contrib/swfupload/swfupload.js
deleted file mode 100755 (executable)
index e65b19c..0000000
+++ /dev/null
@@ -1,980 +0,0 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-
-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
-var SWFUpload;
-
-if (SWFUpload == undefined) {
-       SWFUpload = function (settings) {
-               this.initSWFUpload(settings);
-       };
-}
-
-SWFUpload.prototype.initSWFUpload = function (settings) {
-       try {
-               this.customSettings = {};       // A container where developers can place their own settings associated with this instance.
-               this.settings = settings;
-               this.eventQueue = [];
-               this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-               this.movieElement = null;
-
-
-               // Setup global control tracking
-               SWFUpload.instances[this.movieName] = this;
-
-               // Load the settings.  Load the Flash movie.
-               this.initSettings();
-               this.loadFlash();
-               this.displayDebugInfo();
-       } catch (ex) {
-               delete SWFUpload.instances[this.movieName];
-               throw ex;
-       }
-};
-
-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 2009-03-25";
-SWFUpload.QUEUE_ERROR = {
-       QUEUE_LIMIT_EXCEEDED                    : -100,
-       FILE_EXCEEDS_SIZE_LIMIT                 : -110,
-       ZERO_BYTE_FILE                                  : -120,
-       INVALID_FILETYPE                                : -130
-};
-SWFUpload.UPLOAD_ERROR = {
-       HTTP_ERROR                                              : -200,
-       MISSING_UPLOAD_URL                      : -210,
-       IO_ERROR                                                : -220,
-       SECURITY_ERROR                                  : -230,
-       UPLOAD_LIMIT_EXCEEDED                   : -240,
-       UPLOAD_FAILED                                   : -250,
-       SPECIFIED_FILE_ID_NOT_FOUND             : -260,
-       FILE_VALIDATION_FAILED                  : -270,
-       FILE_CANCELLED                                  : -280,
-       UPLOAD_STOPPED                                  : -290
-};
-SWFUpload.FILE_STATUS = {
-       QUEUED           : -1,
-       IN_PROGRESS      : -2,
-       ERROR            : -3,
-       COMPLETE         : -4,
-       CANCELLED        : -5
-};
-SWFUpload.BUTTON_ACTION = {
-       SELECT_FILE  : -100,
-       SELECT_FILES : -110,
-       START_UPLOAD : -120
-};
-SWFUpload.CURSOR = {
-       ARROW : -1,
-       HAND : -2
-};
-SWFUpload.WINDOW_MODE = {
-       WINDOW : "window",
-       TRANSPARENT : "transparent",
-       OPAQUE : "opaque"
-};
-
-// Private: takes a URL, determines if it is relative and converts to an absolute URL
-// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function(url) {
-       if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
-               return url;
-       }
-       
-       var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
-       
-       var indexSlash = window.location.pathname.lastIndexOf("/");
-       if (indexSlash <= 0) {
-               path = "/";
-       } else {
-               path = window.location.pathname.substr(0, indexSlash) + "/";
-       }
-       
-       return /*currentURL +*/ path + url;
-       
-};
-
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
-       this.ensureDefault = function (settingName, defaultValue) {
-               this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-       };
-       
-       // Upload backend settings
-       this.ensureDefault("upload_url", "");
-       this.ensureDefault("preserve_relative_urls", false);
-       this.ensureDefault("file_post_name", "Filedata");
-       this.ensureDefault("post_params", {});
-       this.ensureDefault("use_query_string", false);
-       this.ensureDefault("requeue_on_error", false);
-       this.ensureDefault("http_success", []);
-       this.ensureDefault("assume_success_timeout", 0);
-       
-       // File Settings
-       this.ensureDefault("file_types", "*.*");
-       this.ensureDefault("file_types_description", "All Files");
-       this.ensureDefault("file_size_limit", 0);       // Default zero means "unlimited"
-       this.ensureDefault("file_upload_limit", 0);
-       this.ensureDefault("file_queue_limit", 0);
-
-       // Flash Settings
-       this.ensureDefault("flash_url", "swfupload.swf");
-       this.ensureDefault("prevent_swf_caching", true);
-       
-       // Button Settings
-       this.ensureDefault("button_image_url", "");
-       this.ensureDefault("button_width", 1);
-       this.ensureDefault("button_height", 1);
-       this.ensureDefault("button_text", "");
-       this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-       this.ensureDefault("button_text_top_padding", 0);
-       this.ensureDefault("button_text_left_padding", 0);
-       this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-       this.ensureDefault("button_disabled", false);
-       this.ensureDefault("button_placeholder_id", "");
-       this.ensureDefault("button_placeholder", null);
-       this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-       this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-       
-       // Debug Settings
-       this.ensureDefault("debug", false);
-       this.settings.debug_enabled = this.settings.debug;      // Here to maintain v2 API
-       
-       // Event Handlers
-       this.settings.return_upload_start_handler = this.returnUploadStart;
-       this.ensureDefault("swfupload_loaded_handler", null);
-       this.ensureDefault("file_dialog_start_handler", null);
-       this.ensureDefault("file_queued_handler", null);
-       this.ensureDefault("file_queue_error_handler", null);
-       this.ensureDefault("file_dialog_complete_handler", null);
-       
-       this.ensureDefault("upload_start_handler", null);
-       this.ensureDefault("upload_progress_handler", null);
-       this.ensureDefault("upload_error_handler", null);
-       this.ensureDefault("upload_success_handler", null);
-       this.ensureDefault("upload_complete_handler", null);
-       
-       this.ensureDefault("debug_handler", this.debugMessage);
-
-       this.ensureDefault("custom_settings", {});
-
-       // Other settings
-       this.customSettings = this.settings.custom_settings;
-       
-       // Update the flash url if needed
-       if (!!this.settings.prevent_swf_caching) {
-               this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
-       }
-       
-       if (!this.settings.preserve_relative_urls) {
-               //this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);     // Don't need to do this one since flash doesn't look at it
-               this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
-               this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
-       }
-       
-       delete this.ensureDefault;
-};
-
-// Private: loadFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.loadFlash = function () {
-       var targetElement, tempParent;
-
-       // Make sure an element with the ID we are going to use doesn't already exist
-       if (document.getElementById(this.movieName) !== null) {
-               throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-       }
-
-       // Get the element where we will be placing the flash movie
-       targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
-
-       if (targetElement == undefined) {
-               throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
-       }
-
-       // Append the container and load the flash
-       tempParent = document.createElement("div");
-       tempParent.innerHTML = this.getFlashHTML();     // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-       targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-       // Fix IE Flash/Form bug
-       if (window[this.movieName] == undefined) {
-               window[this.movieName] = this.getMovieElement();
-       }
-       
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-       // Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-       return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-                               '<param name="wmode" value="', this.settings.button_window_mode, '" />',
-                               '<param name="movie" value="', this.settings.flash_url, '" />',
-                               '<param name="quality" value="high" />',
-                               '<param name="menu" value="false" />',
-                               '<param name="allowScriptAccess" value="always" />',
-                               '<param name="flashvars" value="' + this.getFlashVars() + '" />',
-                               '</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-       // Build a string from the post param object
-       var paramString = this.buildParamString();
-       var httpSuccessString = this.settings.http_success.join(",");
-       
-       // Build the parameter string
-       return ["movieName=", encodeURIComponent(this.movieName),
-                       "&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-                       "&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-                       "&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-                       "&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-                       "&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
-                       "&amp;params=", encodeURIComponent(paramString),
-                       "&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-                       "&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-                       "&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-                       "&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-                       "&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-                       "&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-                       "&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-                       "&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-                       "&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-                       "&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-                       "&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-                       "&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-                       "&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-                       "&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-                       "&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-                       "&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-                       "&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-               ].join("");
-};
-
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-       if (this.movieElement == undefined) {
-               this.movieElement = document.getElementById(this.movieName);
-       }
-
-       if (this.movieElement === null) {
-               throw "Could not find Flash element";
-       }
-       
-       return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-       var postParams = this.settings.post_params; 
-       var paramStringPairs = [];
-
-       if (typeof(postParams) === "object") {
-               for (var name in postParams) {
-                       if (postParams.hasOwnProperty(name)) {
-                               paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
-                       }
-               }
-       }
-
-       return paramStringPairs.join("&amp;");
-};
-
-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-// Credits: Major improvements provided by steffen
-SWFUpload.prototype.destroy = function () {
-       try {
-               // Make sure Flash is done before we try to remove it
-               this.cancelUpload(null, false);
-               
-
-               // Remove the SWFUpload DOM nodes
-               var movieElement = null;
-               movieElement = this.getMovieElement();
-               
-               if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-                       // Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
-                       for (var i in movieElement) {
-                               try {
-                                       if (typeof(movieElement[i]) === "function") {
-                                               movieElement[i] = null;
-                                       }
-                               } catch (ex1) {}
-                       }
-
-                       // Remove the Movie Element from the page
-                       try {
-                               movieElement.parentNode.removeChild(movieElement);
-                       } catch (ex) {}
-               }
-               
-               // Remove IE form fix reference
-               window[this.movieName] = null;
-
-               // Destroy other references
-               SWFUpload.instances[this.movieName] = null;
-               delete SWFUpload.instances[this.movieName];
-
-               this.movieElement = null;
-               this.settings = null;
-               this.customSettings = null;
-               this.eventQueue = null;
-               this.movieName = null;
-               
-               
-               return true;
-       } catch (ex2) {
-               return false;
-       }
-};
-
-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-       this.debug(
-               [
-                       "---SWFUpload Instance Info---\n",
-                       "Version: ", SWFUpload.version, "\n",
-                       "Movie Name: ", this.movieName, "\n",
-                       "Settings:\n",
-                       "\t", "upload_url:               ", this.settings.upload_url, "\n",
-                       "\t", "flash_url:                ", this.settings.flash_url, "\n",
-                       "\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-                       "\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-                       "\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-                       "\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
-                       "\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-                       "\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-                       "\t", "file_types:               ", this.settings.file_types, "\n",
-                       "\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-                       "\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-                       "\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-                       "\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-                       "\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-                       "\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-                       "\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-                       "\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
-                       "\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-                       "\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-                       "\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-                       "\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-                       "\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-                       "\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-                       "\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-                       "\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-                       "\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-                       "\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-                       "Event Handlers:\n",
-                       "\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-                       "\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-                       "\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-                       "\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-                       "\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-                       "\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-                       "\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-                       "\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-                       "\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-                       "\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-               ].join("")
-       );
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-       the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-       }
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-       }
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-       argumentArray = argumentArray || [];
-       
-       var movieElement = this.getMovieElement();
-       var returnValue, returnString;
-
-       // Flash's method if calling ExternalInterface methods (code adapted from MooTools).
-       try {
-               returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-               returnValue = eval(returnString);
-       } catch (ex) {
-               throw "Call to " + functionName + " failed";
-       }
-       
-       // Unescape file post param values
-       if (returnValue != undefined && typeof returnValue.post === "object") {
-               returnValue = this.unescapeFilePostParams(returnValue);
-       }
-
-       return returnValue;
-};
-
-/* *****************************
-       -- Flash control methods --
-       Your UI should use these
-       to operate SWFUpload
-   ***************************** */
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-       this.callFlash("SelectFile");
-};
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.
-SWFUpload.prototype.selectFiles = function () {
-       this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-       this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-       if (triggerErrorEvent !== false) {
-               triggerErrorEvent = true;
-       }
-       this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-       this.callFlash("StopUpload");
-};
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-       return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-       this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-       if (typeof(fileID) === "number") {
-               return this.callFlash("GetFileByIndex", [fileID]);
-       } else {
-               return this.callFlash("GetFile", [fileID]);
-       }
-};
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-       return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-       this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-       this.settings.upload_url = url.toString();
-       this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-       this.settings.post_params = paramsObject;
-       this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-       this.settings.post_params[name] = value;
-       this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-       delete this.settings.post_params[name];
-       this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-       this.settings.file_types = types;
-       this.settings.file_types_description = description;
-       this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-       this.settings.file_size_limit = fileSizeLimit;
-       this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-       this.settings.file_upload_limit = fileUploadLimit;
-       this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-       this.settings.file_queue_limit = fileQueueLimit;
-       this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-       this.settings.file_post_name = filePostName;
-       this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-       this.settings.use_query_string = useQueryString;
-       this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-       this.settings.requeue_on_error = requeueOnError;
-       this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-       if (typeof http_status_codes === "string") {
-               http_status_codes = http_status_codes.replace(" ", "").split(",");
-       }
-       
-       this.settings.http_success = http_status_codes;
-       this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
-       this.settings.assume_success_timeout = timeout_seconds;
-       this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
-};
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-       this.settings.debug_enabled = debugEnabled;
-       this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-       if (buttonImageURL == undefined) {
-               buttonImageURL = "";
-       }
-       
-       this.settings.button_image_url = buttonImageURL;
-       this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-       this.settings.button_width = width;
-       this.settings.button_height = height;
-       
-       var movie = this.getMovieElement();
-       if (movie != undefined) {
-               movie.style.width = width + "px";
-               movie.style.height = height + "px";
-       }
-       
-       this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-       this.settings.button_text = html;
-       this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-       this.settings.button_text_top_padding = top;
-       this.settings.button_text_left_padding = left;
-       this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-       this.settings.button_text_style = css;
-       this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-       this.settings.button_disabled = isDisabled;
-       this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-       this.settings.button_action = buttonAction;
-       this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-       this.settings.button_cursor = cursor;
-       this.callFlash("SetButtonCursor", [cursor]);
-};
-
-/* *******************************
-       Flash Event Interfaces
-       These functions are used by Flash to trigger the various
-       events.
-       
-       All these functions a Private.
-       
-       Because the ExternalInterface library is buggy the event calls
-       are added to a queue and the queue then executed by a setTimeout.
-       This ensures that events are executed in a determinate order and that
-       the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-       // Warning: Don't call this.debug inside here or you'll create an infinite loop
-       
-       if (argumentArray == undefined) {
-               argumentArray = [];
-       } else if (!(argumentArray instanceof Array)) {
-               argumentArray = [argumentArray];
-       }
-       
-       var self = this;
-       if (typeof this.settings[handlerName] === "function") {
-               // Queue the event
-               this.eventQueue.push(function () {
-                       this.settings[handlerName].apply(this, argumentArray);
-               });
-               
-               // Execute the next queued event
-               setTimeout(function () {
-                       self.executeNextEvent();
-               }, 0);
-               
-       } else if (this.settings[handlerName] !== null) {
-               throw "Event handler " + handlerName + " is unknown or is not a function";
-       }
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-       // Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-       var  f = this.eventQueue ? this.eventQueue.shift() : null;
-       if (typeof(f) === "function") {
-               f.apply(this);
-       }
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-       var reg = /[$]([0-9a-f]{4})/i;
-       var unescapedPost = {};
-       var uk;
-
-       if (file != undefined) {
-               for (var k in file.post) {
-                       if (file.post.hasOwnProperty(k)) {
-                               uk = k;
-                               var match;
-                               while ((match = reg.exec(uk)) !== null) {
-                                       uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-                               }
-                               unescapedPost[uk] = file.post[k];
-                       }
-               }
-
-               file.post = unescapedPost;
-       }
-
-       return file;
-};
-
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-       try {
-               return this.callFlash("TestExternalInterface");
-       } catch (ex) {
-               return false;
-       }
-};
-
-// Private: This event is called by Flash when it has finished loading. Don't modify this.
-// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
-SWFUpload.prototype.flashReady = function () {
-       // Check that the movie element is loaded correctly with its ExternalInterface methods defined
-       var movieElement = this.getMovieElement();
-
-       if (!movieElement) {
-               this.debug("Flash called back ready but the flash movie can't be found.");
-               return;
-       }
-
-       this.cleanUp(movieElement);
-       
-       this.queueEvent("swfupload_loaded_handler");
-};
-
-// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
-// This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function (movieElement) {
-       // Pro-actively unhook all the Flash functions
-       try {
-               if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-                       this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-                       for (var key in movieElement) {
-                               try {
-                                       if (typeof(movieElement[key]) === "function") {
-                                               movieElement[key] = null;
-                                       }
-                               } catch (ex) {
-                               }
-                       }
-               }
-       } catch (ex1) {
-       
-       }
-
-       // Fix Flashes own cleanup code so if the SWFMovie was removed from the page
-       // it doesn't display errors.
-       window["__flash__removeCallback"] = function (instance, name) {
-               try {
-                       if (instance) {
-                               instance[name] = null;
-                       }
-               } catch (flashEx) {
-               
-               }
-       };
-
-};
-
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-       this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-       You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
-       this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-       var returnValue;
-       if (typeof this.settings.upload_start_handler === "function") {
-               file = this.unescapeFilePostParams(file);
-               returnValue = this.settings.upload_start_handler.call(this, file);
-       } else if (this.settings.upload_start_handler != undefined) {
-               throw "upload_start_handler must be a function";
-       }
-
-       // Convert undefined to true so if nothing is returned from the upload_start_handler it is
-       // interpretted as 'true'.
-       if (returnValue === undefined) {
-               returnValue = true;
-       }
-       
-       returnValue = !!returnValue;
-       
-       this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-       file = this.unescapeFilePostParams(file);
-       this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-       this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-       Debug Console
-       The debug console is a self contained, in page location
-       for debug message to be sent.  The Debug Console adds
-       itself to the body if necessary.
-
-       The console is automatically scrolled as messages appear.
-       
-       If you are using your own debug handler or when you deploy to production and
-       have debug disabled you can remove these functions to reduce the file size
-       and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-       if (this.settings.debug) {
-               var exceptionMessage, exceptionValues = [];
-
-               // Check for an exception object and print it nicely
-               if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-                       for (var key in message) {
-                               if (message.hasOwnProperty(key)) {
-                                       exceptionValues.push(key + ": " + message[key]);
-                               }
-                       }
-                       exceptionMessage = exceptionValues.join("\n") || "";
-                       exceptionValues = exceptionMessage.split("\n");
-                       exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-                       SWFUpload.Console.writeLine(exceptionMessage);
-               } else {
-                       SWFUpload.Console.writeLine(message);
-               }
-       }
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-       var console, documentForm;
-
-       try {
-               console = document.getElementById("SWFUpload_Console");
-
-               if (!console) {
-                       documentForm = document.createElement("form");
-                       document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-                       console = document.createElement("textarea");
-                       console.id = "SWFUpload_Console";
-                       console.style.fontFamily = "monospace";
-                       console.setAttribute("wrap", "off");
-                       console.wrap = "off";
-                       console.style.overflow = "auto";
-                       console.style.width = "700px";
-                       console.style.height = "350px";
-                       console.style.margin = "5px";
-                       documentForm.appendChild(console);
-               }
-
-               console.value += message + "\n";
-
-               console.scrollTop = console.scrollHeight - console.clientHeight;
-       } catch (ex) {
-               alert("Exception: " + ex.name + " Message: " + ex.message);
-       }
-};
diff --git a/typo3/contrib/swfupload/swfupload.swf b/typo3/contrib/swfupload/swfupload.swf
deleted file mode 100644 (file)
index b5e8822..0000000
Binary files a/typo3/contrib/swfupload/swfupload.swf and /dev/null differ
diff --git a/typo3/js/flashupload.js b/typo3/js/flashupload.js
deleted file mode 100644 (file)
index 2809954..0000000
+++ /dev/null
@@ -1,688 +0,0 @@
-/**
- * Javascript functions regarding the inclusion 
- * of a TYPO3-customized version of SWFupload
- *
- * For proper use see filelist/mod1/index.php or the doc_core_api manual
- *
- * (c) 2009-2011 Benjamin Mack <benni@typo3.org>
- * All rights reserved
- *
- * This script is part of TYPO3 by
- * Kasper Skaarhoj <kasperYYYYY@typo3.com>
- *
- * Released under GNU/GPL (see license file in tslib/)
- *
- * This script is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * This copyright notice MUST APPEAR in all copies of this script
- */
-Ext.onReady(function() {
-
-       /**
-        * This class is a derivative of Ext.Window, with some special
-        * constructor to set some default values and a method to make
-        * sure that it's only instantiated once (see TYPO3.FileUploadWindow.getInstance())
-        * 
-        * It allows an info area (can be overriden if set with the same ID)
-        * and additional multiple components (possible to add via the add() method of Ext.Container)
-        * 
-        * Additionally, there are several events fired in the class that are specific for the upload handling
-        * that can be used in all use-cases
-        */
-       TYPO3.FileUploadWindow = Ext.extend(Ext.Window, {
-               completedUploads: 0,    // number of successfully completed uploads in this current instance, could be useful for some applications
-               activeUploads: {},              // holds all TYPO3.FileUpload instances currently uploading or in queue
-               lastError: null,        // last error occured
-               swf: null,      // holds the SWFUpload instance
-               deniedFileTypes: '',    // internal, local check to see if the uploading file is not allowed
-               swfDefaultConfig: {     // includes all default options the SWFUpload needs
-                       fileUploadWindow: null, // internal reference to the FileUploadWindow object for calling the event handlers
-
-                       flash_url:             TS.PATH_typo3 + "contrib/swfupload/swfupload.swf", // url to the swfupload flash file, should be absolute
-                       minimum_flash_version: '9.0.28',
-                       file_size_limit:       '20.480',        // you can either set a number which is in KB or set a unit (like 2 B, KB, MB, GB)
-                       file_queue_limit:      0,       // maximum files that are queued
-                       file_upload_limit:     0,       // maximum files that can be uploaded with one instance 
-                       upload_url:            TS.PATH_typo3 + "ajax.php",      // the destination URL that handles the upload
-                       file_post_name:        "upload_1",      // Name of the $_FILES key available in PHP (e.g. $_FILES['upload_1'])
-                       file_types:            "*.*",   // separate multiple file types with a semicolon. e.g. ".jpg;.jpeg"
-                       file_types_description: "All Files",
-                       assume_success_timeout: 5, // The number of seconds SWFUpload should wait for Flash to detect the server's response after the file has finished uploading. This setting allows you to work around the Flash Player bugs where long running server side scripts causes Flash to ignore the server response or the Mac Flash Player bug that ignores server responses with no content.
-                       post_params: {          // additional parameters later available via $_POST
-                               ajaxID: 'typo3_tcefile::process'
-                       },
-
-                       // SWFupload options that should not be changed, as our FileUploadWindow object is handling all of this
-                       button_placeholder_id: "t3-file-upload-window-button-selectfiles-placeholder",
-                       button_window_mode:    SWFUpload.WINDOW_MODE.TRANSPARENT,
-                       button_action:         SWFUpload.BUTTON_ACTION.SELECT_FILES,
-                       button_disabled:       false,
-                       button_width:          80,
-                       button_height:         22,
-                       button_cursor:         SWFUpload.CURSOR.HAND,
-                       // internal, SWFupload event handlers, please use the ones found in the "fileUploadWindow"
-                       file_dialog_complete_handler: function(numFilesSelected, numFilesQueued, numFilesInQueue) {
-                               this.fileUploadWindow.uploadSelectFiles(numFilesSelected, numFilesQueued, numFilesInQueue);
-                       },
-                       file_queued_handler: function(fileObj) {
-                               this.fileUploadWindow.uploadQueued(fileObj);
-                       },
-                       file_queue_error_handler: function(fileObj, errorCode, message) {
-                               this.fileUploadWindow.uploadQueuedError(fileObj, errorCode, message);
-                       },
-                       upload_start_handler: function(fileObj) {
-                               this.fileUploadWindow.uploadStart(fileObj);
-                       },
-                       upload_progress_handler: function(fileObj, bytesComplete, bytesTotal) {
-                               this.fileUploadWindow.uploadProgress(fileObj, bytesComplete, bytesTotal);
-                       },
-                       upload_error_handler: function(fileObj, errorCode, message) {
-                               this.fileUploadWindow.uploadError(fileObj, errorCode, message);
-                       },
-                       upload_success_handler: function(fileObj, serverData, responseReceived) {
-                               this.fileUploadWindow.uploadSuccess(fileObj, serverData, responseReceived);
-                       },
-                       upload_complete_handler: function(fileObj) {
-                               this.fileUploadWindow.uploadComplete(fileObj);
-                       },
-                       // callback introduced by the swf queue plugin
-                       queue_complete_handler: function() {
-                               this.fileUploadWindow.totalComplete();
-                       }
-               },
-
-               /**
-                * actions which are executed when the uploader window should be closed (actually, it's hidden)
-                */
-               closeWindow: function() {
-                       this.cleanup();
-                       this.hide();
-               },
-
-               // component constructor
-               // private
-               initComponent: function() {
-                       var initialConfig = {
-                               layout: 'anchor',
-                               width: 350,
-                               height: 'auto',
-                               center: true,
-                               modal: true,
-                               tools: [],
-                               id: 't3-upload-window',
-                               title: String.format(TYPO3.LLL.fileUpload.windowTitle),
-                               shadow: false,
-                               hideBorders: true,
-                               tbar: [{
-                                               id: 't3-file-upload-window-button-selectfiles',
-                                               text: String.format(TYPO3.LLL.fileUpload.buttonSelectFiles),
-                                               iconCls: 't3icon-ext-upload'
-                                       }, {
-                                               xtype: 'tbfill'
-                                       }, {
-                                               id: 't3-file-upload-window-button-cancel',
-                                               text: String.format(TYPO3.LLL.fileUpload.buttonCancelAll),
-                                               handler: this.closeWindow,
-                                               scope: this,
-                                               iconCls: 't3icon-ext-cancel'
-                                       }
-                               ]
-                       };
-                       // set the default options, if not set yet by the application from outside
-                       Ext.applyIf(this, initialConfig);
-
-                       // set default options that cannot be overriden from outside
-                       var staticConfig = {
-                               closable: true,
-                               closeAction: 'closeWindow',
-                               resizable: false
-                       };
-                       Ext.apply(this, staticConfig);
-
-                       TYPO3.FileUploadWindow.superclass.initComponent.call(this);
-                       this.addEvents(
-                               /**
-                                * @event uploadSelectFiles
-                                * Fires after the "select files" dialog has been closed
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {Number} numFilesSelected  Total number of files selected
-                                * @param {Number} numFilesQueued Total number of files that are queued
-                                * @param {Number} numFilesInQueue Number of files in the queue right now
-                                */
-                               'uploadSelectFiles',
-                               /**
-                                * @event uploadQueued
-                                * Fires after one file has been put in the queue.
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                */
-                               'uploadQueued',
-                               /**
-                                * @event uploadQueuedError
-                                * Fires after one file was tried to put in the queue but failed because it did not fit all requirements
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                * @param {Number} errorCode the internal SWFupload error code, see swfupload.js for details
-                                * @param {String} message the default (english) message that comes with the error code
-                                */
-                               'uploadQueuedError',
-                               /**
-                                * @event uploadStart
-                                * Fires right after the upload of a file was started
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                */
-                               'uploadStart',
-                               /**
-                                * @event uploadProgress
-                                * Fires multiple times during the upload process of one file, used to give a feedback to the user
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                */
-                               'uploadProgress',
-                               /**
-                                * @event uploadError
-                                * Fires if an error happens while uploading, if the upload was canceled or stopped
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                * @param {Number} errorCode the internal SWFupload error code, see swfupload.js for details
-                                * @param {String} message the default (english) message that comes with the error code
-                                */
-                               'uploadError',
-                               /**
-                                * @event uploadProgress
-                                * Fires after a file was successfully uploaded
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                * @param {String} serverData the data that gets returned from the server (the HTTP response)
-                                * @param {String} responseReceived Due to some bugs in the Flash Player the server response may not be acknowledged and no uploadSuccess event is fired by Flash. In this case the assume_success_timeout setting is checked to see if enough time has passed to fire uploadSuccess anyway. In this case the received response parameter will be false.
-                                */
-                               'uploadSuccess',
-                               /**
-                                * @event uploadComplete
-                                * Fires after the upload is complete and SWFUpload is ready to start the next file
-                                * @param {TYPO3.FileUploadWindow} this
-                                * @param {TYPO3.FileUpload} fileObj the instance of the file upload
-                                */
-                               'uploadComplete',
-                               /**
-                                * @event uploadComplete
-                                * Fires after all files in the queue have been uploaded
-                                * @param {TYPO3.FileUploadWindow} this
-                                */
-                               'totalComplete'
-                       );
-                       this.setupWindow();
-               },
-
-
-               /**
-                * private, called once the window is rendered()
-                * instantiates the SWFUpload instance, which in turn replaces a placeholder ID (needed for Flash 10)
-                * with the flash movie
-                */
-               setupFlash: function() {
-                       this.completedUploads = 0;      // reset the completed uploads
-                       var swfConfig = this.getFlashConfig();
-
-                       // add a placeholder div next to the button itself, so it can be detected and replaced by the flash plugin
-                       if (!Ext.fly(swfConfig.button_placeholder_id)) {
-                               var button = Ext.DomQuery.selectNode('#t3-file-upload-window-button-selectfiles button');
-                               Ext.DomHelper.insertBefore(button, '<div id="' + swfConfig.button_placeholder_id + '"></div>');
-                               // set the width of the swf-button in background according to the user-visible button
-                               swfConfig.button_width = button.clientWidth;
-                       }
-                       this.swf = new SWFUpload(swfConfig);
-                       this.swf.fileUploadWindow = this;
-
-                       // disable the "Cancel all uploads" button
-                       Ext.getCmp('t3-file-upload-window-button-cancel').disable();
-
-                       // add some info to the dialog
-                       // you can replace this by adding your own component with this ID in the constructor
-                       if (!this.getComponent('t3-upload-window-infopanel')) {
-                               var maxFileSize = (swfConfig.file_size_limit.toString().indexOf('B') > 0 ? swfConfig.file_size_limit : (swfConfig.file_size_limit / 1024) + ' MB');
-                               var txt = String.format(TYPO3.LLL.fileUpload.infoComponentMaxFileSize, maxFileSize) + '<br/>';
-                               if (swfConfig.file_upload_limit) {
-                                       txt += String.format(TYPO3.LLL.fileUpload.infoComponentFileUploadLimit, swfConfig.file_upload_limit) + '<br/>';
-                               }
-                               if (swfConfig.file_types !== '*.*') {
-                                       txt += String.format(TYPO3.LLL.fileUpload.infoComponentFileTypeLimit, swfConfig.file_types);
-                               }
-                               this.insert(0, new Ext.Panel({
-                                       autoEl: { tag: 'div' },
-                                       height: 'auto',
-                                       id: 't3-upload-window-infopanel',
-                                       html: txt,
-                                       bodyBorder: false,
-                                       border: false
-                               }));
-                       }
-               },
-               
-               /**
-                * the configuration variables that can be set from outside (via uploadUrl etc) are set directly in the FileUploadWindow instance
-                * here we merge these variables from the outside with the default configuration set in the swfDefaultConfig
-                * and return a new config object that SWFupload can use and manipulate
-                * We decided to use camelCase parameters and parameters prepended with "upload" so it is
-                * better to understand than the existing SWFupload parameters
-                */
-               getFlashConfig: function() {
-                       var swfConfig = {};
-                       Ext.apply(swfConfig, this.swfDefaultConfig);
-                       swfConfig.upload_url             = Ext.value(this.uploadURL, this.swfDefaultConfig.upload_url);
-                       swfConfig.file_size_limit        = Ext.value(this.uploadFileSizeLimit, this.swfDefaultConfig.file_size_limit);
-                       swfConfig.file_queue_limit       = Ext.value(this.uploadMaxFilesQueued, this.swfDefaultConfig.file_queue_limit);
-                       swfConfig.file_upload_limit      = Ext.value(this.uploadMaxFiles, this.swfDefaultConfig.file_upload_limit);
-                       swfConfig.file_post_name         = Ext.value(this.uploadFileParam, this.swfDefaultConfig.file_post_name);
-                       swfConfig.post_params            = Ext.value(this.uploadPostParams, this.swfDefaultConfig.post_params);
-                       // add the veriCode from the backend.php to verify the session with the flash client
-                       swfConfig.post_params.vC         = top.TS.veriCode;
-                       swfConfig.file_types_description = Ext.value(this.uploadFileTypesDescription, this.swfDefaultConfig.file_types_description);
-                       this.setFileTypeRestrictions(this.uploadFileTypes);
-                       swfConfig.file_types = this.swfDefaultConfig.file_types;
-                       return swfConfig;
-               },
-               
-               /**
-                * this function merges the values from the TYPO3 style (comma separated) to the format
-                * SWFupload needs it to be (*.jpg;*.gif) and also adds deny file patterns
-                */
-               setFileTypeRestrictions: function(typo3FileTypes) {
-                       if (typo3FileTypes.allow && typo3FileTypes.allow !== '' && typo3FileTypes.allow !== '*') {
-                               var allowedFiles = typo3FileTypes.allow.split(',');
-                               this.swfDefaultConfig.file_types = '*.' + allowedFiles.join(';*.');
-                       }
-                       if (typo3FileTypes.deny && typo3FileTypes.deny !== '') {
-                               this.deniedFileTypes = typo3FileTypes.deny;
-                       }
-               },
-
-               
-               /**
-                * because swfupload does not include a way to explicitly deny certain files, we need to
-                * check the file type of every selected file before it gets uploaded
-                */
-               fileTypeIsAllowed: function(filename) {
-                       var ext = filename.substr(filename.lastIndexOf('.')+1);
-                       if (ext) {
-                               var denyTypes = this.deniedFileTypes;
-                               denyTypes += (denyTypes.length ? ',' : '') + TS.denyFileTypes;
-                               denyTypes = ',' + denyTypes + ',';
-                               var reg = new RegExp(',' + ext + ',', 'i');
-                               if (denyTypes.search(reg) === -1) {
-                                       return true;
-                               }
-                       }
-                       return false;
-               },
-
-               /**
-                * sets up the visual information before the window is rendered, it adds some default event handlers
-                * (they have to be re-set all the time, because all of them are purged in the cleanup function)
-                */
-               setupWindow: function() {
-                       this.on('add',    function() { this.doLayout(); }.bind(this));
-                       this.on('remove', function() { this.doLayout(); }.bind(this));
-                       this.on('hide',   function() { this.cleanup(); }.bind(this));
-                       this.on('show',   function() {
-                               this.setupFlash();
-                               this.doLayout();
-                       }.bind(this));
-                       // show the window, and disable the cancel button (only gets enabled when files are selected)
-                       this.show();
-               },
-
-               /**
-                * is used when the window is closed, then the flash movie is removed and the existing listeners
-                * are removed, all components are removed and the window is then hidden
-                */
-               cleanup: function() {
-                       if (this.swf) {
-                               this.swf.cancelUpload();
-                               this.swf.destroy();             
-                       }
-                       this.swf = null;
-                       this.purgeListeners();
-                       this.removeAll(true);
-               },
-
-               // the following functions are event proxies that take the SWF-style events to the extJS handling
-               // they also provide basic functionality for the file upload process
-               // private
-               uploadSelectFiles: function(numFilesSelected, numFilesQueued, numFilesInQueue) {
-                       if (numFilesSelected > 0) {
-                               // enable the "Cancel all uploads" button
-                               Ext.getCmp('t3-file-upload-window-button-cancel').enable();
-                       }
-
-                       this.swf.startUpload();
-                       this.fireEvent('uploadSelectFiles', this, [numFilesSelected, numFilesQueued, numFilesInQueue]);
-               },
-
-               // private
-               uploadQueued: function(fileObj) {
-                       this.activeUploads[fileObj.id] = new TYPO3.FileUpload({file: fileObj});
-                       if (!this.fileTypeIsAllowed(fileObj.name)) {
-                               this.activeUploads[fileObj.id].error(SWFUpload.QUEUE_ERROR.INVALID_FILETYPE, '');
-                               this.fireEvent('uploadError', this, [this.activeUploads[fileObj.id], SWFUpload.QUEUE_ERROR.INVALID_FILETYPE, '']);
-                               this.swf.cancelUpload(fileObj.id, false);
-                       } else {
-                               this.fireEvent('uploadQueued', this, [this.activeUploads[fileObj.id]]);
-                       }
-               },
-
-               // private
-               uploadQueuedError: function(fileObj, errorCode, message) {
-                       if (!this.activeUploads[fileObj.id]) {
-                               this.activeUploads[fileObj.id] = new TYPO3.FileUpload({file: fileObj});
-                       }
-                       this.activeUploads[fileObj.id].error(errorCode, message);
-                       this.fireEvent('uploadQueuedError', this, [this.activeUploads[fileObj.id], errorCode, message]);
-                       delete this.activeUploads[fileObj.id];
-               },
-
-               // private
-               uploadStart: function(fileObj) {
-                       this.activeUploads[fileObj.id].start();
-                       this.fireEvent('uploadStart', this, [this.activeUploads[fileObj.id]]);
-               },
-
-               // private
-               uploadProgress: function(fileObj, bytesComplete, bytesTotal) {
-                       this.activeUploads[fileObj.id].update(bytesComplete, bytesTotal);
-                       this.fireEvent('uploadProgress', this, [this.activeUploads[fileObj.id], bytesComplete, bytesTotal]);
-               },
-
-               // private
-               uploadError: function(fileObj, errorCode, message) {
-                       this.activeUploads[fileObj.id].error(errorCode, message);
-                       this.lastError = {'errorCode': errorCode, 'message': message};
-                       this.fireEvent('uploadError', this, [this.activeUploads[fileObj.id], errorCode, message]);
-                       delete this.activeUploads[fileObj.id];
-               },
-
-               // private
-               uploadSuccess: function(fileObj, serverData, responseReceived) {
-                       this.completedUploads++;
-                       this.activeUploads[fileObj.id].success();
-                       this.fireEvent('uploadSuccess', this, [this.activeUploads[fileObj.id], serverData, responseReceived]);  
-               },
-
-               // private
-               uploadComplete: function(fileObj) {
-                       this.fireEvent('uploadComplete', this, [this.activeUploads[fileObj.id]]);
-                       delete this.activeUploads[fileObj.id];
-               },
-
-               // private
-               totalComplete: function() {
-                       // disable the "Cancel all uploads" button (for the next use)
-                       Ext.getCmp('t3-file-upload-window-button-cancel').disable();
-
-                       if (this.completedUploads > 0) {
-                               this.fireEvent('totalComplete', this);
-                       } else {
-                                       // if all our uploads fail, we try to provide some reasons
-                               this.totalError();
-                       }
-                       this.cleanup();
-                       this.hide();
-               },
-
-               // private
-               // this handler is only called by totalComplete, not by swfupload itself
-               totalError: function() {
-                       if (this.lastError === null) {
-                               return;
-                       }
-
-                       var errorCode = this.lastError.errorCode;
-                       var message = this.lastError.message;
-                       var messageText = null;
-
-                               // provide a more detailed problem description for the well known bugs
-                       switch (errorCode) {
-                               case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-                                       if (message == '401') {
-                                               messageText = String.format(TYPO3.LLL.fileUpload.allError401);
-                                       }
-                               break;
-
-                               case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-                                       if (message == 'Error #2038') {
-                                               messageText = String.format(TYPO3.LLL.fileUpload.allError2038);
-                                       }
-                               break;
-                       }
-                       Ext.MessageBox.show({
-                               title: String.format(TYPO3.LLL.fileUpload.allErrorMessageTitle),
-                               msg: String.format(TYPO3.LLL.fileUpload.allErrorMessageText + (messageText ? messageText : message)),
-                               buttons: Ext.MessageBox.OK,
-                               icon: Ext.MessageBox.ERROR
-                       });
-               },
-               
-               /**
-                * Removes all components from this container.
-                * @param {Boolean} autoDestroy (optional) True to automatically invoke the removed Component's {@link Ext.Component#destroy} function.
-                * Defaults to the value of this Container's {@link #autoDestroy} config.
-                * @return {Array} Array of the destroyed components
-                * 
-                * This function is copied from the Container object of extJS, because it was documented but not correctly implement
-                */
-               removeAll: function(autoDestroy) {
-                       var item, items = [];
-                       while((item = this.items.last())) {
-                               items.unshift(this.remove(item, autoDestroy));
-                       }
-                       return items;
-               }
-       });
-
-
-       // This function should be used to fetch a FileUploadWindow instance, to make sure
-       // that only one instance is currently running
-       TYPO3.FileUploadWindow.getInstance = function(config) {
-               var instance = TYPO3.getInstance('FileUploadWindow');
-               if (instance) {
-                       if (!instance.swf) {
-                               Ext.apply(instance, config);
-                               instance.setupWindow();
-                               instance.show();                        
-                       } else {
-                               // TODO, maybe we can raise an exception
-                               alert(String.format(TYPO3.LLL.fileUpload.processRunning));
-                       }
-               } else {
-                       instance = new TYPO3.FileUploadWindow(config);
-                       TYPO3.addInstance('FileUploadWindow', instance);
-               }
-               return instance;
-       };
-
-       // This function checks through the SWFObject if the required flash player is available
-       TYPO3.FileUploadWindow.isFlashAvailable = function() {
-               return swfobject.hasFlashPlayerVersion(TYPO3.FileUploadWindow.prototype.swfDefaultConfig.minimum_flash_version);
-       };
-
-       /**
-        * This class includes one instance of an upload
-        * and is used mainly to display the progress bar Component
-        */
-       TYPO3.FileUpload = Ext.extend(Ext.Component, {
-               infoPanel:   null,      // Ext.Panel instance holding the progressBar and the cancel button
-               cancelButton: null,     // Ext.BoxComponent instance, holding the X in there
-               progressBar: null,      // Ext.Component progress bar instance
-               parent:      null,      // reference to the TYPO3.FileUploadWindow
-               file:        null,      // reference to the SWFupload.File object
-
-               // creates the Ext component, used when a file is queued
-               initComponent: function() {
-                       TYPO3.FileUpload.superclass.initComponent.call(this);
-                       this.parent = TYPO3.getInstance('FileUploadWindow');
-
-                       // the progress bar instance
-                       this.progressBar = new Ext.ProgressBar({
-                               id: 'flashupload-progress ' + this.file.id,
-                               cls: 't3-upload-window-progressbar',
-                               text: String.format(TYPO3.LLL.fileUpload.uploadWait, this.file.name),
-                               width: '100%',
-                               height: 21,
-                               x: -1,
-                               disabled: true
-                       });
-
-                       // the cancel button
-                       this.cancelButton = new Ext.BoxComponent({
-                               autoEl: {
-                                       tag: 'div',
-                                       'class': 't3icon-ext-cancel t3iconstyle-center'
-                               },
-                               hidden: true,
-                               width: 22,
-                               height: 18,
-                               x: -100
-                       });
-
-                       // the panel that holds the progress bar and the button together
-                       this.infoPanel = new Ext.Panel({
-                               layout: 'absolute',
-                               width: '100%',
-                               hideBorders: true,
-                               bodyBorder: false,
-                               border: false,
-                               items: [this.progressBar, this.cancelButton]
-                       });
-
-                       this.infoPanel.on('show', function() {
-                               var h = this.progressBar.getBox().height;
-                               this.infoPanel.setHeight(h);
-
-                               // show the cancel button on hover
-                               this.infoPanel.getEl().on('mouseover', function() {
-                                       this.cancelButton.show();
-                                       this.cancelButton.setPosition(this.progressBar.getBox().width - this.cancelButton.getBox().width, -1);
-                               }, this);
-
-                               // hide the cancel button on hover out
-                               this.infoPanel.getEl().on('mouseout', function() { 
-                                       this.cancelButton.hide();
-                               }, this);
-
-                               // if the cancel button is clicked, the download is canceled
-                               this.cancelButton.getEl().on('click', function() {
-                                       if (this.parent.swf) {
-                                               this.parent.swf.cancelUpload(this.file.id);
-                                       }
-                                       this.cleanup(10);
-                               }, this);
-                       }, this);
-                       this.parent.add(this.infoPanel);
-                       this.infoPanel.show();
-               },
-               // enables the progress bar and sets the text
-               start: function() {
-                       this.progressBar.enable();
-                       this.progressBar.updateText(String.format(TYPO3.LLL.fileUpload.uploadStarting, this.file.name));
-               },
-
-               // updates the progress bar (+ text) to the current progress
-               update: function(bytesComplete, bytesTotal) {
-                       var percent = (bytesComplete / bytesTotal);
-                       var text = String.format(TYPO3.LLL.fileUpload.uploadProgress, Math.round(100*percent, 1), this.file.name);
-                       this.progressBar.updateProgress(percent, text);
-               },
-
-               // simply updates the text in the bar
-               updateText: function(text) {
-                       this.progressBar.updateText(text);
-               },
-
-               // is called if there is an error after queuing a file or while uploading
-               // get details for the error code from here: SWFUpload.QUEUE_ERROR or
-               // SWFUpload.UPLOAD_ERROR (see contrib/swfupload/swfupload.js)
-               // can be further extended to color the progress bar in red colors
-               // then calls the cleanup function
-               error: function(errorCode, message) {
-                       var txt = message;
-                       switch (errorCode) {
-                               case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorQueueLimitExceeded);
-                               break;
-                               case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorQueueFileSizeLimit, this.file.name);
-                               break;
-                               case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorQueueZeroByteFile, this.file.name);
-                               break;
-                               case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorQueueInvalidFiletype, this.file.name);
-                               break;
-
-                               case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadHttp, message);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadMissingUrl);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadIO);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadSecurityError, message);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadLimit);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadFailed);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadFileIDNotFound);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadFileValidation);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadFileCancelled, this.file.name);
-                               break;
-                               case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-                                       txt = String.format(TYPO3.LLL.fileUpload.errorUploadFileStopped, this.file.name);
-                               break;
-                       }
-                       this.updateText(txt);
-                       this.cleanup(10000);
-               },
-
-               // updates the progressbar to show the full 100% and a text that everything went fine
-               // then calls the cleanup function
-               success: function() {
-                       this.progressBar.updateProgress(1, String.format(TYPO3.LLL.fileUpload.uploadSuccess, this.file.name));
-                       this.cleanup();
-               },
-
-               // cleanup function that calls the destroy method right now after a specified delay
-               cleanup: function(delay) {
-                       var cleanup = new Ext.util.DelayedTask(this.destroy, this);
-                       cleanup.delay((delay ? delay : 2000));
-               },
-
-               // internal function to remove the progress Bar and trigger an remove() event after that 
-               // in the main window
-               destroy: function() {
-                       if (this.infoPanel && this.infoPanel.id && Ext.get(this.infoPanel.id)) {
-                               Ext.get(this.infoPanel.id).fadeOut({
-                                       callback: function() {
-                                               this.parent.remove(this.infoPanel);
-                                       }.bind(this)
-                               });                     
-                       }
-               }
-       });
-
-
-});
index 63d0c39..078cce9 100644 (file)
                        <td><a href="http://script.aculo.us" target="_blank">script.aculo.us</a></td>
                </tr>
                <tr>
-                       <td>SWFUpload</td>
-                       <td><a href="http://www.swfupload.org" target="_blank">www.swfupload.org</a></td>
-               </tr>
-               <tr>
                        <td>Swift Mailer</td>
                        <td><a href="http://swiftmailer.org" target="_blank">swiftmailer.org</a></td>
                </tr>
index 79a18bc..a41e46b 100644 (file)
@@ -843,13 +843,7 @@ class ClickMenu {
                $script = 'file_upload.php';
                $type = 'upload';
                $image = 'upload.gif';
-               if ($GLOBALS['BE_USER']->uc['enableFlashUploader']) {
-                       $loc = 'top.content.list_frame';
-                       $editOnClick = 'if (top.TYPO3.FileUploadWindow.isFlashAvailable()) { initFlashUploader("' . rawurlencode($path) . '"); } else if(' . $loc . '){' . $loc . '.location.href=top.TS.PATH_typo3+\'' . $script . '?target=' . rawurlencode($path) . '\';}';
-                       return $this->linkItem($this->label($type), $this->excludeIcon('<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($this->PH_backPath, ('gfx/' . $image), 'width="12" height="12"') . ' alt="" />'), $editOnClick . 'return hideCM();');
-               } else {
-                       return $this->FILE_launch($path, $script, $type, $image, TRUE);
-               }
+               return $this->FILE_launch($path, $script, $type, $image, TRUE);
        }
 
        /**
index 3080202..22c9d86 100644 (file)
@@ -98,15 +98,10 @@ class BackendController {
                        'common' => 'js/common.js',
                        'locallang' => $this->getLocalLangFileName(),
                        'modernizr' => 'contrib/modernizr/modernizr.min.js',
-                       'swfupload' => 'contrib/swfupload/swfupload.js',
-                       'swfupload.swfobject' => 'contrib/swfupload/plugins/swfupload.swfobject.js',
-                       'swfupload.cookies' => 'contrib/swfupload/plugins/swfupload.cookies.js',
-                       'swfupload.queue' => 'contrib/swfupload/plugins/swfupload.queue.js',
                        'md5' => 'md5.js',
                        'toolbarmanager' => 'js/toolbarmanager.js',
                        'modulemenu' => 'js/modulemenu.js',
                        'iecompatibility' => 'js/iecompatibility.js',
-                       'flashupload' => 'js/flashupload.js',
                        'evalfield' => '../t3lib/jsfunc.evalfield.js',
                        'flashmessages' => '../t3lib/js/extjs/ux/flashmessages.js',
                        'tabclosemenu' => '../t3lib/js/extjs/ux/ext.ux.tabclosemenu.js',
index b382570..2d4b353 100644 (file)
@@ -110,54 +110,6 @@ class FileSystemNavigationFrameController {
                // Setting JavaScript for menu.
                $this->doc->JScode .= $this->doc->wrapScriptTags(($this->currentSubScript ? 'top.currentSubScript=unescape("' . rawurlencode($this->currentSubScript) . '");' : '') . '
 
-               function initFlashUploader(path) {
-                       path = decodeURIComponent(path);
-                       var flashUploadOptions = {
-                               uploadURL: top.TS.PATH_typo3 + "ajax.php",
-                               uploadFileSizeLimit: "' . \TYPO3\CMS\Core\Utility\GeneralUtility::getMaxUploadFileSize() . '",
-                               uploadFileTypes: {
-                                       allow:  "' . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace']['allow'] . '",
-                                       deny: "' . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace']['deny'] . '"
-                               },
-                               uploadFilePostName: "upload_1",
-                               uploadPostParams: {
-                                       "file[upload][1][target]": path,
-                                       "file[upload][1][data]": 1,
-                                       "file[upload][1][charset]": "utf-8",
-                                       "ajaxID": "TYPO3_tcefile::process"
-                               }
-                       };
-
-                               // get the flashUploaderWindow instance from the parent frame
-                       var flashUploader = top.TYPO3.FileUploadWindow.getInstance(flashUploadOptions);
-                               // add an additional function inside the container to show the checkbox option
-                       var infoComponent = new top.Ext.Panel({
-                               autoEl: { tag: "div" },
-                               height: "auto",
-                               bodyBorder: false,
-                               border: false,
-                               hideBorders: true,
-                               cls: "t3-upload-window-infopanel",
-                               id: "t3-upload-window-infopanel-addition",
-                               html: \'<label for="overrideExistingFilesCheckbox"><input id="overrideExistingFilesCheckbox" type="checkbox" onclick="setFlashPostOptionOverwriteExistingFiles(this);" />\' + top.String.format(top.TYPO3.LLL.fileUpload.infoComponentOverrideFiles) + \'</label>\'
-                       });
-                       flashUploader.add(infoComponent);
-
-                               // do a reload of this frame once all uploads are done
-                       flashUploader.on("totalcomplete", function() {
-                               jumpTo (top.rawurlencode(path), "", "", "");
-                       });
-
-                               // this is the callback function that delivers the additional post parameter to the flash application
-                       top.setFlashPostOptionOverwriteExistingFiles = function(checkbox) {
-                               var uploader = top.TYPO3.getInstance("FileUploadWindow");
-                               if (uploader.isVisible()) {
-                                       uploader.swf.addPostParam("overwriteExistingFiles", (checkbox.checked == true ? 1 : 0));
-                               }
-                       };
-               }
-
-
                // setting prefs for foldertree
                Tree.ajaxID = "SC_alt_file_navframe::expandCollapse";
 
index 2dbccc3..13b6230 100644 (file)
@@ -313,7 +313,6 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
                'edit_showFieldHelp' => 'icon',
                'edit_RTE' => '1',
                'edit_docModuleUpload' => '1',
-               'enableFlashUploader' => '1',
                'navFrameWidth' => '',
                // Default is 245 pixels
                'navFrameResizable' => 0,
index 9c193db..543bcc5 100644 (file)
@@ -209,66 +209,7 @@ class FileListController {
                $this->doc->getPageRenderer()->loadPrototype();
                // There there was access to this file path, continue, make the list
                if ($this->folderObject) {
-                       // Include the initialization for the flash uploader
-                       if ($GLOBALS['BE_USER']->uc['enableFlashUploader']) {
-                               $this->doc->JScodeArray['flashUploader'] = '
-                                       if (top.TYPO3.FileUploadWindow.isFlashAvailable()) {
-                                               document.observe("dom:loaded", function() {
-                                                               // monitor the button
-                                                       $("button-upload").observe("click", initFlashUploader);
 
-                                                       function initFlashUploader(event) {
-                                                                       // set the page specific options for the flashUploader
-                                                               var flashUploadOptions = {
-                                                                       uploadURL:           top.TS.PATH_typo3 + "ajax.php",
-                                                                       uploadFileSizeLimit: "' . \TYPO3\CMS\Core\Utility\GeneralUtility::getMaxUploadFileSize() . '",
-                                                                       uploadFileTypes: {
-                                                                               allow:  "' . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace']['allow'] . '",
-                                                                               deny: "' . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace']['deny'] . '"
-                                                                       },
-                                                                       uploadFilePostName:  "upload_1",
-                                                                       uploadPostParams: {
-                                                                               "file[upload][1][target]": "' . ($this->folderObject ? $this->folderObject->getCombinedIdentifier() : '') . '",
-                                                                               "file[upload][1][data]": 1,
-                                                                               "file[upload][1][charset]": "utf-8",
-                                                                               "ajaxID": "TYPO3_tcefile::process"
-                                                                       }
-                                                               };
-
-                                                                       // get the flashUploaderWindow instance from the parent frame
-                                                               var flashUploader = top.TYPO3.FileUploadWindow.getInstance(flashUploadOptions);
-                                                               // add an additional function inside the container to show the checkbox option
-                                                               var infoComponent = new top.Ext.Panel({
-                                                                       autoEl: { tag: "div" },
-                                                                       height: "auto",
-                                                                       bodyBorder: false,
-                                                                       border: false,
-                                                                       hideBorders: true,
-                                                                       cls: "t3-upload-window-infopanel",
-                                                                       id: "t3-upload-window-infopanel-addition",
-                                                                       html: \'<label for="overrideExistingFilesCheckbox"><input id="overrideExistingFilesCheckbox" type="checkbox" onclick="setFlashPostOptionOverwriteExistingFiles(this);" />\' + top.String.format(top.TYPO3.LLL.fileUpload.infoComponentOverrideFiles) + \'</label>\'
-                                                               });
-                                                               flashUploader.add(infoComponent);
-
-                                                                       // do a reload of this frame once all uploads are done
-                                                               flashUploader.on("totalcomplete", function() {
-                                                                       window.location.reload();
-                                                               });
-
-                                                                       // this is the callback function that delivers the additional post parameter to the flash application
-                                                               top.setFlashPostOptionOverwriteExistingFiles = function(checkbox) {
-                                                                       var uploader = top.TYPO3.getInstance("FileUploadWindow");
-                                                                       if (uploader.isVisible()) {
-                                                                               uploader.swf.addPostParam("overwriteExistingFiles", (checkbox.checked == true ? 1 : 0));
-                                                                       }
-                                                               };
-
-                                                               event.stop();
-                                                       };
-                                               });
-                                       }
-                               ';
-                       }
                        // Create filelisting object
                        $this->filelist = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Filelist\\FileList');
                        $this->filelist->backPath = $GLOBALS['BACK_PATH'];
index 05b883d..129cf8a 100755 (executable)
@@ -121,11 +121,6 @@ $GLOBALS['TYPO3_USER_SETTINGS'] = array(
                                'LLL:EXT:setup/mod/locallang.xml:clearSessionVarsQuestion'
                        )
                ),
-               'enableFlashUploader' => array(
-                       'type' => 'check',
-                       'label' => 'LLL:EXT:setup/mod/locallang.xml:enableFlashUploader',
-                       'csh' => 'enableFlashUploader'
-               ),
                'resizeTextareas' => array(
                        'type' => 'check',
                        'label' => 'LLL:EXT:setup/mod/locallang.xml:resizeTextareas',
@@ -149,7 +144,7 @@ $GLOBALS['TYPO3_USER_SETTINGS'] = array(
        ),
        'showitem' => '--div--;LLL:EXT:setup/mod/locallang.xml:personal_data,realName,email,emailMeAtLogin,password,password2,lang,
                        --div--;LLL:EXT:setup/mod/locallang.xml:opening,startModule,thumbnailsByDefault,titleLen,
-                       --div--;LLL:EXT:setup/mod/locallang.xml:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,showHiddenFilesAndFolders,enableFlashUploader,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
+                       --div--;LLL:EXT:setup/mod/locallang.xml:editFunctionsTab,edit_RTE,edit_wideDocument,edit_docModuleUpload,showHiddenFilesAndFolders,resizeTextareas,resizeTextareas_Flexible,resizeTextareas_MaxHeight,copyLevels,recursiveDelete,resetConfiguration,clearSessionVars,
                        --div--;LLL:EXT:setup/mod/locallang.xml:adminFunctions,simulate,debugInWindow'
 );
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/t3skin/stylesheets/structure/module_file_upload.css b/typo3/sysext/t3skin/stylesheets/structure/module_file_upload.css
deleted file mode 100644 (file)
index e83c9e9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/* - - - - - - - - - - - - - - - - - - - - -
-File Upload Window
-
-- - - - - - - - - - - - - - - - - - - - - */
-
-.swfupload {
-       bottom: 3px;
-       display: block;
-       height: 25px;
-       left: 3px;
-       position: absolute;
-       top: 2px;
-       z-index: 2000;
-       width: 90px;
-}
-
-#t3-upload-window-infopanel div div {
-       padding: 10px;
-}
-.t3-upload-window-infopanel div div {
-       padding: 0 10px 10px;
-}
-
-.t3-upload-window-infopanel input {
-       margin-right: 3px;
-       vertical-align: text-bottom;
-}
\ No newline at end of file