Index: lams_central/web/fckeditor/editor/filemanager/browser/default/browser.html
===================================================================
diff -u -rde545461c82d2d5629c7cbc72f4fa798db1b6510 -rcc4cb1df99855db3577f939608de5ca75331a3a9
--- lams_central/web/fckeditor/editor/filemanager/browser/default/browser.html	(.../browser.html)	(revision de545461c82d2d5629c7cbc72f4fa798db1b6510)
+++ lams_central/web/fckeditor/editor/filemanager/browser/default/browser.html	(.../browser.html)	(revision cc4cb1df99855db3577f939608de5ca75331a3a9)
@@ -1,7 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
+   "http://www.w3.org/TR/html4/frameset.dtd">
 <!--
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2009 Frederico Caldeira Knabben
  *
  * == BEGIN LICENSE ==
  *
@@ -24,10 +25,43 @@
 <html>
 	<head>
 		<title>FCKeditor - Resources Browser</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 		<link href="browser.css" type="text/css" rel="stylesheet">
 		<script type="text/javascript" src="js/fckxml.js"></script>
-		<script language="javascript">
+		<script type="text/javascript">
+// Automatically detect the correct document.domain (#1919).
+(function()
+{
+	var d = document.domain ;
 
+	while ( true )
+	{
+		// Test if we can access a parent property.
+		try
+		{
+			var test = window.opener.document.domain ;
+			break ;
+		}
+		catch( e )
+		{}
+
+		// Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
+		d = d.replace( /.*?(?:\.|$)/, '' ) ;
+
+		if ( d.length == 0 )
+			break ;		// It was not able to detect the domain.
+
+		try
+		{
+			document.domain = d ;
+		}
+		catch (e)
+		{
+			break ;
+		}
+	}
+})() ;
+
 function GetUrlParam( paramName )
 {
 	var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' ) ;
@@ -40,8 +74,7 @@
 }
 
 var oConnector = new Object() ;
-oConnector.CurrentFolder	= '/';
-oConnector.DesignFolder 	= GetUrlParam( 'CurrentFolder' );
+oConnector.CurrentFolder	= '/' ;
 
 var sConnUrl = GetUrlParam( 'Connector' ) ;
 
@@ -65,9 +98,8 @@
 {
 	var sUrl = this.ConnectorUrl + 'Command=' + command ;
 	sUrl += '&Type=' + this.ResourceType ;
-	sUrl += '&CurrentFolder=' + encodeURIComponent( oConnector.CurrentFolder ) ;
-	sUrl += '&DesignFolder=' + encodeURIComponent( oConnector.DesignFolder );
-	
+	sUrl += '&CurrentFolder=' + encodeURIComponent( this.CurrentFolder ) ;
+
 	if ( params ) sUrl += '&' + params ;
 
 	// Add a random salt to avoid getting a cached version of the command execution
@@ -122,8 +154,8 @@
 var oIcons = new Object() ;
 
 oIcons.AvailableIconsArray = [
-	'ai','avi','bmp','cs','dll','doc','exe','fla','gif','htm','html','jpg','js',
-	'mdb','mp3','pdf','png','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip' ] ;
+	'ai','avi','bmp','cs','dll','doc','exe','fla','flv','gif','htm','html','jpg','js',
+	'mdb','mp3','mp4','mov','pdf','png','ppt','rdp','swf','swt','txt','vsd','xls','xml','zip' ] ;
 
 oIcons.AvailableIcons = new Object() ;
 
@@ -142,7 +174,10 @@
 
 function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 {
-	window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
+	if (errorNumber == "1")
+		window.frames['frmUpload'].OnUploadCompleted( errorNumber, customMsg ) ;
+	else
+		window.frames['frmUpload'].OnUploadCompleted( errorNumber, fileName ) ;
 }
 
 		</script>
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/32/flv.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/32/mov.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/32/mp4.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/flv.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/mov.gif
===================================================================
diff -u
Binary files differ
Index: lams_central/web/fckeditor/editor/filemanager/browser/default/images/icons/mp4.gif
===================================================================
diff -u
Binary files differ
