Skip to content

Commit 8cc1ddf

Browse files
committed
filemanager fix
1 parent 60ebfe3 commit 8cc1ddf

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

web/css/file_manager_editor.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color:
2828

2929
.ace_gutter,
3030
.ace_scroller { padding-top: 0px; }
31-
.ace-twilight .ace_gutter-active-line { margin-top: 10px; }
31+
/*.ace-twilight .ace_gutter-active-line { margin-top: 10px; } */
3232

3333
.ace_gutter-cell { color: #777; }
3434

35-
.ace_editor { font-size: 19px !important; }
35+
.ace_editor { font-size: 17px !important; font-family: "Courier New", Courier, "Lucida Console", Monaco, monospace !important; }

web/js/file_manager.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,12 @@ FM.generate_listing = function(reply, box) {
648648

649649
o.filetype = FM.getFileType(o.name);
650650
if(FM.IMG_FILETYPES.indexOf(o.filetype) >= 0 && o.filetype.length > 0) {
651-
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};
651+
FM.IMAGES[tab][FM.IMAGES[tab].length++] =
652+
{
653+
'img': "/view/file/?path="+o.full_path+"&raw=true",
654+
'thumb': "/view/file/?path="+o.full_path+"&raw=true",
655+
'id': 'img-'+i
656+
};
652657
cl_act = 'onClick="FM.fotoramaOpen(\'' + tab + '\', \'img-' + i +'\')"';
653658
}
654659

@@ -717,7 +722,7 @@ FM.fotoramaOpen = function(tab, img_index) {
717722
});
718723

719724
$('.fotorama').on('fotorama:fullscreenexit', function (e, fotorama) {
720-
$('.fotorama').data('fotorama').destroy();
725+
$('.fotorama').data('fotorama').destroy();
721726
});
722727

723728
$('.fotorama').fotorama().data('fotorama').requestFullScreen();

web/upload/UploadHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ protected function upcount_name($name) {
478478
}
479479

480480
protected function sanitizeFileName($file) {
481-
$file = preg_replace("/[^a-z0-9\._-]+/", '', $file);
481+
$file = preg_replace("/[^A-Za-z0-9\._-]+/", '', $file);
482482

483483
return $file;
484484
}

0 commit comments

Comments
 (0)