[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm ImageObject.cfc, 1.1, 1.2 cf5_connector.cfm, 1.1, 1.2 cf5_upload.cfm, 1.1, 1.2 cf_basexml.cfm, 1.1, 1.2 cf_commands.cfm, 1.1, 1.2 cf_connector.cfm, 1.1, 1.2 cf_io.cfm, 1.1, 1.2 cf_upload.cfm, 1.1, 1.2 cf_util.cfm, 1.1, 1.2 config.cfm, 1.1, 1.2 connector.cfm, 1.1, 1.2 image.cfc, 1.1, 1.2 upload.cfm, 1.1, 1.2
Blaine Lang
blaine at qs1489.pair.com
Sun May 4 20:35:28 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm
In directory qs1489.pair.com:/tmp/cvs-serv85146/editor/filemanager/connectors/cfm
Modified Files:
ImageObject.cfc cf5_connector.cfm cf5_upload.cfm
cf_basexml.cfm cf_commands.cfm cf_connector.cfm cf_io.cfm
cf_upload.cfm cf_util.cfm config.cfm connector.cfm image.cfc
upload.cfm
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08
Index: cf_connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_connector.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_connector.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
Index: image.cfc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/image.cfc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** image.cfc 9 Feb 2008 12:53:58 -0000 1.1
--- image.cfc 5 May 2008 00:35:25 -0000 1.2
***************
*** 1323,1325 ****
</cfcomponent>
-
--- 1323,1324 ----
Index: upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/upload.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- upload.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 29,31 ****
<cfelse>
<cfinclude template="cf_upload.cfm">
! </cfif>
\ No newline at end of file
--- 29,31 ----
<cfelse>
<cfinclude template="cf_upload.cfm">
! </cfif>
Index: ImageObject.cfc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageObject.cfc 9 Feb 2008 12:53:58 -0000 1.1
--- ImageObject.cfc 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
ImageObject.cfc written by Rick Root (rick at webworksllc.com)
!
Related Web Sites:
- http://www.opensourcecf.com/imagecfc (home page)
--- 2,6 ----
<!---
ImageObject.cfc written by Rick Root (rick at webworksllc.com)
!
Related Web Sites:
- http://www.opensourcecf.com/imagecfc (home page)
***************
*** 33,64 ****
All rights reserved.
! Redistribution and use in source and binary forms, with or
! without modification, are permitted provided that the
following conditions are met:
! - Redistributions of source code must retain the above
! copyright notice, this list of conditions and the
! following disclaimer.
! - Redistributions in binary form must reproduce the above
! copyright notice, this list of conditions and the
! following disclaimer in the documentation and/or other
! materials provided with the distribution.
! - Neither the name of the Webworks, LLC. nor the names of
! its contributors may be used to endorse or promote products
! derived from this software without specific prior written
! permission.
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
! CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
! INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
! BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
! LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
! OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
--- 33,64 ----
All rights reserved.
! Redistribution and use in source and binary forms, with or
! without modification, are permitted provided that the
following conditions are met:
! - Redistributions of source code must retain the above
! copyright notice, this list of conditions and the
! following disclaimer.
! - Redistributions in binary form must reproduce the above
! copyright notice, this list of conditions and the
! following disclaimer in the documentation and/or other
! materials provided with the distribution.
! - Neither the name of the Webworks, LLC. nor the names of
! its contributors may be used to endorse or promote products
! derived from this software without specific prior written
! permission.
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
! CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
! INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
! BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
! LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
! HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
! OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
***************
*** 188,192 ****
</cfif>
<cfset imageCFC.setOption(key, val)>
!
</cffunction>
--- 188,192 ----
</cfif>
<cfset imageCFC.setOption(key, val)>
!
</cffunction>
Index: connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- connector.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 29,31 ****
<cfelse>
<cfinclude template="cf_connector.cfm">
! </cfif>
\ No newline at end of file
--- 29,32 ----
<cfelse>
<cfinclude template="cf_connector.cfm">
! </cfif>
! <cfabort>
Index: cf_commands.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_commands.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_commands.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 33,36 ****
--- 33,37 ----
<cfset var sFileExt = "">
<cfset var sFileUrl = "">
+ <cfset var sTempDir = "">
<cfset var sTempFilePath = "">
<cfset var errorNumber = 0>
***************
*** 39,44 ****
<cfset var destination = "">
! <cftry>
! <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
--- 40,54 ----
<cfset var destination = "">
! <cftry>
! <cfif isDefined( "REQUEST.Config.TempDirectory" )>
! <cfset sTempDir = REQUEST.Config.TempDirectory>
! <cfelse>
! <cfset sTempDir = GetTempDirectory()>
! </cfif>
! <cfif NOT DirectoryExists (sTempDir)>
! <cfthrow message="Invalid temporary directory: #sTempDir#">
! </cfif>
!
! <cffile action="UPLOAD" filefield="NewFile" destination="#sTempDir#" nameconflict="makeunique" mode="0755" />
<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
***************
*** 93,102 ****
<cfset destination = sServerDir & sFileName>
! <!---
! <cfdump var="#sTempFilePath#">
! <cfoutput ><br /></cfoutput>
! <cfdump var="#destination#">
! <cfabort>
! --->
<cflock name="#destination#" timeout="30" type="Exclusive">
<cftry>
--- 103,107 ----
<cfset destination = sServerDir & sFileName>
!
<cflock name="#destination#" timeout="30" type="Exclusive">
<cftry>
***************
*** 121,125 ****
</cfcatch>
! </cftry>
<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
--- 126,130 ----
</cfcatch>
! </cftry>
<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
Index: config.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/config.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- config.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 27,31 ****
// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
! Config.Enabled = true ;
// Path to uploaded files relative to the document root.
--- 27,32 ----
// SECURITY: You must explicitly enable this "connector". (Set enabled to "true")
! Config.Enabled = false ;
!
// Path to uploaded files relative to the document root.
***************
*** 57,60 ****
--- 58,66 ----
Config.HtmlExtensions = "html,htm,xml,xsd,txt,js" ;
+ //Due to known issues with GetTempDirectory function, it is
+ //recommended to set this vairiable to a valid directory
+ //instead of using the GetTempDirectory function
+ //(used by MX 6.0 and above)
+ Config.TempDirectory = GetTempDirectory();
// Configuration settings for each Resource Type
Index: cf5_connector.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf5_connector.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf5_connector.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 130,134 ****
<cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/connectors/cfm/config.cfm' file"" />">
! <cfelseif find("..",url.currentFolder)>
<cfset xmlContent = "<Error number=""102"" />">
--- 130,134 ----
<cfset xmlContent = "<Error number=""1"" text=""This connector is disabled. Please check the 'editor/filemanager/connectors/cfm/config.cfm' file"" />">
! <cfelseif find("..",url.currentFolder) or find("\",url.currentFolder)>
<cfset xmlContent = "<Error number=""102"" />">
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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_io.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_io.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 175,179 ****
</cffunction>
! <cffunction name="GetCurrentFolder" returntype="String" output="false">
<cfset var sCurrentFolder = "/">
--- 175,179 ----
</cffunction>
! <cffunction name="GetCurrentFolder" returntype="String" output="true">
<cfset var sCurrentFolder = "/">
***************
*** 194,198 ****
<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
! <cfif find( "..", sCurrentFolder)>
<cfset SendError( 102, "" )>
</cfif>
--- 194,198 ----
<cfset sCurrentFolder = rereplace( sCurrentFolder, "//+", "/", "all" )>
! <cfif find( "..", sCurrentFolder) or find( "\", sCurrentFolder) >
<cfset SendError( 102, "" )>
</cfif>
***************
*** 205,210 ****
<!--- Do a cleanup of the folder name to avoid possible problems --->
! <!--- Remove . \ / | : ? * " < > --->
! <cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
<cfreturn sNewFolderName>
--- 205,210 ----
<!--- Do a cleanup of the folder name to avoid possible problems --->
! <!--- Remove . \ / | : ? * " < > and control characters --->
! <cfset sNewFolderName = rereplace( sNewFolderName, '\.+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
<cfreturn sNewFolderName>
***************
*** 267,271 ****
<cfoutput>
! <script type="text/javascript">
window.parent.OnUploadCompleted( #errorNumber#, "#JSStringFormat(fileUrl)#", "#JSStringFormat(fileName)#", "#JSStringFormat(customMsg)#" );
</script>
--- 267,302 ----
<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>
***************
*** 282,287 ****
<!--- Do a cleanup of the file name to avoid possible problems --->
! <!--- Remove \ / | : ? * " < > --->
! <cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+', "_", "all" )>
<cfreturn sNewFileName>
--- 313,318 ----
<!--- Do a cleanup of the file name to avoid possible problems --->
! <!--- Remove \ / | : ? * " < > and control characters --->
! <cfset sNewFileName = rereplace( sNewFileName, '\\[.]+|\\+|\/+|\|+|\:+|\?+|\*+|"+|<+|>+|[[:cntrl:]]+', "_", "all" )>
<cfreturn sNewFileName>
Index: cf_basexml.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_basexml.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_basexml.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 66,68 ****
<cfargument name="text" required="true">
<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
! </cffunction>
\ No newline at end of file
--- 66,68 ----
<cfargument name="text" required="true">
<cfoutput><Error number="#ARGUMENTS.number#" text="#htmleditformat(ARGUMENTS.text)#" /></cfoutput>
! </cffunction>
Index: cf_upload.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_upload.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_upload.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 34,37 ****
--- 34,43 ----
<cfinclude template="cf_commands.cfm">
+ <cffunction name="SendError" returntype="void" output="true">
+ <cfargument name="number" required="true" type="Numeric">
+ <cfargument name="text" required="true">
+ <cfreturn SendUploadResults( "#ARGUMENTS.number#", "", "", "ARGUMENTS.text" )>
+ </cffunction>
+
<cfset REQUEST.Config = Config>
<cfif find( "/", getBaseTemplatePath() ) >
***************
*** 65,68 ****
<cfset FileUpload( sType, sCurrentFolder, sCommand )>
-
-
--- 71,72 ----
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.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf5_upload.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf5_upload.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 48,51 ****
--- 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>');
***************
*** 68,72 ****
</cfif>
! <cfif find( "..", url.currentFolder)>
<cfset SendUploadResults(102)>
<cfabort>
--- 100,104 ----
</cfif>
! <cfif find( "..", url.currentFolder) or find( "\", url.currentFolder)>
<cfset SendUploadResults(102)>
<cfabort>
***************
*** 294,296 ****
<cfset SendUploadResults(errorNumber, '', '', customMsg)>
<cfabort>
! </cfif>
\ No newline at end of file
--- 326,328 ----
<cfset SendUploadResults(errorNumber, '', '', customMsg)>
<cfabort>
! </cfif>
Index: cf_util.cfm
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cf_util.cfm 9 Feb 2008 12:53:58 -0000 1.1
--- cf_util.cfm 5 May 2008 00:35:25 -0000 1.2
***************
*** 2,6 ****
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2007 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
--- 2,6 ----
<!---
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
! * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
***************
*** 130,132 ****
<cfreturn false>
</cffunction>
-
--- 130,131 ----
More information about the geeklog-cvs
mailing list