Changeset 1041

Show
Ignore:
Timestamp:
2007-10-19 10:59:07 (2 years ago)
Author:
wwalc
Message:

Fix for #1325, corrected black/white list approach + fixed some typos in comments.

Location:
FCKeditor/trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • FCKeditor/trunk/editor/filemanager/connectors/asp/config.asp

    r975 r1041  
    2323<% 
    2424 
    25 ' SECURITY: You must explicitelly enable this "connector" (set it to "True"). 
     25' SECURITY: You must explicitly enable this "connector" (set it to "True"). 
    2626' WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only  
    2727'               authenticated users can access this file or use some kind of session checking. 
     
    3535ConfigUserFilesPath = "/userfiles/" 
    3636 
    37 ' Due to security issues with Apache modules, it is reccomended to leave the 
     37' Due to security issues with Apache modules, it is recommended to leave the 
    3838' following setting enabled. 
    3939Dim ConfigForceSingleExtension 
     
    6161'               If it is empty then no restrictions are done here. 
    6262' 
    63 '       For a file to be uploaded it has to fullfil both the AllowedExtensions 
     63'       For a file to be uploaded it has to fulfill both the AllowedExtensions 
    6464'       and DeniedExtensions (that's it: not being denied) conditions. 
    6565' 
     
    7171'               an absolute path.  
    7272'               If it's an empty string then it will be autocalculated. 
    73 '               Usefull if you are using a virtual directory, symbolic link or alias.  
     73'               Useful if you are using a virtual directory, symbolic link or alias.  
    7474'               Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    7575'               Attention: The above 'FileTypesPath' must point to the same directory. 
     
    8484'               an absolute path.  
    8585'               If it's an empty string then it will be autocalculated. 
    86 '               Usefull if you are using a virtual directory, symbolic link or alias.  
     86'               Useful if you are using a virtual directory, symbolic link or alias.  
    8787'               Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    8888'               Attention: The above 'QuickUploadPath' must point to the same directory. 
     
    105105ConfigQuickUploadAbsolutePath.Add "File", "" 
    106106 
    107 ConfigAllowedExtensions.Add     "Image", "bmp|gif|jpeg|jpg|png|psd|tif|tiff" 
     107ConfigAllowedExtensions.Add     "Image", "bmp|gif|jpeg|jpg|png" 
    108108ConfigDeniedExtensions.Add      "Image", "" 
    109109ConfigFileTypesPath.Add "Image", ConfigUserFilesPath & "image/" 
     
    112112ConfigQuickUploadAbsolutePath.Add "Image", "" 
    113113 
    114 ConfigAllowedExtensions.Add     "Flash", "swf|fla" 
     114ConfigAllowedExtensions.Add     "Flash", "swf|flv" 
    115115ConfigDeniedExtensions.Add      "Flash", "" 
    116116ConfigFileTypesPath.Add "Flash", ConfigUserFilesPath & "flash/" 
  • FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm

    r975 r1041  
    3838        Config.ServerPath = "" ; 
    3939 
    40         // Due to security issues with Apache modules, it is reccomended to leave the 
     40        // Due to security issues with Apache modules, it is recommended to leave the 
    4141        // following setting enabled. 
    4242        Config.ForceSingleExtension = true ; 
     
    6565//              If it is empty then no restrictions are done here. 
    6666// 
    67 //      For a file to be uploaded it has to fullfil both the AllowedExtensions 
     67//      For a file to be uploaded it has to fulfill both the AllowedExtensions 
    6868//      and DeniedExtensions (that's it: not being denied) conditions. 
    6969// 
     
    108108        Config.QuickUploadAbsolutePath["File"]  = Config.FileTypesAbsolutePath["File"] ; 
    109109 
    110         Config.AllowedExtensions["Image"]               = "bmp,gif,jpeg,jpg,png,psd,tif,tiff" ; 
     110        Config.AllowedExtensions["Image"]               = "bmp,gif,jpeg,jpg,png" ; 
    111111        Config.DeniedExtensions["Image"]                = "" ; 
    112112        Config.FileTypesPath["Image"]                   = Config.UserFilesPath & 'image/' ; 
     
    115115        Config.QuickUploadAbsolutePath["Image"] = Config.FileTypesAbsolutePath["Image"] ; 
    116116 
    117         Config.AllowedExtensions["Flash"]               = "swf,fla" ; 
     117        Config.AllowedExtensions["Flash"]               = "swf,flv" ; 
    118118        Config.DeniedExtensions["Flash"]                = "" ; 
    119119        Config.FileTypesPath["Flash"]                   = Config.UserFilesPath & 'flash/' ; 
  • FCKeditor/trunk/editor/filemanager/connectors/lasso/config.lasso

    r975 r1041  
    5252                'AllowedExtensions' = map( 
    5353                        'File' = array('7z','aiff','asf','avi','bmp','csv','doc','fla','flv','gif','gz','gzip','jpeg','jpg','mid','mov','mp3','mp4','mpc','mpeg','mpg','ods','odt','pdf','png','ppt','pxd','qt','ram','rar','rm','rmi','rmvb','rtf','sdc','sitd','swf','sxc','sxw','tar','tgz','tif','tiff','txt','vsd','wav','wma','wmv','xls','xml','zip'), 
    54                         'Image' = array('bmp','gif','jpeg','jpg','png','psd','tif','tiff'), 
    55                         'Flash' = array('swf','fla'), 
     54                        'Image' = array('bmp','gif','jpeg','jpg','png'), 
     55                        'Flash' = array('swf','flv'), 
    5656                        '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') 
    5757                ), 
  • FCKeditor/trunk/editor/filemanager/connectors/php/config.php

    r1027 r1041  
    2525global $Config ; 
    2626 
    27 // SECURITY: You must explicitelly enable this "connector". (Set it to "true"). 
     27// SECURITY: You must explicitly enable this "connector". (Set it to "true"). 
    2828// WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only  
    2929//              authenticated users can access this file or use some kind of session checking. 
     
    3939 
    4040// Fill the following value it you prefer to specify the absolute path for the 
    41 // user files directory. Usefull if you are using a virtual directory, symbolic 
     41// user files directory. Useful if you are using a virtual directory, symbolic 
    4242// link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    4343// Attention: The above 'UserFilesPath' must point to the same directory. 
    4444$Config['UserFilesAbsolutePath'] = '' ; 
    4545 
    46 // Due to security issues with Apache modules, it is reccomended to leave the 
     46// Due to security issues with Apache modules, it is recommended to leave the 
    4747// following setting enabled. 
    4848$Config['ForceSingleExtension'] = true ; 
     
    7070                If it is empty then no restrictions are done here. 
    7171 
    72         For a file to be uploaded it has to fullfil both the AllowedExtensions 
     72        For a file to be uploaded it has to fulfill both the AllowedExtensions 
    7373        and DeniedExtensions (that's it: not being denied) conditions. 
    7474 
     
    8080                an absolute path.  
    8181                If it's an empty string then it will be autocalculated. 
    82                 Usefull if you are using a virtual directory, symbolic link or alias.  
     82                Useful if you are using a virtual directory, symbolic link or alias.  
    8383                Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    8484                Attention: The above 'FileTypesPath' must point to the same directory. 
     
    9393                an absolute path.  
    9494                If it's an empty string then it will be autocalculated. 
    95                 Usefull if you are using a virtual directory, symbolic link or alias.  
     95                Useful if you are using a virtual directory, symbolic link or alias.  
    9696                Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    9797                Attention: The above 'QuickUploadPath' must point to the same directory. 
     
    101101                "userfiles" directory to maintain backwards compatibility with older versions of FCKeditor.  
    102102                This is fine, but you in some cases you will be not able to browse uploaded files using file browser. 
    103                 Example: if you clik on "image button", select "Upload" tab and send image  
     103                Example: if you click on "image button", select "Upload" tab and send image  
    104104                to the server, image will appear in FCKeditor correctly, but because it is placed  
    105105                directly in /userfiles/ directory, you'll be not able to see it in built-in file browser. 
     
    121121$Config['QuickUploadAbsolutePath']['File']= $Config['UserFilesAbsolutePath'] ; 
    122122 
    123 $Config['AllowedExtensions']['Image']   = array('bmp','gif','jpeg','jpg','png','psd','tif','tiff') ; 
     123$Config['AllowedExtensions']['Image']   = array('bmp','gif','jpeg','jpg','png') ; 
    124124$Config['DeniedExtensions']['Image']    = array() ; 
    125125$Config['FileTypesPath']['Image']               = $Config['UserFilesPath'] . 'image/' ; 
     
    128128$Config['QuickUploadAbsolutePath']['Image']= $Config['UserFilesAbsolutePath'] ; 
    129129 
    130 $Config['AllowedExtensions']['Flash']   = array('swf','fla') ; 
     130$Config['AllowedExtensions']['Flash']   = array('swf','flv') ; 
    131131$Config['DeniedExtensions']['Flash']    = array() ; 
    132132$Config['FileTypesPath']['Flash']               = $Config['UserFilesPath'] . 'flash/' ; 
  • FCKeditor/trunk/editor/filemanager/connectors/py/config.py

    r975 r1041  
    2323""" 
    2424 
    25 # INSTALLATION NOTE: You must set up your server enviroment accordingly to run  
     25# INSTALLATION NOTE: You must set up your server environment accordingly to run  
    2626# python scripts. This connector requires Python 2.4 or greater. 
    2727#  
     
    2929#  * WSGI (recommended): You'll need apache + mod_python + modpython_gateway  
    3030#                        or any web server capable of the WSGI python standard 
    31 #  * Plain Old CGI:      Any server capable of running standartd python scripts 
     31#  * Plain Old CGI:      Any server capable of running standard python scripts 
    3232#                        (although mod_python is recommended for performance) 
    3333#                        This was the previous connector version operation mode 
     
    4040 
    4141    
    42 # SECURITY: You must explicitelly enable this "connector". (Set it to "True"). 
     42# SECURITY: You must explicitly enable this "connector". (Set it to "True"). 
    4343# WARNING: don't just set "ConfigIsEnabled = True", you must be sure that only  
    4444#               authenticated users can access this file or use some kind of session checking. 
     
    4949 
    5050# Fill the following value it you prefer to specify the absolute path for the 
    51 # user files directory. Usefull if you are using a virtual directory, symbolic 
     51# user files directory. Useful if you are using a virtual directory, symbolic 
    5252# link or alias. Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    5353# Attention: The above 'UserFilesPath' must point to the same directory. 
     
    5656UserFilesAbsolutePath = ''  
    5757 
    58 # Due to security issues with Apache modules, it is reccomended to leave the 
     58# Due to security issues with Apache modules, it is recommended to leave the 
    5959# following setting enabled. 
    6060ForceSingleExtension = True  
     
    7878#               If it is empty then no restrictions are done here. 
    7979# 
    80 #       For a file to be uploaded it has to fullfil both the AllowedExtensions 
     80#       For a file to be uploaded it has to fulfill both the AllowedExtensions 
    8181#       and DeniedExtensions (that's it: not being denied) conditions. 
    8282# 
     
    8888#               an absolute path.  
    8989#               If it's an empty string then it will be autocalculated. 
    90 #               Usefull if you are using a virtual directory, symbolic link or alias.  
     90#               Useful if you are using a virtual directory, symbolic link or alias.  
    9191#               Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    9292#               Attention: The above 'FileTypesPath' must point to the same directory. 
     
    102102#               an absolute path.  
    103103#               If it's an empty string then it will be autocalculated. 
    104 #               Usefull if you are using a virtual directory, symbolic link or alias.  
     104#               Useful if you are using a virtual directory, symbolic link or alias.  
    105105#               Examples: 'C:\\MySite\\userfiles\\' or '/root/mysite/userfiles/'. 
    106106#               Attention: The above 'QuickUploadPath' must point to the same directory. 
     
    114114QuickUploadAbsolutePath['File'] = FileTypesAbsolutePath['File'] 
    115115 
    116 AllowedExtensions['Image']              = ['bmp','gif','jpeg','jpg','png','psd','tif','tiff'] 
     116AllowedExtensions['Image']              = ['bmp','gif','jpeg','jpg','png'] 
    117117DeniedExtensions['Image']               = [] 
    118118FileTypesPath['Image']                  = UserFilesPath + 'image/'  
     
    121121QuickUploadAbsolutePath['Image']= FileTypesAbsolutePath['Image'] 
    122122 
    123 AllowedExtensions['Flash']              = ['swf','fla'] 
     123AllowedExtensions['Flash']              = ['swf','flv'] 
    124124DeniedExtensions['Flash']               = [] 
    125125FileTypesPath['Flash']                  = UserFilesPath + 'flash/' 
  • FCKeditor/trunk/fckconfig.js

    r931 r1041  
    286286FCKConfig.LinkUpload = true ; 
    287287FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; 
    288 FCKConfig.LinkUploadAllowedExtensions   = "" ;                  // empty for all 
    289 FCKConfig.LinkUploadDeniedExtensions    = ".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis|sh|shtml|shtm|phtm)$" ;  // empty for no one 
     288FCKConfig.LinkUploadAllowedExtensions   = ".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$" ;                        // empty for all 
     289FCKConfig.LinkUploadDeniedExtensions    = "" ;  // empty for no one 
    290290 
    291291FCKConfig.ImageUpload = true ; 
     
    296296FCKConfig.FlashUpload = true ; 
    297297FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ; 
    298 FCKConfig.FlashUploadAllowedExtensions  = ".(swf|fla)$" ;               // empty for all 
     298FCKConfig.FlashUploadAllowedExtensions  = ".(swf|flv)$" ;               // empty for all 
    299299FCKConfig.FlashUploadDeniedExtensions   = "" ;                                  // empty for no one 
    300300