github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 02:28:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FM changes

Browse source
This commit is contained in:
Serghey Rodin 2015-11-05 03:17:21 +02:00
commit d207b7a752
9 changed files with 117 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

21
web/file_manager/fm_core.php
View file

@ -44,9 +44,7 @@ class FileManager {
public function checkFileType($dir) {
$dir = $this->formatFullPath($dir);
exec(VESTA_CMD . "v-get-fs-file-type {$this->user} {$dir}", $output, $return_var);
$error = self::check_return_code($return_var, $output);
if (empty($error)) {
return array(
@ -76,12 +74,13 @@ class FileManager {
function deleteItem($dir, $item) {
$dir = $this->formatFullPath($item);
if (is_dir($item)) {
//if (is_dir($item)) {
//var_dump(VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}");die();
exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var);
}
else {
exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var);
}
//}
//else {
// exec (VESTA_CMD . "v-delete-fs-file {$this->user} {$dir}", $output, $return_var);
//}
$error = self::check_return_code($return_var, $output);
@ -189,8 +188,12 @@ class FileManager {
function packItem($item, $dir, $target_dir, $filename) {
$item = $this->formatFullPath($item);
$dst_item = $this->formatFullPath($target_dir);
//print VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}";die();
exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var);
$dst_item = str_replace('.tar.gz', '', $dst_item);
//$item = str_replace($dir . '/', '', $item);
//var_dump(VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}");die();
exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$item}", $output, $return_var);
$error = self::check_return_code($return_var, $output);