mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2024-09-20 04:38:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add folder deletion.

Browse source
This commit is contained in:
Lars Jung 2014-05-22 23:14:20 +02:00
parent 8fa939ae30
commit 62e60cffd3
3 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/_h5ai/conf/options.json
View file

@ -89,7 +89,7 @@ Options
},
/* [EXPERIMENTAL]
Allow file deletion.
Allow file and folder deletion. Be careful with this option!
*/
"delete": {
"enabled": false

10
src/_h5ai/server/php/inc/class-api.php
View file

@ -169,9 +169,9 @@ class Api {
if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$abs_path = $this->app->to_path($href);
$path = $this->app->to_path($href);
if (!unlink($abs_path)) {
if (!delete_path($path, true)) {
$errors[] = $href;
}
}
@ -196,10 +196,10 @@ class Api {
if ($code == MAGIC_SEQUENCE && !$this->app->is_ignored($n)) {
$abs_path = $this->app->to_path($href);
$folder = normalize_path(dirname($abs_path));
$path = $this->app->to_path($href);
$folder = normalize_path(dirname($path));
if (!rename($abs_path, $folder . "/" . $name)) {
if (!rename($path, $folder . "/" . $name)) {
json_fail(2, "renaming failed");
}
}

21
src/_h5ai/server/php/inc/util.php
View file

@ -86,6 +86,27 @@ function exec_cmdv($cmdv) {
}
function delete_path($path, $recursive = false) {
if (is_file($path)) {
return @unlink($path);
}
if (is_dir($path)) {
if ($recursive === true && $dir = opendir($path)) {
while (($name = readdir($dir)) !== false) {
delete_path($path . "/" . $name);
}
closedir($dir);
}
return @rmdir($path);
}
return false;
}
// debug tools
function err_log($message, $obj = null) {