[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp basexml.asp, 1.1, 1.2 class_upload.asp, 1.1, 1.2 commands.asp, 1.1, 1.2 config.asp, 1.1, 1.2 connector.asp, 1.1, 1.2 io.asp, 1.1, 1.2 upload.asp, 1.1, 1.2 util.asp, 1.1, 1.2
Blaine Lang
blaine at qs1489.pair.com
Sun May 4 20:35:28 EDT 2008
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops fck_document_preview.html, 1.4, 1.5
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor fckdebug.html, 1.5, 1.6 fckdialog.html, 1.5, 1.6 fckeditor.html, 1.6, 1.7 fckeditor.original.html, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp
In directory qs1489.pair.com:/tmp/cvs-serv85146/editor/filemanager/connectors/asp
Modified Files:
basexml.asp class_upload.asp commands.asp config.asp
connector.asp io.asp upload.asp util.asp
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08
Index: config.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/config.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.asp 9 Feb 2008 12:53:58 -0000 1.1
--- config.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 24,28 ****
' SECURITY: You must explicitly enable this "connector" (set it to "True").
! ' WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only
' authenticated users can access this file or use some kind of session checking.
Dim ConfigIsEnabled
--- 24,28 ----
' SECURITY: You must explicitly enable this "connector" (set it to "True").
! ' WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only
' authenticated users can access this file or use some kind of session checking.
Dim ConfigIsEnabled
***************
*** 30,34 ****
' Path to user files relative to the document root.
! ' This setting is preserved only for backward compatibility.
' You should look at the settings for each resource type to get the full potential
Dim ConfigUserFilesPath
--- 30,34 ----
' Path to user files relative to the document root.
! ' This setting is preserved only for backward compatibility.
' You should look at the settings for each resource type to get the full potential
Dim ConfigUserFilesPath
***************
*** 38,42 ****
' following setting enabled.
Dim ConfigForceSingleExtension
! ConfigForceSingleExtension = true
' What the user can do with this connector
--- 38,42 ----
' following setting enabled.
Dim ConfigForceSingleExtension
! ConfigForceSingleExtension = true
' What the user can do with this connector
***************
*** 55,62 ****
' Configuration settings for each Resource Type
'
! ' - AllowedExtensions: the possible extensions that can be allowed.
' If it is empty then any file type can be uploaded.
'
! ' - DeniedExtensions: The extensions that won't be allowed.
' If it is empty then no restrictions are done here.
'
--- 55,62 ----
' Configuration settings for each Resource Type
'
! ' - AllowedExtensions: the possible extensions that can be allowed.
' If it is empty then any file type can be uploaded.
'
! ' - DeniedExtensions: The extensions that won't be allowed.
' If it is empty then no restrictions are done here.
'
***************
*** 65,75 ****
'
' - FileTypesPath: the virtual folder relative to the document root where
! ' these resources will be located.
' Attention: It must start and end with a slash: '/'
'
' - FileTypesAbsolutePath: the physical path to the above folder. It must be
! ' an absolute path.
' If it's an empty string then it will be autocalculated.
! ' Useful if you are using a virtual directory, symbolic link or alias.
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
' Attention: The above 'FileTypesPath' must point to the same directory.
--- 65,75 ----
'
' - FileTypesPath: the virtual folder relative to the document root where
! ' these resources will be located.
' Attention: It must start and end with a slash: '/'
'
' - FileTypesAbsolutePath: the physical path to the above folder. It must be
! ' an absolute path.
' If it's an empty string then it will be autocalculated.
! ' Useful if you are using a virtual directory, symbolic link or alias.
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
' Attention: The above 'FileTypesPath' must point to the same directory.
***************
*** 77,88 ****
'
' - QuickUploadPath: the virtual folder relative to the document root where
! ' these resources will be uploaded using the Upload tab in the resources
' dialogs.
' Attention: It must start and end with a slash: '/'
'
' - QuickUploadAbsolutePath: the physical path to the above folder. It must be
! ' an absolute path.
' If it's an empty string then it will be autocalculated.
! ' Useful if you are using a virtual directory, symbolic link or alias.
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
' Attention: The above 'QuickUploadPath' must point to the same directory.
--- 77,88 ----
'
' - QuickUploadPath: the virtual folder relative to the document root where
! ' these resources will be uploaded using the Upload tab in the resources
' dialogs.
' Attention: It must start and end with a slash: '/'
'
' - QuickUploadAbsolutePath: the physical path to the above folder. It must be
! ' an absolute path.
' If it's an empty string then it will be autocalculated.
! ' Useful if you are using a virtual directory, symbolic link or alias.
' Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'.
' Attention: The above 'QuickUploadPath' must point to the same directory.
Index: class_upload.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/class_upload.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class_upload.asp 9 Feb 2008 12:53:58 -0000 1.1
--- class_upload.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 351,353 ****
Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
End Class
! %>
\ No newline at end of file
--- 351,353 ----
Dim FormName, ClientPath, Path, Name, Ext, Content, Size, MIME, Start
End Class
! %>
Index: basexml.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/basexml.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.asp 9 Feb 2008 12:53:58 -0000 1.1
--- basexml.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
Index: io.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/io.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.asp 9 Feb 2008 12:53:58 -0000 1.1
--- io.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 41,52 ****
else
' Map the "UserFiles" path to a local directory.
! GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) )
end if
else
! if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then
GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
else
' Map the "UserFiles" path to a local directory.
! GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) )
end if
end if
--- 41,52 ----
else
' Map the "UserFiles" path to a local directory.
! GetResourceTypeDirectory = Server.MapPath( ConfigQuickUploadPath.Item( resourceType ) )
end if
else
! if ( ConfigFileTypesAbsolutePath.Item( resourceType ) <> "" ) then
GetResourceTypeDirectory = ConfigFileTypesAbsolutePath.Item( resourceType )
else
' Map the "UserFiles" path to a local directory.
! GetResourceTypeDirectory = Server.MapPath( ConfigFileTypesPath.Item( resourceType ) )
end if
end if
***************
*** 64,68 ****
Dim sResourceTypePath
' Get the resource type directory.
! sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand )
' Ensure that the directory exists.
--- 64,68 ----
Dim sResourceTypePath
' Get the resource type directory.
! sResourceTypePath = GetResourceTypeDirectory( resourceType, sCommand )
' Ensure that the directory exists.
***************
*** 173,177 ****
' Check for invalid folder paths (..)
! If ( InStr( 1, sCurrentFolder, ".." ) <> 0 ) Then
SendError 102, ""
End If
--- 173,177 ----
' Check for invalid folder paths (..)
! If ( InStr( 1, sCurrentFolder, ".." ) <> 0 OR InStr( 1, sCurrentFolder, "\" ) <> 0) Then
SendError 102, ""
End If
***************
*** 186,191 ****
oRegex.Global = True
! ' remove . \ / | : ? * " < >
! oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>)"
SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
--- 186,191 ----
oRegex.Global = True
! ' remove . \ / | : ? * " < > and control characters
! oRegex.Pattern = "(\.|\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
SanitizeFolderName = oRegex.Replace( sNewFolderName, "_" )
***************
*** 204,209 ****
end if
! ' remove \ / | : ? * " < >
! oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>)"
SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
--- 204,209 ----
end if
! ' remove \ / | : ? * " < > and control characters
! oRegex.Pattern = "(\\|\/|\||:|\?|\*|""|\<|\>|[\u0000-\u001F]|\u007F)"
SanitizeFileName = oRegex.Replace( sNewFileName, "_" )
***************
*** 215,218 ****
--- 215,250 ----
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 , """", "\""" ) & """) ;"
Response.Write "</script>"
Index: connector.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/connector.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.asp 9 Feb 2008 12:53:58 -0000 1.1
--- connector.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 6,10 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 6,10 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 51,55 ****
sCurrentFolder = GetCurrentFolder()
! ' Check if it is an allowed command
if ( Not IsAllowedCommand( sCommand ) ) then
SendError 1, "The """ & sCommand & """ command isn't allowed"
--- 51,55 ----
sCurrentFolder = GetCurrentFolder()
! ' Check if it is an allowed command
if ( Not IsAllowedCommand( sCommand ) ) then
SendError 1, "The """ & sCommand & """ command isn't allowed"
***************
*** 57,61 ****
' Check if it is an allowed resource type.
! if ( Not IsAllowedType( sResourceType ) ) Then
SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
end if
--- 57,61 ----
' Check if it is an allowed resource type.
! if ( Not IsAllowedType( sResourceType ) ) Then
SendError 1, "The """ & sResourceType & """ resource type isn't allowed"
end if
***************
*** 86,88 ****
End Sub
! %>
\ No newline at end of file
--- 86,88 ----
End Sub
! %>
Index: util.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/util.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.asp 9 Feb 2008 12:53:58 -0000 1.1
--- util.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
Index: commands.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/commands.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.asp 9 Feb 2008 12:53:58 -0000 1.1
--- commands.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 1,5 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 1,5 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 191,195 ****
dim sFileUrl
sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
! sFileUrl = CombinePaths( sFileUrl, sFileName )
SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
--- 191,195 ----
dim sFileUrl
sFileUrl = CombinePaths( GetResourceTypePath( resourceType, sCommand ) , currentFolder )
! sFileUrl = CombinePaths( sFileUrl, sFileName )
SendUploadResults sErrorNumber, sFileUrl, sFileName, ""
Index: upload.asp
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/asp/upload.asp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.asp 9 Feb 2008 12:53:58 -0000 1.1
--- upload.asp 5 May 2008 00:35:25 -0000 1.2
***************
*** 6,10 ****
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2007 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
--- 6,10 ----
<%
' FCKeditor - The text editor for Internet - http://www.fckeditor.net
! ' Copyright (C) 2003-2008 Frederico Caldeira Knabben
'
' == BEGIN LICENSE ==
***************
*** 32,35 ****
--- 32,39 ----
<!--#include file="class_upload.asp"-->
<%
+
+ Sub SendError( number, text )
+ SendUploadResults number, "", "", text
+ End Sub
' Check if this uploader has been enabled.
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/dialog/fck_docprops fck_document_preview.html, 1.4, 1.5
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor fckdebug.html, 1.5, 1.6 fckdialog.html, 1.5, 1.6 fckeditor.html, 1.6, 1.7 fckeditor.original.html, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list