[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#695006: marked as done (unblock: icinga-web/1.7.1+dfsg2-6)



Your message dated Mon, 3 Dec 2012 21:11:11 +0100
with message-id <20121203201111.GR5634@radis.cristau.org>
and subject line Re: Bug#695006: unblock: icinga-web/1.7.1+dfsg2-6
has caused the Debian Bug report #695006,
regarding unblock: icinga-web/1.7.1+dfsg2-6
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
695006: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695006
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package icinga-web

  * Security fix for a YUI library issue

    Two .swf files has been removed from the Debian package
    and the Flash supported chart feature is disable for now.

    In addition a upstream patch was applied to allow the user
    to use the feature with a newer .swf resource if he wants
    to.

    Please see README.Debian for instructions

    Closes: #694262
    Closes: #694641

  * DFSG cleaned upstream 1.7.1+dfsg2
    SWF binary files has been removed from tarball

Please see the attached debdiff and contact me if you have any questions!

The upload and changes have been signed by Alexander Wirt.

Best Regards
Markus Frosch

unblock icinga-web/1.7.1+dfsg2-6

- -- 
Markus Frosch
markus@lazyfrosch.de
http://www.lazyfrosch.de

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQvHVbAAoJEGKVX2ubH1iDrNUH/0T0p9/4dqyUMO+N+nA/BVUk
8ywwMR3J2zpN6CBBjUoGqbz/3ghIY2Iu+SN2EnpoWVFXyylkhOW88GHaFX58B3JD
RHS7GyG5Y5bB9d65aHO4QcqDzc3zPaXaUKidx0xdIEzshDquK+5cx8SskzNcmgaJ
AevbTdf16dtJIuVpr9IYD/13fnYaRsJHG2mUzeVeGJaq0uCSwuWlCX8e4PIoVDLG
zLysPQWwjRcYZ7kxCgGWEiX2Srr2yQNz5yIHtnRsi6G/3ONIczmre25XYNyihdOD
8O0IOED8tVRuxBQe1Z0hXAQGiZoKfXhpSSFhcGA5jNmz2fu2vzuCKtx1z5CjxdU=
=ABf1
-----END PGP SIGNATURE-----
diff -Nru icinga-web-1.7.1+dfsg1/debian/changelog icinga-web-1.7.1+dfsg2/debian/changelog
--- icinga-web-1.7.1+dfsg1/debian/changelog	2012-10-09 10:53:05.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/debian/changelog	2012-11-29 00:17:31.000000000 +0100
@@ -1,3 +1,24 @@
+icinga-web (1.7.1+dfsg2-6) unstable; urgency=high
+
+  * [bb01a46] Security fix for a YUI library issue
+
+    Two .swf files has been removed from the Debian package
+    and the Flash supported chart feature is disable for now.
+
+    In addition a upstream patch was applied to allow the user
+    to use the feature with a newer .swf resource if he wants
+    to.
+
+    Please see README.Debian for instructions
+
+    Closes: #694262
+    Closes: #694641
+
+  * [4ec39a9] DFSG cleaned upstream 1.7.1+dfsg2
+    SWF binary files has been removed from tarball
+
+ -- Markus Frosch <markus@lazyfrosch.de>  Wed, 29 Nov 2012 00:17:41 +0100
+
 icinga-web (1.7.1+dfsg1-5) unstable; urgency=high
 
   * [4cc829d] DFSG cleaned upstream 1.7.1+dfsg1
diff -Nru icinga-web-1.7.1+dfsg1/debian/patches/21_yui_chartsswf icinga-web-1.7.1+dfsg2/debian/patches/21_yui_chartsswf
--- icinga-web-1.7.1+dfsg1/debian/patches/21_yui_chartsswf	1970-01-01 01:00:00.000000000 +0100
+++ icinga-web-1.7.1+dfsg2/debian/patches/21_yui_chartsswf	2012-11-28 22:59:03.000000000 +0100
@@ -0,0 +1,123 @@
+Description: YUI library security change
+ Security fix for YUI libraries' charts.swf
+ .
+ Making changes to some JS objects to support
+ the security fixed version of charts.swf
+ .
+ This is the port of a upstream fix - the .swf
+ file is no longer included in the debian
+ package and now loaded via the internet.
+Author: Markus Frosch <markus@lazyfrosch.de>
+Origin: backport
+Bug-Icinga: https://dev.icinga.org/issues/3464
+Applied-Upstream: 1.8.1
+Last-Update: 2012-11-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/app/modules/AppKit/lib/js/AppKit.js
++++ b/app/modules/AppKit/lib/js/AppKit.js
+@@ -54,7 +54,17 @@
+                 var me = AppKit;
+ 
+                 Ext.BLANK_IMAGE_URL = me.c.path + '/images/ajax/s.gif';
+-                Ext.chart.Chart.CHART_URL = me.c.path + '/js/ext3/resources/charts.swf';
++                // BEGIN Debian - see /usr/share/doc/icinga-web/README.Debian
++                // disabled external Flash components
++                Ext.chart.Chart.CHART_URL = null;
++                Ext.FlashComponent.EXPRESS_INSTALL_URL = null;
++                // enable the following for local stored files
++                //Ext.chart.Chart.CHART_URL = me.c.path + '/js/ext3/resources/charts.swf';
++                //Ext.FlashComponent.EXPRESS_INSTALL_URL = me.c.path + '/js/ext3/resources/expressinstall.swf';
++                // enable the following for remote stored resources
++                //Ext.chart.Chart.CHART_URL = 'http:/' + '/yui.yahooapis.com/2.8.2/build/charts/assets/charts.swf';
++                //Ext.FlashComponent.EXPRESS_INSTALL_URL = 'http:/' + '/swfobject.googlecode.com/svn/trunk/swfobject/expressInstall.swf';
++                // END Debian
+ 
+                 Ext.QuickTips.init();
+                 growlStack();
+@@ -270,4 +280,4 @@
+     }()));
+ })();
+ 
+-Ext.ns('AppKit.lib', 'AppKit.util');
+\ No newline at end of file
++Ext.ns('AppKit.lib', 'AppKit.util');
+--- /dev/null
++++ b/app/modules/Cronks/lib/js/Ext/ux/FlashComponent.js
+@@ -0,0 +1,59 @@
++// {{{ICINGA_LICENSE_CODE}}}
++// -----------------------------------------------------------------------------
++// This file is part of icinga-web.
++//
++// Copyright (c) 2009-2012 Icinga Developer Team.
++// All rights reserved.
++//
++// icinga-web is free software: you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation, either version 3 of the License, or
++// (at your option) any later version.
++//
++// icinga-web 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.  See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with icinga-web.  If not, see <http://www.gnu.org/licenses/>.
++// -----------------------------------------------------------------------------
++// {{{ICINGA_LICENSE_CODE}}}
++/*global Ext: false, Icinga: false, AppKit: false, _: false, Cronk: false */
++
++(function() {
++    "use strict";
++
++    Ext.ns('Ext.chart', 'YAHOO.widget');
++
++    /**
++     * @class Ext.chart.PieChart
++     * @overrides Ext.chart.PieChart
++     * @namespace Ext.chart
++     * @author Markus Frosch <markus.frosch@netways.de>
++     * @getId
++     */
++    Ext.override(Ext.chart.PieChart, {
++        /*
++          Replacing getId with a new version to give the YUI swf
++          an id that he wants and allows
++        */
++        getId: function() {
++            return this.id || (this.id = "yuiswf" + (++Ext.Component.AUTO_ID));
++        }
++    });
++
++    /**
++     * @class YAHOO.widget.SWF
++     * @extends Ext.FlashEventProxy
++     * @namespace YAHOO.widget
++     * @author Markus Frosch <markus.frosch@netways.de>
++     *
++     * A proxy object to call Ext.FlashEventProxy
++     * from a YUI flash component
++     */
++    YAHOO.widget.SWF = Ext.FlashEventProxy;
++    YAHOO.widget.SWF.eventHandler = function(id, e) {
++        this.onEvent(id, e);
++    };
++}());
+--- a/app/modules/Cronks/config/javascript.xml
++++ b/app/modules/Cronks/config/javascript.xml
+@@ -29,6 +29,7 @@
+             <ae:parameter>%core.module_dir%/Cronks/lib/js/grid/MetaGridCreator.js</ae:parameter>
+             <ae:parameter>%core.module_dir%/Cronks/lib/js/grid/GridUtil.js</ae:parameter>
+             <ae:parameter>%core.module_dir%/Cronks/lib/js/grid/OptimisticPagingToolbar.js</ae:parameter>
++            <ae:parameter>%core.module_dir%/Cronks/lib/js/Ext/ux/FlashComponent.js</ae:parameter>
+             <ae:parameter>%core.root_dir%/lib/ext3/examples/ux/ColumnNodeUI.js</ae:parameter>
+             <ae:parameter>%core.root_dir%/lib/jit/Extras/excanvas.js</ae:parameter>
+             <ae:parameter>%core.root_dir%/lib/jit/jit-yc.js</ae:parameter>
+@@ -80,4 +81,4 @@
+             <ae:parameter>%core.module_dir%/Cronks/lib/js/CronkTrigger.js</ae:parameter>
+         </javascript>
+     </ae:configuration>
+-</ae:configurations>
+\ No newline at end of file
++</ae:configurations>
diff -Nru icinga-web-1.7.1+dfsg1/debian/patches/series icinga-web-1.7.1+dfsg2/debian/patches/series
--- icinga-web-1.7.1+dfsg1/debian/patches/series	2012-10-09 10:53:02.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/debian/patches/series	2012-11-28 22:59:03.000000000 +0100
@@ -1,2 +1,3 @@
 10_db_version_fix
 20_squishloader_gzip_off
