[geeklog-cvs] Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl basexml.pl, 1.1, 1.2 commands.pl, 1.1, 1.2 connector.cgi, 1.1, 1.2 io.pl, 1.1, 1.2 upload.cgi, 1.1, 1.2 upload_fck.pl, 1.1, 1.2 util.pl, 1.1, 1.2

Blaine Lang blaine at qs1489.pair.com
Sun May 4 20:35:29 EDT 2008 

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

Modified Files:
	basexml.pl commands.pl connector.cgi io.pl upload.cgi 
	upload_fck.pl util.pl 
Log Message:
Upgraded the FCKeditor to version 2.6 Final - latest release April 7/08

Index: upload.cgi
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/upload.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload.cgi	9 Feb 2008 12:53:59 -0000	1.1
--- upload.cgi	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 3,7 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 105,109 ****
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /\.\./ ) {
  		SendError( 102, "" ) ;
  	}
--- 105,109 ----
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
  		SendError( 102, "" ) ;
  	}
***************
*** 116,118 ****
  
  }
- 
--- 116,117 ----

Index: commands.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/commands.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** commands.pl	9 Feb 2008 12:53:59 -0000	1.1
--- commands.pl	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 ==
***************
*** 92,95 ****
--- 92,96 ----
  	if($FORM{'NewFolderName'} ne "") {
  		$sNewFolderName = $FORM{'NewFolderName'};
+ 		$sNewFolderName =~ s/\.|\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
  		# Map the virtual path to the local server path of the current folder.
  		$sServerDir = &ServerMapFolder($resourceType, $currentFolder);
***************
*** 129,132 ****
--- 130,134 ----
  		# Get the uploaded file name.
  		$sFileName = $new_fname;
+ 		$sFileName =~ s/\\|\/|\||\:|\?|\*|\"|<|>|[[:cntrl:]]/_/g;
  		$sOriginalFileName = $sFileName;
  
***************
*** 141,145 ****
  			} else {
  				copy("$img_dir/$new_fname","$sFilePath");
! 				chmod(0777,$sFilePath);
  				unlink("$img_dir/$new_fname");
  				last;
--- 143,156 ----
  			} else {
  				copy("$img_dir/$new_fname","$sFilePath");
! 				if (defined $CHMOD_ON_UPLOAD) {
! 					if ($CHMOD_ON_UPLOAD) {
! 						umask(000);
! 						chmod($CHMOD_ON_UPLOAD,$sFilePath);
! 					}
! 				}
! 				else {
! 					umask(000);
! 					chmod(0777,$sFilePath);
! 				}
  				unlink("$img_dir/$new_fname");
  				last;
***************
*** 159,164 ****
  	local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;
  
! 	print "Content-type: text/html\n\n";
! 	print '<script type="text/javascript">';
  	print 'window.parent.OnUploadCompleted(' . $sErrorNumber . ',"' . JS_cnv($sFileUrl) . '","' . JS_cnv($sFileName) . '","' . JS_cnv($customMsg) . '") ;';
  	print '</script>';
--- 170,210 ----
  	local($sErrorNumber, $sFileUrl, $sFileName, $customMsg) = @_;
  
! 	print <<EOF;
! Content-type: text/html
! 
! <script type="text/javascript">
! // Automatically detect the correct document.domain (#1919).
! (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 ;
! 		}
! 	}
! })() ;
! 
! EOF
  	print 'window.parent.OnUploadCompleted(' . $sErrorNumber . ',"' . JS_cnv($sFileUrl) . '","' . JS_cnv($sFileName) . '","' . JS_cnv($customMsg) . '") ;';
  	print '</script>';

Index: connector.cgi
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/connector.cgi,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** connector.cgi	9 Feb 2008 12:53:59 -0000	1.1
--- connector.cgi	5 May 2008 00:35:25 -0000	1.2
***************
*** 3,7 ****
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2007 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
--- 3,7 ----
  #####
  #  FCKeditor - The text editor for Internet - http://www.fckeditor.net
! #  Copyright (C) 2003-2008 Frederico Caldeira Knabben
  #
  #  == BEGIN LICENSE ==
***************
*** 102,106 ****
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /\.\./ ) {
  		SendError( 102, "" ) ;
  	}
--- 102,106 ----
  
  	# Check for invalid folder paths (..)
! 	if ( $sCurrentFolder =~ /(?:\.\.|\\)/ ) {
  		SendError( 102, "" ) ;
  	}
***************
*** 135,137 ****
  	exit ;
  }
- 
--- 135,136 ----

Index: upload_fck.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** upload_fck.pl	9 Feb 2008 12:53:59 -0000	1.1
--- upload_fck.pl	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 ==
***************
*** 29,32 ****
--- 29,42 ----
  $MAX_CONTENT_SIZE =  30000;
  
+ # After file is uploaded, sometimes it is required to change its permissions
+ # so that it was possible to access it at the later time.
+ # If possible, it is recommended to set more restrictive permissions, like 0755.
+ # Set to 0 to disable this feature.
+ $CHMOD_ON_UPLOAD = 0777;
+ 
+ # See comments above.
+ # Used when creating folders that does not exist.
+ $CHMOD_ON_FOLDER_CREATE = 0755;
+ 
  # Filelock (1=use,0=not use)
  $PM{'flock'}		= '1';
***************
*** 125,131 ****
  	my ($FORM) = @_;
  
! 
! 	mkdir($img_dir,0777);
! 	chmod(0777,$img_dir);
  
  	undef $img_data_exists;
--- 135,150 ----
  	my ($FORM) = @_;
  
! 	if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
! 		mkdir("$img_dir");
! 	}
! 	else {
! 		umask(000);
! 		if (defined $CHMOD_ON_FOLDER_CREATE) {
! 			mkdir("$img_dir",$CHMOD_ON_FOLDER_CREATE);
! 		}
! 		else {
! 			mkdir("$img_dir",0777);
! 		}
! 	}
  
  	undef $img_data_exists;

Index: util.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/util.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** util.pl	9 Feb 2008 12:53:59 -0000	1.1
--- util.pl	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.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/io.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** io.pl	9 Feb 2008 12:53:59 -0000	1.1
--- io.pl	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 ==
***************
*** 88,94 ****
  	}
  	if(!(-e $folderPath)) {
! 		umask(000);
! 		mkdir("$folderPath",0777);
! 		chmod(0777,"$folderPath");
  		return(0);
  	} else {
--- 88,104 ----
  	}
  	if(!(-e $folderPath)) {
! 		if (defined $CHMOD_ON_FOLDER_CREATE && !$CHMOD_ON_FOLDER_CREATE) {
! 			mkdir("$folderPath");
! 		}
! 		else {
! 			umask(000);
! 			if (defined $CHMOD_ON_FOLDER_CREATE) {
! 				mkdir("$folderPath",$CHMOD_ON_FOLDER_CREATE);
! 			}
! 			else {
! 				mkdir("$folderPath",0777);
! 			}
! 		}
! 
  		return(0);
  	} else {

Index: basexml.pl
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/fckeditor/editor/filemanager/connectors/perl/basexml.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** basexml.pl	9 Feb 2008 12:53:59 -0000	1.1
--- basexml.pl	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 ==

More information about the geeklog-cvs mailing list