[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp basexml.asp, 1.2, 1.3 commands.asp, 1.2, 1.3 io.asp, 1.2, 1.3

[Blaine Lang]

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

Modified Files:
	basexml.asp commands.asp io.asp 
Log Message:
Upgrade to FCKeditor ver 2.6.3

Index: commands.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/commands.asp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** commands.asp	5 May 2008 00:35:25 -0000	1.2
--- commands.asp	10 Aug 2008 16:46:30 -0000	1.3
***************
*** 104,108 ****
  		' Map the virtual path to the local server path of the current folder.
  		Dim sServerDir
! 		sServerDir = ServerMapFolder( resourceType, CombinePaths(currentFolder, sNewFolderName), "CreateFolder" )
  
  		On Error Resume Next
--- 104,108 ----
  		' Map the virtual path to the local server path of the current folder.
  		Dim sServerDir
! 		sServerDir = ServerMapFolder( resourceType, CombineLocalPaths(currentFolder, sNewFolderName), "CreateFolder" )
  
  		On Error Resume Next
***************
*** 172,176 ****
  			Do While ( True )
  				Dim sFilePath
! 				sFilePath = sServerDir & sFileName
  
  				If ( oFSO.FileExists( sFilePath ) ) Then
--- 172,176 ----
  			Do While ( True )
  				Dim sFilePath
! 				sFilePath = CombineLocalPaths(sServerDir, sFileName)
  
  				If ( oFSO.FileExists( sFilePath ) ) Then

Index: basexml.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/basexml.asp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** basexml.asp	5 May 2008 00:35:25 -0000	1.2
--- basexml.asp	10 Aug 2008 16:46:30 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  
  	' Set the response format.
+ 	Response.CodePage 		= 65001
  	Response.CharSet		= "UTF-8"
  	Response.ContentType	= "text/xml"

Index: io.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/io.asp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** io.asp	5 May 2008 00:35:25 -0000	1.2
--- io.asp	10 Aug 2008 16:46:30 -0000	1.3
***************
*** 26,29 ****
--- 26,35 ----
  end function
  
+ function CombineLocalPaths( sBasePath, sFolder)
+ 	sFolder = replace(sFolder, "/", "\")
+ 	' The RemoveFrom* functions use RegExp, so we must escape the \
+ 	CombineLocalPaths =  RemoveFromEnd( sBasePath, "\\" ) & "\" & RemoveFromStart( sFolder, "\\" )
+ end function
+ 
  Function GetResourceTypePath( resourceType, sCommand )
  	if ( sCommand = "QuickUpload") then
***************
*** 70,74 ****
  
  	' Return the resource type directory combined with the required path.
! 	ServerMapFolder = CombinePaths( sResourceTypePath, folderPath )
  End Function
  
--- 76,80 ----
  
  	' Return the resource type directory combined with the required path.
! 	ServerMapFolder = CombineLocalPaths( sResourceTypePath, folderPath )
  End Function
  
***************
*** 80,83 ****
--- 86,93 ----
  	sParent = oFSO.GetParentFolderName( folderPath )
  
+ 	' If folderPath is a network path (\\server\folder\) then sParent is an empty string.
+ 	' Get out.
+ 	if (sParent = "") then exit sub
+ 
  	' Check if the parent exists, or create it.
  	If ( NOT oFSO.FolderExists( sParent ) ) Then CreateServerFolder( sParent )
***************
*** 215,249 ****
  	Response.Clear
  	Response.Write "<script type=""text/javascript"">"
! 	Response.Write "(function()"
! 	Response.Write "{"
! 	Response.Write "var d = document.domain ;"
! 
! 	Response.Write " while ( true )"
! 	Response.Write "	{"
! 	' Test if we can access a parent property.
! 	Response.Write "		try"
! 	Response.Write "		{"
! 	Response.Write "			var test = window.top.opener.document.domain ;"
! 	Response.Write "			break ;"
! 	Response.Write "		}"
! 	Response.Write "		catch( e ) {}"
! 
! 	' Remove a domain part: www.mytest.example.com => mytest.example.com => example.com ...
! 	Response.Write "		d = d.replace( /.*?(?:\.|$)/, '' ) ;"
! 
! 	Response.Write "		if ( d.length == 0 )"
! 	' It was not able to detect the domain.
! 	Response.Write "			break ;"
! 	Response.Write ""
! 	Response.Write "		try"
! 	Response.Write "		{"
! 	Response.Write "			document.domain = d ;"
! 	Response.Write "		}"
! 	Response.Write "		catch (e)"
! 	Response.Write "		{"
! 	Response.Write "			break ;"
! 	Response.Write "		}"
! 	Response.Write "	}"
! 	Response.Write "})() ;"
  
  	Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"
--- 225,231 ----
  	Response.Clear
  	Response.Write "<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
! 	Response.Write "(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;}}})();"
  
  	Response.Write "window.parent.OnUploadCompleted(" & errorNumber & ",""" & Replace( fileUrl, """", "\""" ) & """,""" & Replace( fileName, """", "\""" ) & """,""" & Replace( customMsg , """", "\""" ) & """) ;"