github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-06 13:01:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

typo fix

Browse source
This commit is contained in:
Serghey Rodin 2015-10-22 16:57:24 +03:00
parent 7a1975ce39
commit fdce35d610
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/v-change-fs-file-permission
View file

@ -41,7 +41,7 @@ if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then
fi fi
# Changing file permissions # Changing file permissions
sudo -u $user chmod $permisions "$src_file" >/dev/null 2>&1 sudo -u $user chmod $permissions "$src_file" >/dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error: access permission on $src_file was not changed" echo "Error: access permission on $src_file was not changed"
exit 3 exit 3

2
web/file_manager/UploadHandler.php
View file

@ -84,7 +84,7 @@ class UploadHandler
// The php.ini settings upload_max_filesize and post_max_size // The php.ini settings upload_max_filesize and post_max_size
// take precedence over the following max_file_size setting: // take precedence over the following max_file_size setting:
'max_file_size' => null, 'max_file_size' => null,
'min_file_size' => 1, 'min_file_size' => 0,
// The maximum number of files for the upload directory: // The maximum number of files for the upload directory:
'max_number_of_files' => null, 'max_number_of_files' => null,
// Defines which files are handled as image files: // Defines which files are handled as image files:

13
web/js/file_manager.js
View file

@ -1237,7 +1237,7 @@ FM.unpackItem = function() {
var tpl = Tpl.get('popup_unpack', 'FM'); var tpl = Tpl.get('popup_unpack', 'FM');
tpl.set(':FILENAME', src.name); tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', dst + '/' + src.name); tpl.set(':DST_DIRNAME', (dst + '/' + src.name).replace('//', '/'));
FM.popupOpen(tpl.finalize()); FM.popupOpen(tpl.finalize());
} }
@ -1275,7 +1275,7 @@ FM.packItem = function() {
var tpl = Tpl.get('popup_pack', 'FM'); var tpl = Tpl.get('popup_pack', 'FM');
tpl.set(':FILENAME', src.name); tpl.set(':FILENAME', src.name);
tpl.set(':DST_DIRNAME', dst + '/' + src.name + '.tar.gz'); tpl.set(':DST_DIRNAME', (dst + '/' + src.name + '.tar.gz').replace('//', '/'));
FM.popupOpen(tpl.finalize()); FM.popupOpen(tpl.finalize());
} }
@ -1448,7 +1448,7 @@ FM.copyItems = function() {
var tpl = Tpl.get('popup_copy', 'FM'); var tpl = Tpl.get('popup_copy', 'FM');
tpl.set(':SRC_FILENAME', src.full_path); tpl.set(':SRC_FILENAME', src.full_path);
tpl.set(':DST_FILENAME', dst + '/' + src.name); tpl.set(':DST_FILENAME', (dst + '/' + src.name).replace('//', '/'));
FM.popupOpen(tpl.finalize()); FM.popupOpen(tpl.finalize());
} }
@ -2080,10 +2080,17 @@ $(document).ready(function() {
if (src.type == 'd') { if (src.type == 'd') {
FM.open(src.full_path, FM.CURRENT_TAB); FM.open(src.full_path, FM.CURRENT_TAB);
} }
else {
if(FM.IMG_FILETYPES.indexOf(src.filetype) >= 0 && src.filetype.length > 0) {
//FM.IMAGES[tab][FM.IMAGES[tab].length] = {'img': "/view/file/?path=/home/admin/"+o.name+"&raw=true", 'thumb': "/view/file/?path=/home/admin/"+o.name//+"&raw=true", 'id': 'img-'+i};
//cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"';
FM.fotoramaOpen(tab, 'img-' + elm.index());
}
else { else {
FM.openFile(src.full_path, FM.CURRENT_TAB, elm); FM.openFile(src.full_path, FM.CURRENT_TAB, elm);
} }
} }
}
},{ },{
'type': 'keydown', 'type': 'keydown',
'propagate': false, 'propagate': false,