holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt filemanager_select select popup to csp_script_src_attrs; fix select for CKEditor 4.3, falsely regarding the ckeditor induced filemanager_select.select as JSONResponse

Browse Source
This commit is contained in:
Klaus Leithoff 2013-11-28 12:02:04 +00:00
parent dd5ac9d70f
commit a8b65a0932
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ class filemanager_select
*/ */
function __construct() 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 // strip slashes from _GET parameters, if someone still has magic_quotes_gpc on
if (get_magic_quotes_gpc() && $_GET) if (get_magic_quotes_gpc() && $_GET)
{ {
@ -198,7 +200,7 @@ class filemanager_select
htmlspecialchars($download_url)."',". htmlspecialchars($download_url)."',".
"'');\nwindow.close();"; "'');\nwindow.close();";
} }
if(egw_json_response::isJSONResponse()) if(egw_json_response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
{ {
$response = egw_json_response::get(); $response = egw_json_response::get();
if($js) if($js)