baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-08 14:48:41 +00:00
Code Issues Actions Packages Releases Activity

fix(web/app/controllers): do not move if there is any file in zip (#49)

Browse Source 
There are some situations that need to place subfolder in data path.
If there is any file but not only folder in path, do not move.
Previous moving logic did not check about this.
This commit is contained in:
Masco Skray 2019-08-02 19:00:37 +08:00
parent 73aec02216
commit bd74ed3f51
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/controllers/problem_data_manage.php
View File

@ -58,7 +58,7 @@
if ($zip->open($up_filename) === TRUE){ if ($zip->open($up_filename) === TRUE){
$zip->extractTo("/var/uoj_data/upload/{$problem['id']}"); $zip->extractTo("/var/uoj_data/upload/{$problem['id']}");
$zip->close(); $zip->close();
exec("cd /var/uoj_data/upload/{$problem['id']}; for sub_dir in `find -maxdepth 1 -type d ! -name .`; do mv -f \$sub_dir/* . && rm -rf \$sub_dir; done"); exec("cd /var/uoj_data/upload/{$problem['id']}; if [ `find . -maxdepth 1 -type f`File = File ]; then for sub_dir in `find -maxdepth 1 -type d ! -name .`; do mv -f \$sub_dir/* . && rm -rf \$sub_dir; done; fi");
echo "<script>alert('上传成功！')</script>"; echo "<script>alert('上传成功！')</script>";
}else{ }else{
$errmsg = "解压失败！"; $errmsg = "解压失败！";
@ -705,7 +705,7 @@ EOD
<div class="form-group"> <div class="form-group">
<label for="exampleInputFile">上传zip文件</label> <label for="exampleInputFile">上传zip文件</label>
<input type="file" name="problem_data_file" id="problem_data_file"> <input type="file" name="problem_data_file" id="problem_data_file">
<p class="help-block">说明：请将所有数据放置于压缩包根目录内。若压缩包内存在子文件夹，则会将这些一级子文件夹下的内容移动到根目录下，然后这些一级子文件夹删除；若这些子文件夹内存在同名文件，则会发生随机替换，仅保留一个副本。</p> <p class="help-block">说明：请将所有数据放置于压缩包根目录内。若压缩包内仅存在文件夹而不存在文件，则会将这些一级子文件夹下的内容移动到根目录下，然后这些一级子文件夹删除；若这些子文件夹内存在同名文件，则会发生随机替换，仅保留一个副本。</p>
</div> </div>
<input type="hidden" name="problem_data_file_submit" value="submit"> <input type="hidden" name="problem_data_file_submit" value="submit">
</div> </div>