[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm cf5_upload.cfm, 1.2, 1.3 cf_io.cfm, 1.2, 1.3

[Blaine Lang]

Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
In directory qs1489.pair.com:/tmp/cvs-serv4567/editor/filemanager/connectors/cfm

Modified Files:
	cf5_upload.cfm cf_io.cfm 
Log Message:
Upgrade to FCKeditor ver 2.6.3

Index: cf5_upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cf5_upload.cfm	5 May 2008 00:35:25 -0000	1.2
--- cf5_upload.cfm	10 Aug 2008 16:46:32 -0000	1.3
***************
*** 48,83 ****
  	{
  		WriteOutput('<script type="text/javascript">');
! 		WriteOutput("(function()"&
! "{"&
! "	var d = document.domain ;"&
! ""&
! "	while ( true )"&
! "	{"&
! 		// Test if we can access a parent property.
! "		try"&
! "		{"&
! "			var test = window.top.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 )"&
! 			// It was not able to detect the domain.
! "			break ;"&
! ""&
! "		try"&
! "		{"&
! "			document.domain = d ;"&
! "		}"&
! "		catch (e)"&
! "		{"&
! "			break ;"&
! "		}"&
! "	}"&
! "})() ;");
! 
  		WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
  		WriteOutput('</script>');
--- 48,54 ----
  	{
  		WriteOutput('<script type="text/javascript">');
! 		// Minified version of the document.domain automatic fix script (#1919).
! 		// The original script can be found at _dev/domain_fix_template.js
! 		WriteOutput("(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();");
  		WriteOutput('window.parent.OnUploadCompleted(' & errorNumber & ', "' & JSStringFormat(fileUrl) & '", "' & JSStringFormat(fileName) & '", "' & JSStringFormat(customMsg) & '");' );
  		WriteOutput('</script>');

Index: cf_io.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cf_io.cfm	5 May 2008 00:35:25 -0000	1.2
--- cf_io.cfm	10 Aug 2008 16:46:32 -0000	1.3
***************
*** 266,304 ****
  	<cfargument name="customMsg" required="false" type="String" default="">
  
  	<cfoutput>
  <script type="text/javascript">
! (function()
! {
! 	var d = document.domain ;
! 
! 	while ( true )
! 	{
! 		// Test if we can access a parent property.
! 		try
! 		{
! 			var test = window.top.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 ;
! 		}
! 	}
! })() ;
! 
! 			window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
! 		</script>
  	</cfoutput>
  	<cfabort>
--- 266,276 ----
  	<cfargument name="customMsg" required="false" type="String" default="">
  
+ 	<!--- Minified version of the document.domain automatic fix script (#1919).
+ 	The original script can be found at _dev/domain_fix_template.js --->
  	<cfoutput>
  <script type="text/javascript">
! (function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
! window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
! </script>
  	</cfoutput>
  	<cfabort>