diff --git a/application/index/model/FileManage.php b/application/index/model/FileManage.php index e452c845..05034343 100644 --- a/application/index/model/FileManage.php +++ b/application/index/model/FileManage.php @@ -752,7 +752,7 @@ class FileManage extends Model{ if(empty($dirName)){ return ["result"=>["success"=>false,"error"=>"目录名不能为空"]]; } - if(Db::name('folders')->where('position_absolute',$dirPosition)->where('owner',$uid)->find() ==null || Db::name('folders')->where('owner',$uid)->where('position',$dirPosition)->where('folder_name',$dirName)->find() !=null || Db::name('files')->where('upload_date',$uid)->where('dir',$dirPosition)->where('pre_name',$dirName)->find() !=null){ + if(Db::name('folders')->where('position_absolute',$dirPosition)->where('owner',$uid)->find() ==null || Db::name('folders')->where('owner',$uid)->where('position',$dirPosition)->where('folder_name',$dirName)->find() !=null || Db::name('files')->where('upload_user',$uid)->where('dir',$dirPosition)->where('pre_name',$dirName)->find() !=null){ return ["result"=>["success"=>false,"error"=>"路径不存在或文件已存在"]]; } $sqlData = [ diff --git a/extend/PHPMailer/PHPMailer/PHPMailer.php b/extend/PHPMailer/PHPMailer/PHPMailer.php index 44926151..3483ad6c 100644 --- a/extend/PHPMailer/PHPMailer/PHPMailer.php +++ b/extend/PHPMailer/PHPMailer/PHPMailer.php @@ -3594,7 +3594,7 @@ class PHPMailer //Is it a valid IPv4 address? return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4); } - if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) { + if (filter_var('http://' . $host, FILTER_VALIDATE_URL)) { //Is it a syntactically valid hostname? return true; }