ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 143 Activity

RFM 

Selecting file and placing into the editor fails - fixed
Select image fail : dialog.php null parameter  with php 8.1
This commit is contained in:
Fred Tempez 2022-10-23 17:33:11 +02:00
parent ef984055f1
commit 821c8644c8
2 changed files with 2 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/vendor/filemanager/dialog.php vendored
View File

@ -276,7 +276,7 @@ if (isset($_GET['editor'])) {
$editor = $_GET['type'] == 0 ? null : 'tinymce';
}
$field_id = isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : null;
$field_id = isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : '';
$type_param = fix_get_params($_GET['type']);
$apply = null;

112
core/vendor/filemanager/plugin.min.js vendored
View File

@ -1,111 +1 @@
/**
* plugin.js
*
* Copyright, Alberto Peripolli
* Released under Creative Commons Attribution-NonCommercial 3.0 Unported License.
*
* Contributing: https://github.com/trippo/ResponsiveFilemanager
*/
tinymce.PluginManager.add('filemanager', function(editor) {
editor.settings.file_picker_types = 'file image media';
editor.settings.file_picker_callback = filemanager;
function filemanager_onMessage(event){
if(editor.settings.external_filemanager_path.toLowerCase().indexOf(event.origin.toLowerCase()) === 0){
if(event.data.sender === 'responsivefilemanager'){
tinymce.activeEditor.windowManager.getParams().setUrl(event.data.url);
tinymce.activeEditor.windowManager.close();
// Remove event listener for a message from ResponsiveFilemanager
if(window.removeEventListener){
window.removeEventListener('message', filemanager_onMessage, false);
} else {
window.detachEvent('onmessage', filemanager_onMessage);
}
}
}
}
function filemanager(callback, value, meta) {
var width = window.innerWidth-30;
var height = window.innerHeight-60;
if(width > 1800) width=1800;
if(height > 1200) height=1200;
if(width>600){
var width_reduce = (width - 20) % 138;
width = width - width_reduce + 10;
}
// DEFAULT AS FILE
urltype=2;
if (meta.filetype === 'image' || meta.mediaType === 'image') { urltype=1; }
if (meta.filetype === 'media' || meta.mediaType === 'media') { urltype=3; }
var title="RESPONSIVE FileManager";
if (typeof editor.settings.filemanager_title !== "undefined" && editor.settings.filemanager_title) {
title=editor.settings.filemanager_title;
}
var akey="key";
if (typeof editor.settings.filemanager_access_key !== "undefined" && editor.settings.filemanager_access_key) {
akey=editor.settings.filemanager_access_key;
}
var sort_by="";
if (typeof editor.settings.filemanager_sort_by !== "undefined" && editor.settings.filemanager_sort_by) {
sort_by="&sort_by="+editor.settings.filemanager_sort_by;
}
var descending=0;
if (typeof editor.settings.filemanager_descending !== "undefined" && editor.settings.filemanager_descending) {
descending=editor.settings.filemanager_descending;
}
var fldr="";
if (typeof editor.settings.filemanager_subfolder !== "undefined" && editor.settings.filemanager_subfolder) {
fldr="&fldr="+editor.settings.filemanager_subfolder;
}
var crossdomain="";
if (typeof editor.settings.filemanager_crossdomain !== "undefined" && editor.settings.filemanager_crossdomain) {
crossdomain="&crossdomain=1";
// Add handler for a message from ResponsiveFilemanager
if(window.addEventListener){
window.addEventListener('message', filemanager_onMessage, false);
} else {
window.attachEvent('onmessage', filemanager_onMessage);
}
}
window.addEventListener('message', function receiveMessage(event) {
window.removeEventListener('message', receiveMessage, false);
if (event.data.sender === 'responsivefilemanager') {
callback(event.data.url);
}
}, false);
var dialogUrl = editor.settings.external_filemanager_path+'dialog.php?type='+urltype+'&descending='+descending+sort_by+fldr+crossdomain+'&lang='+editor.settings.language+'&akey='+akey;
if (tinymce.majorVersion > 4) {
tinymce.activeEditor.windowManager.openUrl({
title: title,
url: dialogUrl,
width: width,
height: height,
resizable: true,
maximizable: true,
inline: 1,
});
} else {
tinymce.activeEditor.windowManager.open({
title: title,
file: dialogUrl,
width: width,
height: height,
resizable: true,
maximizable: true,
inline: 1,
});
}
}
return false;
});
tinymce.PluginManager.add("filemanager",(function(editor){function filemanager_onMessage(event){0===editor.settings.external_filemanager_path.toLowerCase().indexOf(event.origin.toLowerCase())&&"responsivefilemanager"===event.data.sender&&(tinymce.activeEditor.windowManager.getParams().setUrl(event.data.url),tinymce.activeEditor.windowManager.close(),window.removeEventListener?window.removeEventListener("message",filemanager_onMessage,!1):window.detachEvent("onmessage",filemanager_onMessage))}function filemanager(callback,value,meta){var width=window.innerWidth-30,height=window.innerHeight-60,width_reduce;(width>1800&&(width=1800),height>1200&&(height=1200),width>600)&&(width=width-(width-20)%138+10);urltype=2,"image"!==meta.filetype&&"image"!==meta.mediaType||(urltype=1),"media"!==meta.filetype&&"media"!==meta.mediaType||(urltype=3);var title="RESPONSIVE FileManager";void 0!==editor.settings.filemanager_title&&editor.settings.filemanager_title&&(title=editor.settings.filemanager_title);var akey="key";void 0!==editor.settings.filemanager_access_key&&editor.settings.filemanager_access_key&&(akey=editor.settings.filemanager_access_key);var sort_by="";void 0!==editor.settings.filemanager_sort_by&&editor.settings.filemanager_sort_by&&(sort_by="&sort_by="+editor.settings.filemanager_sort_by);var descending=0;void 0!==editor.settings.filemanager_descending&&editor.settings.filemanager_descending&&(descending=editor.settings.filemanager_descending);var fldr="";void 0!==editor.settings.filemanager_subfolder&&editor.settings.filemanager_subfolder&&(fldr="&fldr="+editor.settings.filemanager_subfolder);var crossdomain="";void 0!==editor.settings.filemanager_crossdomain&&editor.settings.filemanager_crossdomain&&(crossdomain="&crossdomain=1",window.addEventListener?window.addEventListener("message",filemanager_onMessage,!1):window.attachEvent("onmessage",filemanager_onMessage)),window.addEventListener("message",(function receiveMessage(event){"responsivefilemanager"===event.data.sender&&callback(event.data.url)}),!1);var dialogUrl=editor.settings.external_filemanager_path+"dialog.php?type="+urltype+"&descending="+descending+sort_by+fldr+crossdomain+"&lang="+editor.settings.language+"&akey="+akey;tinymce.majorVersion>4?tinymce.activeEditor.windowManager.openUrl({title:title,url:dialogUrl,width:width,height:height,resizable:!0,maximizable:!0,inline:1}):tinymce.activeEditor.windowManager.open({title:title,file:dialogUrl,width:width,height:height,resizable:!0,maximizable:!0,inline:1})}return editor.settings.file_picker_types="file image media",editor.settings.file_picker_callback=filemanager,!1}));