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

FileManager create archvies

Browse source
This commit is contained in:
Serghey Rodin 2016-08-10 14:36:54 +03:00
commit 317c90b38a
5 changed files with 66 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/file_manager/fm_api.php
View file

@ -110,7 +110,7 @@ switch ($_REQUEST['action']) {
break;
case 'pack_item':
$items = $_REQUEST['items'];
$items = $_REQUEST['items'];
$dst_item = $_REQUEST['dst_item'];
print json_encode($fm->packItem($items, $dst_item));
break;

2
web/file_manager/fm_core.php
View file

@ -158,9 +158,7 @@ class FileManager {
$items = implode(' ', $items_arr);
$dst_item = $this->formatFullPath($dst_item);
$dst_item = str_replace('.tar.gz', '', $dst_item);
// echo VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}";
exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}", $output, $return_var);
$error = self::check_return_code($return_var, $output);

25
web/js/file_manager.js
View file

@ -1141,7 +1141,6 @@ FM.unpackItem = function() {
App.Constants.FM_NO_FILE_SELECTED
);
}
var src = selected.find('.source').val();
src = $.parseJSON(src);
@ -1157,12 +1156,12 @@ FM.unpackItem = function() {
App.Constants.FM_FILE_TYPE_NOT_SUPPORTED
);
}
var dst = FM['TAB_' + tab + '_CURRENT_PATH'];
if (dst == '') {
dst = GLOBAL.ROOT_DIR;
}
var tpl = Tpl.get('popup_unpack', 'FM');
tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', (dst).replace('//', '/'));
@ -1172,36 +1171,32 @@ FM.unpackItem = function() {
FM.packItem = function() {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.active');
var selected = $(FM['TAB_' + tab] ).find('.dir.selected');
if (selected.length == 0) {
return FM.displayError(
App.Constants.FM_NO_FILE_SELECTED
);
}
var src = selected.find('.source').val();
src = $.parseJSON(src);
if (FM.isItemPseudo(src)) {
return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
);
}
if (FM.isItemPseudo(src)) {
if (FM.isItemPseudo(src) && selected.length <=1 ) {
return FM.displayError(
App.Constants.FM_NO_FILE_OR_DIRECTORY_SELECTED
);
}
var dst = FM['TAB_' + tab + '_CURRENT_PATH'];
if (dst == '') {
dst = GLOBAL.ROOT_DIR;
}
var tpl = Tpl.get('popup_pack', 'FM');
if(selected.length > 1){
tpl = Tpl.get('popup_bulk_pack', 'FM');
}
tpl.set(':NUMBER_OF_ITEMS', selected.length);
tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', (dst + '/' + src.name + '.tar.gz').replace('//', '/'));
FM.popupOpen(tpl.finalize());

15
web/js/templates.js
View file

@ -188,6 +188,21 @@ App.Templates.html = {
</div>\
</div>'],
popup_bulk_pack: ['<div class="confirm-box pack warning">\
<div class="message">'+App.Constants.FM_PACK+' (~!:NUMBER_OF_ITEMS~!)</div>\
<div class="actions">\
<input type="text" id="pack-destination" class="new-title" value="~!:DST_DIRNAME~!">\
</div>\
<div class="warning warning-message"></div>\
<!-- div class="actions">\
<label><input type="checkbox" name="overwrite" class="title" />Overwrite exising files</label>\
</div -->\
<div class="controls">\
<p class="cancel" onClick="FM.popupClose();">'+App.Constants.FM_CANCEL+'</p>\
<p class="ok" onClick="FM.confirmPackItem();">'+App.Constants.FM_PACK_BUTTON+'</p>\
</div>\
</div>'],
popup_unpack: ['<div class="confirm-box unpack warning">\
<div class="message">'+App.Constants.FM_EXTRACT+' <span class="title">"~!:FILENAME~!"</span> '+App.Constants.FM_INTO_KEYWORD+':</div>\
<div class="actions">\