typo 5.0.3.98.1 → 5.1

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/connector.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -37,7 +37,7 @@ class FCKeditorConnector(	FCKeditorConnectorBase,
 							GetFoldersCommandMixin,
 							GetFoldersAndFilesCommandMixin,
 							CreateFolderCommandMixin,
-							UploadFileCommandMixin, 
+							UploadFileCommandMixin,
 							BaseHttpMixin, BaseXmlMixin, BaseHtmlMixin  ):
 	"The Standard connector class."
 	def doResponse(self):
@@ -57,39 +57,39 @@ class FCKeditorConnector(	FCKeditorConnectorBase,
 		# Check for invalid paths
 		if currentFolder is None:
 			return self.sendError(102, "")
-		
+
 		# Check if it is an allowed command
 		if ( not command in Config.ConfigAllowedCommands ):
-			return self.sendError( 1, 'The %s command isn\'t allowed' % command ) 
-		
+			return self.sendError( 1, 'The %s command isn\'t allowed' % command )
+
 		if ( not resourceType in Config.ConfigAllowedTypes  ):
-			return self.sendError( 1, 'Invalid type specified' ) 
+			return self.sendError( 1, 'Invalid type specified' )
 
 		# Setup paths
 		if command == "QuickUpload":
-			self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] 
+			self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType]
 			self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]
 		else:
 			self.userFilesFolder = Config.FileTypesAbsolutePath[resourceType]
-			self.webUserFilesFolder = Config.FileTypesPath[resourceType]	
-		
+			self.webUserFilesFolder = Config.FileTypesPath[resourceType]
+
 		if not self.userFilesFolder: # no absolute path given (dangerous...)
-			self.userFilesFolder = mapServerPath(self.environ, 
+			self.userFilesFolder = mapServerPath(self.environ,
 									self.webUserFilesFolder)
 		# Ensure that the directory exists.
 		if not os.path.exists(self.userFilesFolder):
 			try:
-				self.createServerFoldercreateServerFolder( self.userFilesFolder ) 
+				self.createServerFoldercreateServerFolder( self.userFilesFolder )
 			except:
 				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")
 
 		# File upload doesn't have to return XML, so intercept here
 		if (command == "FileUpload"):
 			return self.uploadFile(resourceType, currentFolder)
-		
+
 		# Create Url
 		url = combinePaths( self.webUserFilesFolder, currentFolder )
-		
+
 		# Begin XML
 		s += self.createXmlHeader(command, resourceType, currentFolder, url)
 		# Execute the command
@@ -99,8 +99,8 @@ class FCKeditorConnector(	FCKeditorConnectorBase,
 					}
 		s += selector[command](resourceType, currentFolder)
 		s += self.createXmlFooter()
-		return s	
-	
+		return s
+
 # Running from command line (plain old CGI)
 if __name__ == '__main__':
 	try:
@@ -109,7 +109,7 @@ if __name__ == '__main__':
 		data = conn.doResponse()
 		for header in conn.headers:
 			print '%s: %s' % header
-		print 
+		print
 		print data
 	except:
 		print "Content-Type: text/plain"

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckcommands.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -100,7 +100,7 @@ class CreateFolderCommandMixin (object):
 					elif e.errno==13: # permission denied
 						errorNo = 103
 					elif e.errno==36 or e.errno==2 or e.errno==22: # filename too long / no such file / invalid name
-						errorNo = 102 
+						errorNo = 102
 				else:
 					errorNo = 110
 		else:
@@ -110,9 +110,18 @@ class CreateFolderCommandMixin (object):
 	def createServerFolder(self, folderPath):
 		"Purpose: physically creates a folder on the server"
 		# No need to check if the parent exists, just create all hierachy
-		oldumask = os.umask(0)
-		os.makedirs(folderPath,mode=0755)
-		os.umask( oldumask ) 
+
+		try:
+			permissions = Config.ChmodOnFolderCreate
+			if not permissions:
+				os.makedirs(folderPath)
+		except AttributeError: #ChmodOnFolderCreate undefined
+			permissions = 0755
+
+		if permissions:
+			oldumask = os.umask(0)
+			os.makedirs(folderPath,mode=0755)
+			os.umask( oldumask )
 
 class UploadFileCommandMixin (object):
 	def uploadFile(self, resourceType, currentFolder):
@@ -125,7 +134,7 @@ class UploadFileCommandMixin (object):
 			newFile = self.request.get("NewFile", "")
 			# Get the file name
 			newFileName = newFile.filename
-			newFileName = sanitizeFileName( newFileName ) 
+			newFileName = sanitizeFileName( newFileName )
 			newFileNameOnly = removeExtension(newFileName)
 			newFileExtension = getExtension(newFileName).lower()
 			allowedExtensions = Config.AllowedExtensions[resourceType]
@@ -168,9 +177,17 @@ class UploadFileCommandMixin (object):
 						fout.close()
 
 						if os.path.exists ( newFilePath ):
-							oldumask = os.umask(0) 
-							os.chmod( newFilePath, 0755 ) 
-							os.umask( oldumask ) 
+							doChmod = False
+							try:
+								doChmod = Config.ChmodOnUpload
+								permissions = Config.ChmodOnUpload
+							except AttributeError: #ChmodOnUpload undefined
+								doChmod = True
+								permissions = 0755
+							if ( doChmod ):
+								oldumask = os.umask(0)
+								os.chmod( newFilePath, permissions )
+								os.umask( oldumask )
 
 						newFileUrl = self.webUserFilesFolder + currentFolder + newFileName
 

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckconnector.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -38,7 +38,7 @@ class FCKeditorConnectorBase( object ):
 	def __init__(self, environ=None):
 		"Constructor: Here you should parse request fields, initialize variables, etc."
 		self.request = FCKeditorRequest(environ) # Parse request
-		self.headers = []						# Clean Headers 
+		self.headers = []						# Clean Headers
 		if environ:
 			self.environ = environ
 		else:

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckoutput.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -53,12 +53,12 @@ class BaseHttpMixin(object):
 		# Date in the past
 		self.setHeader('Expires','Mon, 26 Jul 1997 05:00:00 GMT')
 		# always modified
-		self.setHeader('Last-Modified',strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime())) 
+		self.setHeader('Last-Modified',strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime()))
 		# HTTP/1.1
-		self.setHeader('Cache-Control','no-store, no-cache, must-revalidate') 
-		self.setHeader('Cache-Control','post-check=0, pre-check=0') 
+		self.setHeader('Cache-Control','no-store, no-cache, must-revalidate')
+		self.setHeader('Cache-Control','post-check=0, pre-check=0')
 		# HTTP/1.0
-		self.setHeader('Pragma','no-cache') 
+		self.setHeader('Pragma','no-cache')
 
 		# Set the response format.
 		self.setHeader( 'Content-Type', content_type + '; charset=utf-8' )
@@ -93,7 +93,7 @@ class BaseXmlMixin(object):
 				"""<Connector>""" +
 				self.sendErrorNode (number, text) +
 				"""</Connector>""" )
-		
+
 	def sendErrorNode(self, number, text):
 		return """<Error number="%s" text="%s" />""" % (number, convertToXmlAttribute(text))
 
@@ -102,10 +102,41 @@ class BaseHtmlMixin(object):
 		self.setHttpHeaders("text/html")
 		"This is the function that sends the results of the uploading process"
 		return """<script type="text/javascript">
-			window.parent.OnUploadCompleted(%(errorNumber)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s"); 
+			(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)s,"%(fileUrl)s","%(fileName)s","%(customMsg)s");
 			</script>""" % {
 			'errorNumber': errorNo,
 			'fileUrl': fileUrl.replace ('"', '\\"'),
-			'fileName': fileName.replace ( '"', '\\"' ) , 
+			'fileName': fileName.replace ( '"', '\\"' ) ,
 			'customMsg': customMsg.replace ( '"', '\\"' ),
-			}
+			}

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/fckutil.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -20,7 +20,7 @@ http://www.mozilla.org/MPL/MPL-1.1.html
 
 == END LICENSE ==
 
-Utility functions for the File Manager Connector for Python 
+Utility functions for the File Manager Connector for Python
 
 """
 
@@ -49,10 +49,10 @@ def removeFromEnd(string, char):
 # Path functions
 
 def combinePaths( basePath, folder ):
-	return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' ) 
+	return removeFromEnd( basePath, '/' ) + '/' + removeFromStart( folder, '/' )
 
 def getFileName(filename):
-	" Purpose: helper function to extrapolate the filename " 
+	" Purpose: helper function to extrapolate the filename "
 	for splitChar in ["/", "\\"]:
 		array = filename.split(splitChar)
 		if (len(array) > 1):
@@ -61,8 +61,8 @@ def getFileName(filename):
 
 def sanitizeFolderName( newFolderName ):
 	"Do a cleanup of the folder name to avoid possible problems"
-	# Remove . \ / | : ? *
-	return re.sub( '\\.|\\\\|\\/|\\||\\:|\\?|\\*', '_', newFolderName )
+	# Remove . \ / | : ? * " < > and control characters
+	return re.sub( '(?u)\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]', '_', newFolderName )
 
 def sanitizeFileName( newFileName ):
 	"Do a cleanup of the file name to avoid possible problems"
@@ -72,27 +72,27 @@ def sanitizeFileName( newFileName ):
 	newFileName = newFileName.replace('\\','/')		# convert windows to unix path
 	newFileName = os.path.basename (newFileName)	# strip directories
 	# Remove \ / | : ? *
-	return re.sub ( '/\\\\|\\/|\\||\\:|\\?|\\*/', '_', newFileName )
+	return re.sub ( '(?u)/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[^\u0000-\u001f\u007f-\u009f]/', '_', newFileName )
 
 def getCurrentFolder(currentFolder):
-	if not currentFolder: 
-		currentFolder = '/' 
+	if not currentFolder:
+		currentFolder = '/'
 
 	# Check the current folder syntax (must begin and end with a slash).
 	if (currentFolder[-1] <> "/"):
 		currentFolder += "/"
 	if (currentFolder[0] <> "/"):
 		currentFolder = "/" + currentFolder
-				
+
 	# Ensure the folder path has no double-slashes
 	while '//' in currentFolder:
-		currentFolder = currentFolder.replace('//','/') 
+		currentFolder = currentFolder.replace('//','/')
 
 	# Check for invalid folder paths (..)
-	if '..' in currentFolder:
+	if '..' in currentFolder or '\\' in currentFolder:
 		return None
 
-	return currentFolder 
+	return currentFolder
 
 def mapServerPath( environ, url):
 	" Emulate the asp Server.mapPath function. Given an url path return the physical directory that it corresponds to "
@@ -101,7 +101,7 @@ def mapServerPath( environ, url):
 	return combinePaths( getRootPath(environ), url )
 
 def mapServerFolder(resourceTypePath, folderPath):
-	return combinePaths ( resourceTypePath  , folderPath ) 
+	return combinePaths ( resourceTypePath  , folderPath )
 
 def getRootPath(environ):
 	"Purpose: returns the root path on the server"
@@ -111,17 +111,16 @@ def getRootPath(environ):
 	if environ.has_key('DOCUMENT_ROOT'):
 		return environ['DOCUMENT_ROOT']
 	else:
-		realPath = os.path.realpath( './' ) 
+		realPath = os.path.realpath( './' )
 		selfPath = environ['SCRIPT_FILENAME']
-		selfPath = selfPath [ :  selfPath.rfind( '/'  ) ] 		
-		selfPath = selfPath.replace( '/', os.path.sep) 
-		
-		position = realPath.find(selfPath) 
+		selfPath = selfPath [ :  selfPath.rfind( '/'  ) ]
+		selfPath = selfPath.replace( '/', os.path.sep)
+
+		position = realPath.find(selfPath)
 
 		# This can check only that this script isn't run from a virtual dir
 		# But it avoids the problems that arise if it isn't checked
-		raise realPath 
+		raise realPath
 		if ( position < 0 or position <> len(realPath) - len(selfPath) or realPath[ : position ]==''):
 			raise Exception('Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/py/config.py".')
 		return realPath[ : position ]
-

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/htaccess.txt

@@ -1,4 +1,4 @@
-# replace the name of this file to .htaccess (if using apache), 
+# replace the name of this file to .htaccess (if using apache),
 # and set the proper options and paths according your enviroment
 
 Allow from all
@@ -19,5 +19,5 @@ PythonOption wsgi.application wsgi::App
 
 
 # Plain old CGI
-#Options +ExecCGI 
+#Options +ExecCGI
 #AddHandler cgi-script py

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/upload.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -31,8 +31,8 @@ from fckconnector import FCKeditorConnectorBase # import base connector
 import config as Config
 
 class FCKeditorQuickUpload(	FCKeditorConnectorBase,
-							UploadFileCommandMixin, 
-							BaseHttpMixin, BaseHtmlMixin):	
+							UploadFileCommandMixin,
+							BaseHttpMixin, BaseHtmlMixin):
 	def doResponse(self):
 		"Main function. Process the request, set headers and return a string as response."
 		# Check if this connector is disabled
@@ -48,24 +48,24 @@ class FCKeditorQuickUpload(	FCKeditorConnectorBase,
 
 		# Check if it is an allowed command
 		if ( not command in Config.ConfigAllowedCommands ):
-			return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command ) 
-		
+			return self.sendUploadResults( 1, '', '', 'The %s command isn\'t allowed' % command )
+
 		if ( not resourceType in Config.ConfigAllowedTypes  ):
-			return self.sendUploadResults( 1, '', '', 'Invalid type specified' ) 
+			return self.sendUploadResults( 1, '', '', 'Invalid type specified' )
 
 		# Setup paths
-		self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType] 
-		self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]	
+		self.userFilesFolder = Config.QuickUploadAbsolutePath[resourceType]
+		self.webUserFilesFolder =  Config.QuickUploadPath[resourceType]
 		if not self.userFilesFolder: # no absolute path given (dangerous...)
-			self.userFilesFolder = mapServerPath(self.environ, 
+			self.userFilesFolder = mapServerPath(self.environ,
 									self.webUserFilesFolder)
-		
+
 		# Ensure that the directory exists.
 		if not os.path.exists(self.userFilesFolder):
 			try:
-				self.createServerFoldercreateServerFolder( self.userFilesFolder ) 
+				self.createServerFoldercreateServerFolder( self.userFilesFolder )
 			except:
-				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")			
+				return self.sendError(1, "This connector couldn\'t access to local user\'s files directories.  Please check the UserFilesAbsolutePath in \"editor/filemanager/connectors/py/config.py\" and try again. ")
 
 		# File upload doesn't have to return XML, so intercept here
 		return self.uploadFile(resourceType, currentFolder)
@@ -79,7 +79,7 @@ if __name__ == '__main__':
 		for header in conn.headers:
 			if not header is None:
 				print '%s: %s' % header
-		print 
+		print
 		print data
 	except:
 		print "Content-Type: text/plain"

data/public/javascripts/fckeditor/editor/filemanager/connectors/py/wsgi.py

@@ -2,7 +2,7 @@
 
 """
 FCKeditor - The text editor for Internet - http://www.fckeditor.net
-Copyright (C) 2003-2007 Frederico Caldeira Knabben
+Copyright (C) 2003-2008 Frederico Caldeira Knabben
 
 == BEGIN LICENSE ==
 
@@ -33,7 +33,7 @@ import cgitb
 from cStringIO import StringIO
 
 # Running from WSGI capable server (recomended)
-def App(environ, start_response): 
+def App(environ, start_response):
 	"WSGI entry point. Run the connector"
 	if environ['SCRIPT_NAME'].endswith("connector.py"):
 		conn = FCKeditorConnector(environ)
@@ -54,5 +54,5 @@ def App(environ, start_response):
 	except:
 		start_response("500 Internal Server Error",[("Content-type","text/html")])
 		file = StringIO()
-		cgitb.Hook(file = file).handle()    
+		cgitb.Hook(file = file).handle()
 		yield file.getvalue()