+21_yui_chartsswf
diff -Nru icinga-web-1.7.1+dfsg1/debian/README.Debian icinga-web-1.7.1+dfsg2/debian/README.Debian
--- icinga-web-1.7.1+dfsg1/debian/README.Debian	2012-06-29 21:36:19.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/debian/README.Debian	2012-11-28 22:59:03.000000000 +0100
@@ -3,6 +3,37 @@
 
 Notes:
 
+  * [Security Information]
+    The Yahoo Interface library is used in Icinga Web to render certain
+    pie charts, unfortunatly this causes problems due to a cross site
+    scripting issue.
+
+    The flash component has been removed from Debian and the charting
+    feature is disabled.
+
+    Though a upstream fix is applied to allow the usage - when the user
+    decides to...
+
+    If you want to use the TO charts you have to either download a .swf
+    file to your server or use a swf loaded from yahooapis.com on demand.
+
+    See the file /usr/share/icinga-web/app/modules/AppKit/lib/js/AppKit.js
+    for configuration options.
+
+    Remote files:
+     uncomment the respective lines there and run
+     /usr/lib/icinga-web/bin/clearcache.sh
+
+    Local files:
+     download both files
+      http://yui.yahooapis.com/2.8.2/build/charts/assets/charts.swf
+      http://swfobject.googlecode.com/svn/trunk/swfobject/expressInstall.swf
+
+     and store them in /usr/share/icinga-web/lib/ext3/resources/
+
+     make sure to also change AppKit.js to uncomment the respective lines and
+     run /usr/lib/icinga-web/bin/clearcache.sh
+
   * Supported databases are: MySQL and PostgreSQL (by auto configuration)
 
   * PostgreSQL with ident authentication:
@@ -52,5 +83,5 @@
     To achieve this run this command as root:
       /usr/lib/icinga-web/bin/clearcache.sh
 
- -- Markus Frosch <markus@lazyfrosch.de>  Tue, 28 Jun 2012 18:47:58 +0200
+ -- Markus Frosch <markus@lazyfrosch.de>  Tue, 27 Nov 2012 16:17:58 +0200
 
Binärdateien /tmp/1jxG_ylsjt/icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/Flash/swfupload.swf and /tmp/MeD4g0K7Gl/icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/Flash/swfupload.swf sind verschieden.
diff -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/SWFObject_License.txt icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/SWFObject_License.txt
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/SWFObject_License.txt	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/SWFObject_License.txt	1970-01-01 01:00:00.000000000 +0100
@@ -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 -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.cookies.js icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.cookies.js
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.cookies.js	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.cookies.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-/*!
- * Ext JS Library 3.4.0
- * Copyright(c) 2006-2011 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
-/*
-	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 -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.queue.js icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.queue.js
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.queue.js	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.queue.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,104 +0,0 @@
-/*!
- * Ext JS Library 3.4.0
- * Copyright(c) 2006-2011 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
-/*
-	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;
-			}
-		}
-	};
-}
\ Kein Zeilenumbruch am Dateiende.
diff -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.speed.js icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.speed.js
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.speed.js	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.speed.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,348 +0,0 @@
-/*!
- * Ext JS Library 3.4.0
- * Copyright(c) 2006-2011 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
-/*
-	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;
-	};
-	
-}
\ Kein Zeilenumbruch am Dateiende.
diff -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.swfobject.js icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.swfobject.js
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.swfobject.js	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/plugins/swfupload.swfobject.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,117 +0,0 @@
-/*!
- * Ext JS Library 3.4.0
- * Copyright(c) 2006-2011 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
-/*
-	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 -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/swfupload.js icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/swfupload.js
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/swfupload.js	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/swfupload.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,986 +0,0 @@
-/*!
- * Ext JS Library 3.4.0
- * Copyright(c) 2006-2011 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
-/**
- * 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 -Nru icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/swfupload_license.txt icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/swfupload_license.txt
--- icinga-web-1.7.1+dfsg1/lib/ext3/examples/image-organizer/SWFUpload/swfupload_license.txt	2012-10-07 18:23:50.000000000 +0200
+++ icinga-web-1.7.1+dfsg2/lib/ext3/examples/image-organizer/SWFUpload/swfupload_license.txt	1970-01-01 01:00:00.000000000 +0100
@@ -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
- *
- */
\ Kein Zeilenumbruch am Dateiende.
Binärdateien /tmp/1jxG_ylsjt/icinga-web-1.7.1+dfsg1/lib/ext3/resources/charts.swf and /tmp/MeD4g0K7Gl/icinga-web-1.7.1+dfsg2/lib/ext3/resources/charts.swf sind verschieden.
Binärdateien /tmp/1jxG_ylsjt/icinga-web-1.7.1+dfsg1/lib/ext3/resources/expressinstall.swf and /tmp/MeD4g0K7Gl/icinga-web-1.7.1+dfsg2/lib/ext3/resources/expressinstall.swf sind verschieden.

Attachment: icinga-web_1.7.1+dfsg2-6.diff.sig
Description: PGP signature


--- End Message ---
--- Begin Message ---
On Mon, Dec  3, 2012 at 10:48:11 +0100, Markus Frosch wrote:

> unblock icinga-web/1.7.1+dfsg2-6
> 
Done.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---

Reply to: