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

need to query all apps for CSP frame-sources, as they need to be set on top-level window/document

Browse Source
This commit is contained in:
Ralf Becker 2015-03-13 12:51:36 +00:00
parent e8786649e3
commit 386ee978f3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -205,9 +205,12 @@ abstract class egw_framework
if (!isset(self::$csp_frame_src_attrs) && !isset($set))
{
$frame_src = array('manual.egroupware.org', 'www.egroupware.org');
if (($additional = $GLOBALS['egw']->hooks->single('csp-frame-src', $GLOBALS['egw_info']['flags']['currentapp'])))
if (($app_additional = $GLOBALS['egw']->hooks->process('csp-frame-src')))
{
$frame_src = array_unique(array_merge($frame_src, $additional));
foreach($app_additional as $addtional)
{
if ($addtional) $frame_src = array_unique(array_merge($frame_src, $addtional));
}
}
return self::csp_frame_src_attrs($frame_src);
}