[geeklog-cvs] geeklog: Fixed paths for image upload in FCKeditor (bug #0000931...

[geeklog-cvs at lists.geeklog.net]

changeset 7856:0e98c323aac8
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0e98c323aac8
user: Dirk Haun <dirk at haun-online.de>
date: Sun Mar 28 13:54:16 2010 +0200
description:
Fixed paths for image upload in FCKeditor (bug #0000931) and disabled Flash upload

diffstat:

 public_html/docs/history                                           |   2 ++
 public_html/fckeditor/editor/filemanager/connectors/php/config.php |  12 ++++++------
 public_html/fckeditor/fckconfig.js                                 |   2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 3bbef570151f -r 0e98c323aac8 public_html/docs/history
--- a/public_html/docs/history	Sun Mar 28 10:35:44 2010 +0200
+++ b/public_html/docs/history	Sun Mar 28 13:54:16 2010 +0200
@@ -6,6 +6,8 @@
 Geeklog 1.7.0 now supports PostgreSQL, implemented by Stan Palatnik during the
 2009 Google Summer of Code.
 
+- Fixed paths for image upload in FCKeditor (bug #0000931) and disabled Flash
+  upload [Dirk]
 - Updated FCKeditor to version 2.6.6 [Dirk]
 - Raised minimum required PHP version to PHP 4.4.0 [Dirk]
 - Fixed an old bug that would create a new topic when you tried to change the
diff -r 3bbef570151f -r 0e98c323aac8 public_html/fckeditor/editor/filemanager/connectors/php/config.php
--- a/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sun Mar 28 10:35:44 2010 +0200
+++ b/public_html/fckeditor/editor/filemanager/connectors/php/config.php	Sun Mar 28 13:54:16 2010 +0200
@@ -147,21 +147,21 @@
 $Config['DeniedExtensions']['Image']	= array() ;
 $Config['FileTypesPath']['Image']		= $Config['UserFilesPath'] . 'Image/' ;
 $Config['FileTypesAbsolutePath']['Image']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'Image/' ;
-$Config['QuickUploadPath']['Image']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ;
+$Config['QuickUploadPath']['Image']		= $Config['FileTypesPath']['Image'] ;
+$Config['QuickUploadAbsolutePath']['Image']= $Config['FileTypesAbsolutePath']['Image'] ;
 
 $Config['AllowedExtensions']['Flash']	= array('swf','flv') ;
 $Config['DeniedExtensions']['Flash']	= array() ;
 $Config['FileTypesPath']['Flash']		= $Config['UserFilesPath'] . 'Flash/' ;
 $Config['FileTypesAbsolutePath']['Flash']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'Flash/' ;
-$Config['QuickUploadPath']['Flash']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Flash']= $Config['UserFilesAbsolutePath'] ;
+$Config['QuickUploadPath']['Flash']		= $Config['FileTypesPath']['Flash'] ;
+$Config['QuickUploadAbsolutePath']['Flash']= $Config['FileTypesAbsolutePath']['Flash'] ;
 
 $Config['AllowedExtensions']['Media']	= array('aiff', 'asf', 'avi', 'bmp', 'fla', 'flv', 'gif', 'jpeg', 'jpg', 'mid', 'mov', 'mp3', 'mp4', 'mpc', 'mpeg', 'mpg', 'png', 'qt', 'ram', 'rm', 'rmi', 'rmvb', 'swf', 'tif', 'tiff', 'wav', 'wma', 'wmv') ;
 $Config['DeniedExtensions']['Media']	= array() ;
 $Config['FileTypesPath']['Media']		= $Config['UserFilesPath'] . 'Media/' ;
 $Config['FileTypesAbsolutePath']['Media']= ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'Media/' ;
-$Config['QuickUploadPath']['Media']		= $Config['UserFilesPath'] ;
-$Config['QuickUploadAbsolutePath']['Media']= $Config['UserFilesAbsolutePath'] ;
+$Config['QuickUploadPath']['Media']		= $Config['FileTypesPath']['Media'] ;
+$Config['QuickUploadAbsolutePath']['Media']= $Config['FileTypesAbsolutePath']['Media'] ;
 
 ?>
diff -r 3bbef570151f -r 0e98c323aac8 public_html/fckeditor/fckconfig.js
--- a/public_html/fckeditor/fckconfig.js	Sun Mar 28 10:35:44 2010 +0200
+++ b/public_html/fckeditor/fckconfig.js	Sun Mar 28 13:54:16 2010 +0200
@@ -306,7 +306,7 @@
 FCKConfig.ImageUploadAllowedExtensions	= ".(jpg|gif|jpeg|png|bmp)$" ;		// empty for all
 FCKConfig.ImageUploadDeniedExtensions	= "" ;							// empty for no one
 
-FCKConfig.FlashUpload = true ;
+FCKConfig.FlashUpload = false ;
 FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Flash' ;
 FCKConfig.FlashUploadAllowedExtensions	= ".(swf|flv)$" ;		// empty for all
 FCKConfig.FlashUploadDeniedExtensions	= "" ;					// empty for no one