From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 6 Dec 2017 13:43:09 +0000 (+0000)
Subject: done #1821 @0:15
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e37f737a45ca935f1e2f8bc431503cf4285258ab;p=cubeextranet.git

done #1821 @0:15
---

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 94c07866b..a1ecf9075 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -560,9 +560,10 @@ class wsHTML5Compiler {
 			}
 		}
 
-		$securitypolicywhitelist = implode(' ', array_unique($this->securityPolicyWhitelist));
-
-		$vars = array('titre', 'credits', 'statsfooter', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon', 'svg', 'beginbody', 'securitypolicywhitelist');
+		if ($this->phonegap) {
+			$csp = "<meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'self' data: gap: 'unsafe-inline' *; style-src 'self' 'unsafe-inline'; font-src 'self' data:; script-src 'self' 'unsafe-inline' 'unsafe-eval' " . implode(' ', array_unique($this->securityPolicyWhitelist)) . "; img-src * data:\">";
+		}
+		$vars = array('titre', 'credits', 'statsfooter', 'ga', 'style', 'script', 'pagesContents', 'description', 'print', 'hiddenContents', 'splash', 'cache', 'bgcolor', 'message', 'favicon', 'svg', 'beginbody', 'csp');
 		foreach ($vars as $v) {
 			$html = str_replace('<!-- $' . $v . ' -->', $$v, $html);
 		}
@@ -1397,6 +1398,7 @@ class wsHTML5Compiler {
 		$menuBreakpoint = empty($this->book->parametres->menuBreakpoint) ? '1080px' : $this->book->parametres->menuBreakpoint;
 
 		$lessVariables['menu-breakpoint'] = $menuBreakpoint;
+		$lessVariables['menu-button-background'] = $this->theme->parametres->subSecondaryColor;
 		$lessVariables['menu-background'] = $menuColor->toCSS();
 		$lessVariables['menu-text'] = $menuTextColor;
 		$lessVariables['menu-field-background'] = wsHTML5::colorToCSS($this->theme->parametres->subFieldColor);
@@ -1405,7 +1407,6 @@ class wsHTML5Compiler {
 		$lessVariables['menu-select-text'] = wsHTML5::colorToCSS($this->theme->parametres->subTextSelectColor);
 		$lessVariables['icon-color'] = wsHTML5::colorToCSS($this->theme->parametres->couleurI);
 
-
 		$menuMultiply = $menuColor->multiply($menuColor);
 		$menuMultiply2 = $menuMultiply->multiply($menuColor);