Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 309)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 310)
@@ -91,4 +91,7 @@
 			not create invalid nested block elements, like creating <form> or <hr>
 			inside &lt;p&gt;.</li>
+		<li>>[<a target="_blank" href="http://dev.fckeditor.net/ticket/273">#273</a>] The extensions 
+			"sh", "shtml", "shtm" and "phtm" have been added to the list of denied extensions on 
+			upload.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp	(revision 309)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/asp/config.asp	(revision 310)
@@ -36,5 +36,5 @@
 
 ConfigAllowedExtensions.Add	"File", ""
-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"
+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|sh|shtml|shtm|phtm"
 
 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 309)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/config.cfm	(revision 310)
@@ -35,5 +35,5 @@
 	// config.allowedExtensions["File"] = "doc,rtf,pdf,ppt,pps,xls,csv,vnd,zip";
 	config.allowedExtensions["File"] = "";
-	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.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,sh,shtml,shtm,phtm";
 
 	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 309)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/lasso/config.lasso	(revision 310)
@@ -57,5 +57,5 @@
 		),
 		'DeniedExtensions' = map(
-			'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'),
+			'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','sh','shtml','shtm','phtm'),
 			'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 309)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/php/config.php	(revision 310)
@@ -47,5 +47,5 @@
 
 $Config['AllowedExtensions']['File']	= array() ;
-$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['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','sh','shtml','shtm','phtm') ;
 
 $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 309)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/py/connector.py	(revision 310)
@@ -178,8 +178,8 @@
 				}
 		self.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" ],
-				"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" ]
+				"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","sh","shtml","shtm","phtm" ],
+				"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","sh","shtml","shtm","phtm" ],
+				"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","sh","shtml","shtm","phtm" ],
+				"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","sh","shtml","shtm","phtm" ]
 				}
 
Index: /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp
===================================================================
--- /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp	(revision 309)
+++ /FCKeditor/trunk/editor/filemanager/upload/asp/config.asp	(revision 310)
@@ -42,5 +42,5 @@
 
 ConfigAllowedExtensions.Add	"File", ""
-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"
+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|sh|shtml|shtm|phtm"
 
 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 309)
+++ /FCKeditor/trunk/editor/filemanager/upload/cfm/config.cfm	(revision 310)
@@ -37,5 +37,5 @@
 
 	config.allowedExtensions["File"] = "";
-	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.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,sh,shtml,shtm,phtm";
 
 	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 309)
+++ /FCKeditor/trunk/editor/filemanager/upload/lasso/config.lasso	(revision 310)
@@ -57,5 +57,5 @@
 		),
 		'DeniedExtensions' = map(
-			'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'),
+			'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','sh','shtml','shtm','phtm'),
 			'Image' = array(),
 			'Flash' = array(),
Index: /FCKeditor/trunk/editor/filemanager/upload/php/config.php
===================================================================
--- /FCKeditor/trunk/editor/filemanager/upload/php/config.php	(revision 309)
+++ /FCKeditor/trunk/editor/filemanager/upload/php/config.php	(revision 310)
@@ -46,5 +46,5 @@
 
 $Config['AllowedExtensions']['File']	= array() ;
-$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['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','sh','shtml','shtm','phtm') ;
 
 $Config['AllowedExtensions']['Image']	= array('jpg','gif','jpeg','png') ;
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js	(revision 309)
+++ /FCKeditor/trunk/fckconfig.js	(revision 310)
@@ -213,5 +213,5 @@
 FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
 FCKConfig.LinkUploadAllowedExtensions	= "" ;			// empty for all
-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.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
 
 FCKConfig.ImageUpload = true ;