From 857baddc2c1673beae80cac0f09f794c53d8b309 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 13 Mar 2015 12:51:59 +0000 Subject: [PATCH] need to query all apps for CSP frame-sources, as they need to be set on top-level window/document --- phpgwapi/inc/class.egw_framework.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 88aa4193d3..aafe369fea 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -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); }