mirror of
https://github.com/myvesta/vesta
synced 2025-07-06 04:51:54 -07:00
FileManager latest changes
This commit is contained in:
parent
5dbb80aaf3
commit
e02e470d34
5 changed files with 16 additions and 19 deletions
|
@ -1,6 +1,11 @@
|
||||||
<?php
|
<?php
|
||||||
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
|
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
|
||||||
|
|
||||||
|
if ((!isset($_SESSION['FILEMANAGER_KEY'])) || (empty($_SESSION['FILEMANAGER_KEY']))) {
|
||||||
|
header("Location: /login/");
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
$user = $_SESSION['user'];
|
$user = $_SESSION['user'];
|
||||||
if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
||||||
$user=$_SESSION['look'];
|
$user=$_SESSION['look'];
|
||||||
|
|
|
@ -47,7 +47,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
||||||
chmod($fn, 0644);
|
chmod($fn, 0644);
|
||||||
|
|
||||||
if ($f) {
|
if ($f) {
|
||||||
exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}", $output, $return_var);
|
exec (VESTA_CMD . "v-copy-fs-file {$user} {$fn} ".escapeshellarg($path), $output, $return_var);
|
||||||
$error = check_return_code($return_var, $output);
|
$error = check_return_code($return_var, $output);
|
||||||
if ($return_var != 0) {
|
if ($return_var != 0) {
|
||||||
print('<p style="color: white">Error while saving file</p>');
|
print('<p style="color: white">Error while saving file</p>');
|
||||||
|
@ -58,16 +58,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exec (VESTA_CMD . "v-check-fs-permission {$user} '{$path}'", $content, $return_var);
|
exec (VESTA_CMD . "v-open-fs-file {$user} ".escapeshellarg($path), $content, $return_var);
|
||||||
if ($return_var != 0) {
|
|
||||||
var_dump($return_var);
|
|
||||||
var_dump($content);
|
|
||||||
exit;
|
|
||||||
print 'Error while opening file'; // todo: handle this more styled
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
exec (VESTA_CMD . "v-open-fs-file {$user} {$path}", $content, $return_var);
|
|
||||||
if ($return_var != 0) {
|
if ($return_var != 0) {
|
||||||
print 'Error while opening file'; // todo: handle this more styled
|
print 'Error while opening file'; // todo: handle this more styled
|
||||||
exit;
|
exit;
|
||||||
|
|
|
@ -74,13 +74,7 @@ class FileManager {
|
||||||
|
|
||||||
function deleteItem($dir, $item) {
|
function deleteItem($dir, $item) {
|
||||||
$dir = $this->formatFullPath($item);
|
$dir = $this->formatFullPath($item);
|
||||||
//if (is_dir($item)) {
|
exec (VESTA_CMD . "v-delete-fs-directory {$this->user} {$dir}", $output, $return_var);
|
||||||
//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);
|
|
||||||
//}
|
|
||||||
|
|
||||||
$error = self::check_return_code($return_var, $output);
|
$error = self::check_return_code($return_var, $output);
|
||||||
|
|
||||||
|
|
3
web/file_manager/index.php
Normal file
3
web/file_manager/index.php
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
<?php
|
||||||
|
header("Location: /login/");
|
||||||
|
exit;
|
|
@ -2,7 +2,11 @@
|
||||||
|
|
||||||
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
|
include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
|
||||||
|
|
||||||
// Check login_as feature
|
if ((!isset($_SESSION['FILEMANAGER_KEY'])) || (empty($_SESSION['FILEMANAGER_KEY']))) {
|
||||||
|
header("Location: /login/");
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
$user = $_SESSION['user'];
|
$user = $_SESSION['user'];
|
||||||
if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
|
||||||
$user=$_SESSION['look'];
|
$user=$_SESSION['look'];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue