extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

no need to switch on CSP policy unsafe-inline, unless we use method=ckeditor_return, as we are ported to eT2

Browse Source
This commit is contained in:
Ralf Becker 2014-05-14 08:15:42 +00:00
parent 6c696a1db0
commit 3f5f0ed81b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
filemanager/inc/class.filemanager_select.inc.php
View File

@ -46,8 +46,6 @@ class filemanager_select
*/
function __construct()
{
// tell framework felamimail needs eval and inline javascript :(
egw_framework::csp_script_src_attrs(array('unsafe-eval', 'unsafe-inline'));
// strip slashes from _GET parameters, if someone still has magic_quotes_gpc on
if (get_magic_quotes_gpc() && $_GET)
{
@ -147,7 +145,7 @@ class filemanager_select
$content['name'] = egw_vfs::encodePathComponent($content['file_upload']['name']);
$to_path = egw_vfs::concat($content['path'],$content['name']);
$copy_result = (egw_vfs::is_writable($content['path']) || egw_vfs::is_writable($to)) &&
$copy_result = (egw_vfs::is_writable($content['path']) || egw_vfs::is_writable($to_path)) &&
copy($content['file_upload']['tmp_name'],egw_vfs::PREFIX.$to_path);
}
@ -247,7 +245,6 @@ class filemanager_select
$content['path'] = filemanager_ui::get_home_dir();
}
$tpl = new etemplate_new('filemanager.select');
$et2 = class_exists('etemplate_widget', false) && is_a($tpl, 'etemplate_widget');
if ($favorites_flag)
{
@ -255,13 +252,13 @@ class filemanager_select
$files = array();
$favorites = egw_favorites::get_favorites('filemanager');
$n = 0;
foreach($favorites as $f_id => $favorite)
foreach($favorites as $favorite)
{
$path = $favorite['state']['path'];
// Just directories
if(!$path) continue;
if ($path == $content['path']) continue; // remove directory itself
$mime = egw_vfs::mime_content_type($path);
$content['dir'][$n] = array(
'name' => $favorite['name'],
@ -335,6 +332,11 @@ class filemanager_select
$preserve['ckeditor'] = $content['ckeditor'];
}
// tell framework we need inline javascript for ckeditor_return
if ($content['method'] == 'ckeditor_return')
{
egw_framework::csp_script_src_attrs('unsafe-inline');
}
$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,$preserve,2);
}