Skip to content

Commit 680c444

Browse files
trippotrippo
committed
v. 9.14.0
1 parent 369ce13 commit 680c444

File tree

6 files changed

+44
-30
lines changed

6 files changed

+44
-30
lines changed

‎changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@ Responsive Filemanager Changelog
33
*********************************************************
44
* RFM 9.14.0
55
*********************************************************
6+
- add support to tinymce 5 (thanks to mikolaj pich)
7+
- change image editor to Toast UI Image Editor (thanks to jack denning)
68
- fix Critical Security (thanks to Fariskhi Vidyan for reporting)
79
- add ckEditor on html file edit
10+
- update context menu (thanks to joshua schmidtke)
811
- fix upload an image with malicius code inside
912
- added compatibility with memory_limit expressed in G
1013
- fix relative url return
14+
- fix error on file duplication
15+
- fix error with memory usage (thanks to tim mclaughlin)
1116
- fix a vulnerability on url upload (thanks to donot-wong for reporting)
1217
- fix return on upload in same cases
18+
- other fixes (thanks to all for reporting)
1319

1420
*********************************************************
1521
* RFM 9.13.4

‎filemanager/config/config.php

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,17 @@
9898
*/
9999
'thumbs_base_path' => '../thumbs/',
100100

101+
/*
102+
|--------------------------------------------------------------------------
103+
| path from base_url to base of thumbs folder
104+
|--------------------------------------------------------------------------
105+
|
106+
| with final /
107+
| DO NOT put inside upload folder
108+
|
109+
*/
110+
'thumbs_upload_dir' => '/thumbs/',
111+
101112

102113
/*
103114
|--------------------------------------------------------------------------
@@ -555,9 +566,9 @@
555566
$config['ext_music']
556567
),
557568
'tui_defaults_config' => array(
558-
'common.bi.image' => $config['common.bi.image'],
559-
'common.bisize.width' => $config['common.bisize.width'],
560-
'common.bisize.height' => $config['common.bisize.height'],
569+
//'common.bi.image' => $config['common.bi.image'],
570+
//'common.bisize.width' => $config['common.bisize.width'],
571+
//'common.bisize.height' => $config['common.bisize.height'],
561572
'common.backgroundImage' => $config['common.backgroundImage'],
562573
'common.backgroundColor' => $config['common.backgroundColor'],
563574
'common.border' => $config['common.border'],
@@ -585,7 +596,7 @@
585596
'submenu.normalLabel.color' => $config['submenu.normalLabel.color'],
586597
'submenu.normalLabel.fontWeight' => $config['submenu.normalLabel.fontWeight'],
587598
'submenu.activeLabel.color' => $config['submenu.activeLabel.color'],
588-
'submenu.activeLabel.fontWeight' => $config['submenu.activeLabel.fontWeightcommon.bi.image'],
599+
//'submenu.activeLabel.fontWeight' => $config['submenu.activeLabel.fontWeightcommon.bi.image'],
589600
'checkbox.border' => $config['checkbox.border'],
590601
'checkbox.backgroundColor' => $config['checkbox.backgroundColor'],
591602
'range.pointer.color' => $config['range.pointer.color'],

‎filemanager/dialog.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
<input type="hidden" id="file_number_limit_js" value="<?php echo $config['file_number_limit_js'];?>" />
411411
<input type="hidden" id="sort_by" value="<?php echo $sort_by;?>" />
412412
<input type="hidden" id="descending" value="<?php echo $descending?1:0;?>" />
413-
<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter,'&sort_by='.$sort_by,'&descending='.intval($descending)),array(''),$config['base_url'].$_SERVER['REQUEST_URI']);?>" />
413+
<input type="hidden" id="current_url" value="<?php echo str_replace(array('&filter='.$filter,'&sort_by='.$sort_by,'&descending='.intval($descending)),array(''),$config['base_url'].htmlspecialchars($_SERVER['REQUEST_URI']));?>" />
414414
<input type="hidden" id="lang_show_url" value="<?php echo trans('Show_url');?>" />
415415
<input type="hidden" id="copy_cut_files_allowed" value="<?php if($config['copy_cut_files']) echo 1; else echo 0;?>" />
416416
<input type="hidden" id="copy_cut_dirs_allowed" value="<?php if($config['copy_cut_dirs']) echo 1; else echo 0;?>" />
@@ -833,7 +833,7 @@ function extensionSort($x, $y)
833833
<input accesskey="f" type="text" class="filter-input <?php echo (($_GET['type']!=1 && $_GET['type']!=3) ? '' : 'filter-input-notype');?>" id="filter-input" name="filter" placeholder="<?php echo fix_strtolower(trans('Text_filter'));?>..." value="<?php echo $filter;?>"/><?php if($n_files>$config['file_number_limit_js']){ ?><label id="filter" class="btn"><i class="icon-play"></i></label><?php } ?>
834834

835835
<input id="select-type-all" name="radio-sort" type="radio" data-item="ff-item-type-all" class="hide" />
836-
<label id="ff-item-type-all" title="<?php echo trans('All');?>" <?php if($_GET['type']==1 || $_GET['type']==3){ ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><i class="icon-remove icon-white"></i></label>
836+
<label id="ff-item-type-all" title="<?php echo trans('All');?>" <?php if($_GET['type']==1 || $_GET['type']==3){ ?>style="visibility: hidden;" <?php } ?> data-item="ff-item-type-all" for="select-type-all" style="margin-rigth:0px;" class="tip btn btn-inverse ff-label-type-all"><?php echo trans('All');?></label>
837837

838838
</div>
839839
</div>
@@ -1157,12 +1157,7 @@ function extensionSort($x, $y)
11571157
</div>
11581158
</div>
11591159
<div class="img-precontainer-mini <?php if($is_img) echo 'original-thumb' ?>">
1160-
<?php if($config['multiple_selection']){ ?><div class="selector">
1161-
<label class="cont">
1162-
<input type="checkbox" class="selection" name="selection[]" value="<?php echo $file;?>">
1163-
<span class="checkmark"></span>
1164-
</label>
1165-
</div>
1160+
<?php if($config['multiple_selection']){ ?>
11661161
<?php } ?>
11671162
<div class="filetype <?php echo $file_array['extension'] ?> <?php if(in_array($file_array['extension'], $config['editable_text_file_exts'])) echo 'edit-text-file-allowed' ?> <?php if(!$is_icon_thumb){ echo "hide"; }?>"><?php echo $file_array['extension'] ?></div>
11681163
<div class="img-container-mini">

‎filemanager/include/php_image_magician.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ function __construct($fileName)
229229
// *** Open up the file
230230
$this->image = $this->openImage($fileName);
231231

232-
233232
// *** Assign here so we don't modify the original
234233
$this->imageResized = $this->image;
235234

@@ -2736,6 +2735,7 @@ private function openImage($file)
27362735
$img = @imagecreatefrompng($file);
27372736
break;
27382737
case 'bmp':
2738+
case 'x-ms-bmp':
27392739
$img = @$this->imagecreatefrombmp($file);
27402740
break;
27412741
case 'psd':

‎resources/assets/js/include.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
541541
$el.find('.selection:visible').trigger('click');
542542
$el.find('.selector:visible').trigger('click');
543543
}else{
544-
window[fun]($el.attr('data-file'), jQuery('#field_id').val());
544+
window[fun]($el.attr('data-file'), jQuery('#field_id').val(),$el);
545545
}
546546
}
547547

@@ -2091,9 +2091,10 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
20912091
}
20922092
}
20932093

2094-
apply_none = function(file/*, external*/)
2094+
apply_none = function(file, external,el)
20952095
{
2096-
var _this = jQuery('ul.grid').find('li[data-name="' + file + '"] figcaption a');
2096+
console.log(el);
2097+
var _this = el.parent().find('form a');
20972098
_this[1].click();
20982099
jQuery('.tip-right').tooltip('hide');
20992100
}
@@ -2177,7 +2178,7 @@ var encodeURL,show_animation,hide_animation,apply,apply_none,apply_img,apply_any
21772178
var new_form_id = 'form' + new Date().getTime();
21782179

21792180
form.attr('id', new_form_id);
2180-
form.find('.tip-right').attr('onclick', "jQuery('#" + new_form_id + "').submit();");
2181+
form.find('.tip-right').first().attr('onclick', "jQuery('#" + new_form_id + "').submit();");
21812182
}
21822183

21832184
apply_file_rename = function(container, name)

‎resources/assets/less/style.less

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ form {
879879
}
880880

881881
.selector {
882-
z-index:100;
882+
z-index:1;
883883
.cont {
884884
display: block;
885885
position: relative;
@@ -1060,7 +1060,8 @@ form {
10601060
.img-precontainer-mini {
10611061
display: block;
10621062
position: absolute;
1063-
width: 67px;
1063+
width: 45px;
1064+
left: 22px;
10641065
height: 34px;
10651066
overflow: hidden;
10661067
text-align: center;
@@ -1071,8 +1072,8 @@ form {
10711072
.filetype {
10721073
position: absolute;
10731074
top: 1px;
1075+
left:0;
10741076
text-align: center;
1075-
left: 24px;
10761077
padding: 1px 2px;
10771078
font-size: 13px;
10781079
line-height: 32px;
@@ -1081,28 +1082,28 @@ form {
10811082
color: #fff;
10821083
background: #333;
10831084
}
1084-
.selector {
1085-
position: absolute;
1086-
left: 3px;
1087-
top: 8px;
1088-
width: 18px;
1089-
height: 22px;
1090-
}
1091-
10921085
}
10931086
.cover {
10941087
display: none;
10951088
}
1089+
1090+
.selector{
1091+
top: 8px;
1092+
left: 2px;
1093+
position: relative;
1094+
.cont{
1095+
margin:0;
1096+
}
1097+
}
10961098
.img-container-mini {
10971099
width: 45px;
10981100
height: 34px;
10991101
border: none;
11001102
overflow: hidden;
1101-
display: table-cell;
11021103
text-align: center;
11031104
vertical-align: middle;
11041105
margin: auto;
1105-
padding-left: 24px;
1106+
left: 24px;
11061107

11071108
}
11081109
.img-precontainer-mini.original-thumb {

0 commit comments

Comments
 (0)