From a88c2e94f938e7836cdaf21cc620e95f81977041 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 3 Jan 2023 12:26:01 +0100
Subject: [PATCH] Bugfix: forgot debug js/css setting change in Nextcloud

---
 .../snappymail/lib/ContentSecurityPolicy.php  | 25 ++++---------------
 .../lib/Controller/PageController.php         |  4 +--
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
index 5a2d9bfba..b0b0ca201 100644
--- a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -16,10 +16,7 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 	function __construct() {
 		$CSP = \RainLoop\Api::getCSP();
 
-		$this->allowedScriptDomains = \array_unique(\array_merge(
-			$this->allowedScriptDomains,
-			$CSP->script
-		));
+		$this->allowedScriptDomains = \array_unique(\array_merge($this->allowedScriptDomains, $CSP->script));
 		$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'unsafe-inline'", "'unsafe-eval'"]);
 
 		// Nextcloud only sets 'strict-dynamic' when browserSupportsCspV3() ?
@@ -27,26 +24,14 @@ class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy
 			? $this->useStrictDynamic(true) // NC24+
 			: $this->addAllowedScriptDomain("'strict-dynamic'");
 
-		$this->allowedImageDomains = \array_unique(\array_merge(
-			$this->allowedImageDomains,
-			$CSP->img
-		));
+		$this->allowedImageDomains = \array_unique(\array_merge($this->allowedImageDomains, $CSP->img));
 
-		$this->allowedStyleDomains = \array_unique(\array_merge(
-			$this->allowedStyleDomains,
-			$CSP->style
-		));
+		$this->allowedStyleDomains = \array_unique(\array_merge($this->allowedStyleDomains, $CSP->style));
 		$this->allowedStyleDomains = \array_diff($this->allowedStyleDomains, ["'unsafe-inline'"]);
 
-		$this->allowedFrameDomains = \array_unique(\array_merge(
-			$this->allowedFrameDomains,
-			$CSP->frame
-		));
+		$this->allowedFrameDomains = \array_unique(\array_merge($this->allowedFrameDomains, $CSP->frame));
 
-		$this->reportTo = \array_unique(\array_merge(
-			$this->reportTo,
-			$CSP->report_to
-		));
+		$this->reportTo = \array_unique(\array_merge($this->reportTo, $CSP->report_to));
 	}
 
 	public function getSnappyMailNonce() {
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index f64b53fea..c01981951 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -51,8 +51,8 @@ class PageController extends Controller
 		$oActions = $bAdmin ? new \RainLoop\ActionsAdmin() : \RainLoop\Api::Actions();
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
 		$oServiceActions = new \RainLoop\ServiceActions($oHttp, $oActions);
-		$sAppJsMin = $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min';
-		$sAppCssMin = $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min';
+		$sAppJsMin = $oConfig->Get('debug', 'javascript', false) ? '' : '.min';
+		$sAppCssMin = $oConfig->Get('debug', 'css', false) ? '' : '.min';
 		$sLanguage = $oActions->GetLanguage(false);
 
 		$csp = new ContentSecurityPolicy();