msb-public
/
cloudreve
mirror of https://github.com/cloudreve/Cloudreve
1
0
Code Issues Projects Releases Wiki Activity

Fix: file rename validate

Browse Source
pull/141/head
HFO4 7 years ago
parent 65dcedb3ca
commit e0b4b42ec6
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File

18
application/index/model/FileManage.php
Unescape View File

@ -160,12 +160,19 @@ class FileManage extends Model{
$originFolder = $fname; $originFolder = $fname;
$new = str_replace("/", "", self::getFileName($new)[0]); $new = str_replace("/", "", self::getFileName($new)[0]);
if(!$notEcho){ 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); }
// 文件名带有‘.’会导致验证失败 $toBeValidated = str_replace(".","",$newToBeVerify);
$newPrefix = str_replace($newSuffix, "", $new); if(!self::fileNameValidate($toBeValidated) || $isFullBlackspace){
if(!self::fileNameValidate($newPrefix)){
if($notEcho){ if($notEcho){
return '{ "result": { "success": false, "error": "文件名只支持汉字、字母、数字和下划线_及破折号-" } }'; return '{ "result": { "success": false, "error": "文件名只支持汉字、字母、数字和下划线_及破折号-" } }';
} }
@ -184,6 +191,7 @@ class FileManage extends Model{
self::folderRename($originFolder,$folderTmp,$uid,$notEcho); self::folderRename($originFolder,$folderTmp,$uid,$notEcho);
die(); die();
} }
$newSuffix = explode(".",$new);
$originSuffix = explode(".",$fileRecord["orign_name"]); $originSuffix = explode(".",$fileRecord["orign_name"]);
if(end($originSuffix) != end($newSuffix)){ if(end($originSuffix) != end($newSuffix)){
if($notEcho){ if($notEcho){

1
application/index/view/home/home.html
Unescape View File

@ -35,6 +35,7 @@
apiURL={ apiURL={
imgThumb:"/File/Thumb" imgThumb:"/File/Thumb"
}; };
mediaType = {}
</script> </script>
</head> </head>
<body> <body>

Write Preview
Loading…
Cancel
Save