Fix: file rename validate

7 years ago · e0b4b42ec6
parent 65dcedb3ca
commit e0b4b42ec6
2 changed files with 14 additions and 5 deletions
--- a/application/index/model/FileManage.php
+++ b/application/index/model/FileManage.php
@ -160,12 +160,19 @@ class FileManage extends Model{
 		$originFolder = $fname;
 		$new = str_replace("/", "", self::getFileName($new)[0]);
 		if(!$notEcho){
-			$new = str_replace(" ", "", $new);
+			$newToBeVerify = str_replace(" ", "", $new);
+		}
+		//检查是否全为空格
+		$varifyExplode = explode(".",$newToBeVerify);
+		$isFullBlackspace = false;
+		foreach ($varifyExplode as $key => $value) {
+			if($value == ""){
+				$isFullBlackspace = true;
+				break;
+			}
 		}
-		$newSuffix = explode(".",$new);
-                // 文件名带有‘.’会导致验证失败
-		$newPrefix = str_replace($newSuffix, "", $new);
-		if(!self::fileNameValidate($newPrefix)){
+		$toBeValidated = str_replace(".","",$newToBeVerify);
+		if(!self::fileNameValidate($toBeValidated) || $isFullBlackspace){
 			if($notEcho){
 				return '{ "result": { "success": false, "error": "文件名只支持汉字、字母、数字和下划线_及破折号-" } }';
 			}
@ -184,6 +191,7 @@ class FileManage extends Model{
 			self::folderRename($originFolder,$folderTmp,$uid,$notEcho);
 			die();
 		}
+		$newSuffix = explode(".",$new);
 		$originSuffix = explode(".",$fileRecord["orign_name"]);
 		if(end($originSuffix) != end($newSuffix)){
 			if($notEcho){
--- a/application/index/view/home/home.html
+++ b/application/index/view/home/home.html
@ -35,6 +35,7 @@
    apiURL={
      imgThumb:"/File/Thumb"
    };
+    mediaType = {}
      </script>
  </head>
  <body>