From d65d77ef2f67e07f03ca084c42c9bcfac158a51d Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Thu, 26 Jan 2023 20:02:48 +0100
Subject: [PATCH] Idea for #875

---
 dev/Common/Links.js                           |  4 ++
 dev/Stores/Theme.js                           |  1 +
 .../app/libraries/RainLoop/Actions/Themes.php | 60 ++++++++++++-------
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index db157b233..bef08a1b9 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -79,6 +79,10 @@ export const
 	 * @returns {string}
 	 */
 	themePreviewLink = theme => {
+		if (theme.endsWith('@nextcloud')) {
+			theme = theme.slice(0, theme.length - 10).trim();
+			return OC().webroot + '/themes/' + encodeURI(theme) + '/snappymail.png';
+		}
 		let path = 'webVersionPath';
 		if (theme.endsWith('@custom')) {
 			theme = theme.slice(0, theme.length - 7).trim();
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index afc8dcbba..1713c10f9 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -59,6 +59,7 @@ export const
 
 	convertThemeName = theme => theme
 		.replace(/@custom$/, '')
+		.replace(/@nextcloud$/, '')
 		.replace(/([A-Z])/g, ' $1')
 		.replace(/[^a-zA-Z0-9]+/g, ' ')
 		.trim();
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
index 62120eaba..134e4e159 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
@@ -54,16 +54,25 @@ trait Themes
 		}
 
 		$sDir = APP_INDEX_ROOT_PATH . 'themes'; // custom user themes
-		if (\is_dir($sDir)) {
-			$rDirH = \opendir($sDir);
-			if ($rDirH) {
+		if (\is_dir($sDir) && ($rDirH = \opendir($sDir))) {
+			while (($sFile = \readdir($rDirH)) !== false) {
+				if ('.' !== $sFile[0] && \is_dir($sDir . '/' . $sFile)
+				 && (\file_exists("{$sDir}/{$sFile}/styles.css") || \file_exists("{$sDir}/{$sFile}/styles.less"))) {
+					$aCache[] = $sFile . '@custom';
+				}
+			}
+			\closedir($rDirH);
+		}
+
+		if (\class_exists('OC', false)) {
+			$sDir = \OC::$SERVERROOT . '/themes'; // custom user themes
+			if (\is_dir($sDir) && ($rDirH = \opendir($sDir))) {
 				while (($sFile = \readdir($rDirH)) !== false) {
 					if ('.' !== $sFile[0] && \is_dir($sDir . '/' . $sFile)
-					 && (\file_exists("{$sDir}/{$sFile}/styles.css") || \file_exists("{$sDir}/{$sFile}/styles.less"))) {
-						$aCache[] = $sFile . '@custom';
+					 && (\file_exists("{$sDir}/{$sFile}/snappymail.css") || \file_exists("{$sDir}/{$sFile}/snappymail.less"))) {
+						$aCache[] = $sFile . '@nextcloud';
 					}
 				}
-
 				\closedir($rDirH);
 			}
 		}
@@ -89,28 +98,33 @@ trait Themes
 
 	public function compileCss(string $sTheme, bool $bAdmin, bool $bMinified = false) : string
 	{
-		$bCustomTheme = '@custom' === \substr($sTheme, -7);
-		if ($bCustomTheme) {
-			$sTheme = \substr($sTheme, 0, -7);
-		}
-
 		$mResult = array();
-
-		$sBase = ($bCustomTheme ? \RainLoop\Utils::WebPath() : \RainLoop\Utils::WebVersionPath())
-				. "themes/{$sTheme}/";
-
 		$bLess = false;
 
-		$sThemeCSSFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sTheme.'/styles.css';
+		if ('@nextcloud' === \substr($sTheme, -10)) {
+			$sBase = \OC::$WEBROOT . '/';
+			$sThemeCSSFile = \OC::$SERVERROOT . '/themes/' . \str_replace('@nextcloud', '/snappymail.css', $sTheme);
+		} else {
+			$bCustomTheme = '@custom' === \substr($sTheme, -7);
+			if ($bCustomTheme) {
+				$sTheme = \substr($sTheme, 0, -7);
+				$sBase = \RainLoop\Utils::WebPath();
+			} else {
+				$sBase = \RainLoop\Utils::WebVersionPath();
+			}
+			$sBase .= "themes/{$sTheme}/";
+			$sThemeCSSFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sTheme.'/styles.css';
+			if (!\is_file($sThemeCSSFile)) {
+				$sThemeCSSFile = \str_replace('styles.css', 'styles.less', $sThemeCSSFile);
+				if (\is_file($sThemeCSSFile)) {
+					$bLess = true;
+					$mResult[] = "@base: \"{$sBase}\";";
+					$mResult[] = \file_get_contents($sThemeCSSFile);
+				}
+			}
+		}
 		if (\is_file($sThemeCSSFile)) {
 			$mResult[] = \file_get_contents($sThemeCSSFile);
-		} else {
-			$sThemeCSSFile = \str_replace('styles.css', 'styles.less', $sThemeCSSFile);
-			if (\is_file($sThemeCSSFile)) {
-				$bLess = true;
-				$mResult[] = "@base: \"{$sBase}\";";
-				$mResult[] = \file_get_contents($sThemeCSSFile);
-			}
 		}
 
 		$mResult[] = $this->Plugins()->CompileCss($bAdmin, $bLess, $bMinified);