diff --git a/src/admin/dialog/select_soft_post.php b/src/admin/dialog/select_soft_post.php
index b199d7da..8ecc1c2f 100644
--- a/src/admin/dialog/select_soft_post.php
+++ b/src/admin/dialog/select_soft_post.php
@@ -45,7 +45,7 @@ if (!empty($newname)) {
     if (!preg_match("#\.#", $filename)) $fs = explode('.', $uploadfile_name);
     else $fs = explode('.', $filename);
     if (preg_match("#".$cfg_not_allowall."#", $fs[count($fs) - 1])) {
-        ShowMsg("指定的文件名已被系统禁止", 'javascript:;');
+        ShowMsg("指定的文件名已被系统禁止", "javascript:;");
         exit();
     }
     if (!preg_match("#\.#", $filename)) $filename = $filename.'.'.$fs[count($fs) - 1];
@@ -58,8 +58,8 @@ if (!empty($newname)) {
     }
     $filename = $filename.'.'.$fs[count($fs) - 1];
 }
-if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)[^a-zA-Z0-9]+$#i', trim($filename))) {
-    ShowMsg("指定的文件名已被系统禁止",'javascript:;');
+if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($filename))) {
+    ShowMsg("指定的文件名已被系统禁止", "javascript:;");
     exit();
 }
 $fullfilename = $cfg_basedir.$activepath.'/'.$filename;
diff --git a/src/admin/file_class.php b/src/admin/file_class.php
index d96092d5..aac1e0e4 100644
--- a/src/admin/file_class.php
+++ b/src/admin/file_class.php
@@ -30,14 +30,12 @@ class FileManagement
         $newname = $this->baseDir.$this->activeDir."/".$newname;
         $oldext = pathinfo($oldname)['extension'];
         $newext = pathinfo($newname)['extension'];
-
         if ($oldext != $newext) {
             if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) {
                 ShowMsg("指定的文件名已被系统禁止", "javascript:;");
                 exit();
             }
         }
-        
         if (($newname != $oldname) && is_writable($oldname)) {
             rename($oldname, $newname);
         }
diff --git a/src/admin/media_add.php b/src/admin/media_add.php
index 01d2f7d3..44784a46 100644
--- a/src/admin/media_add.php
+++ b/src/admin/media_add.php
@@ -52,8 +52,8 @@ if ($dopost == "upload") {
                 MkdirAll($cfg_basedir.$savePath, 777);
                 CloseFtp();
             }
-            if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)[^a-zA-Z0-9]+$#i', trim($filename))) { 
-                ShowMsg("指定的文件名已被系统禁止",'javascript:;'); 
+            if (preg_match('#\.(php|pl|cgi|asp|aspx|jsp|php5|php4|php3|shtm|shtml)$#i', trim($newname))) { 
+                ShowMsg("指定的文件名已被系统禁止", "javascript:;"); 
                 exit(); 
             }
             $fullfilename = $cfg_basedir.$filename;