Index: /FCKeditor/trunk/_whatsnew.html =================================================================== --- /FCKeditor/trunk/_whatsnew.html (revision 92) +++ /FCKeditor/trunk/_whatsnew.html (revision 93) @@ -178,4 +178,6 @@
  • [SF BUG-1631807] Elements' style properties are now forced to lowercase in IE.
    • +
  • The extensions "html", "htm" and "asis" have been added to the list of denied extensions + on upload.

    • Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp (revision 92) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp (revision 93) @@ -21,5 +21,5 @@ ConfigAllowedExtensions.Add "File", "" -ConfigDeniedExtensions.Add "File", "php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess" +ConfigDeniedExtensions.Add "File", "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" ConfigAllowedExtensions.Add "Image", "jpg|gif|jpeg|png|bmp" Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 92) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm (revision 93) @@ -16,5 +16,5 @@ // config.allowedExtensions["File"] = "doc,rtf,pdf,ppt,pps,xls,csv,vnd,zip"; config.allowedExtensions["File"] = ""; - config.deniedExtensions["File"] = "php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi,htaccess"; + config.deniedExtensions["File"] = "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"; config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp"; Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 92) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso (revision 93) @@ -41,5 +41,5 @@ ), 'DeniedExtensions' = map( - 'File' = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp','htaccess'), + 'File' = array('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','lasso','lassoapp','htaccess','asis'), 'Image' = array(), 'Flash' = array(), Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php (revision 92) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php (revision 93) @@ -26,5 +26,5 @@ $Config['AllowedExtensions']['File'] = array() ; -$Config['DeniedExtensions']['File'] = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','htaccess') ; +$Config['DeniedExtensions']['File'] = array('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') ; $Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ; Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py =================================================================== --- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py (revision 92) +++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py (revision 93) @@ -162,8 +162,8 @@ } self.deniedExtensions = { - "File": [ "php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess" ], - "Image": [ "php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess" ], - "Flash": [ "php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess" ], - "Media": [ "php","php2","php3","php4","php5","phtml","pwml","inc","asp","aspx","ascx","jsp","cfm","cfc","pl","bat","exe","com","dll","vbs","js","reg","cgi","htaccess" ] + "File": [ "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" ], + "Image": [ "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" ], + "Flash": [ "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" ], + "Media": [ "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" ] } Index: /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp (revision 92) +++ /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp (revision 93) @@ -27,5 +27,5 @@ ConfigAllowedExtensions.Add "File", "" -ConfigDeniedExtensions.Add "File", "php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi" +ConfigDeniedExtensions.Add "File", "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" ConfigAllowedExtensions.Add "Image", "jpg|gif|jpeg|png|bmp" Index: /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm (revision 92) +++ /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm (revision 93) @@ -21,5 +21,5 @@ config.allowedExtensions["File"] = ""; - config.deniedExtensions["File"] = "php,php2,php3,php4,php5,phtml,pwml,inc,asp,aspx,ascx,jsp,cfm,cfc,pl,bat,exe,com,dll,vbs,js,reg,cgi"; + config.deniedExtensions["File"] = "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"; config.allowedExtensions["Image"] = "png,gif,jpg,jpeg,bmp"; Index: /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso (revision 92) +++ /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso (revision 93) @@ -51,5 +51,5 @@ ), 'DeniedExtensions' = map( - 'File' = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi','lasso','lassoapp'), + 'File' = array('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','lasso','lassoapp','htaccess','asis'), 'Image' = array(), 'Flash' = array(), Index: /FCKeditor/trunk/editor/filemanager/upload/php/config.php =================================================================== --- /FCKeditor/trunk/editor/filemanager/upload/php/config.php (revision 92) +++ /FCKeditor/trunk/editor/filemanager/upload/php/config.php (revision 93) @@ -30,5 +30,5 @@ $Config['AllowedExtensions']['File'] = array() ; -$Config['DeniedExtensions']['File'] = array('php','php2','php3','php4','php5','phtml','pwml','inc','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','com','dll','vbs','js','reg','cgi') ; +$Config['DeniedExtensions']['File'] = array('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') ; $Config['AllowedExtensions']['Image'] = array('jpg','gif','jpeg','png') ; Index: /FCKeditor/trunk/fckconfig.js =================================================================== --- /FCKeditor/trunk/fckconfig.js (revision 92) +++ /FCKeditor/trunk/fckconfig.js (revision 93) @@ -192,9 +192,9 @@ FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ; FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all -FCKConfig.LinkUploadDeniedExtensions = ".(php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi)$" ; // empty for no one +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)$" ; // empty for no one FCKConfig.ImageUpload = true ; FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ; -FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png)$" ; // empty for all +FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png|bmp)$" ; // empty for all FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one