From f726ac706101f567f253b1a85a90e181c2753050 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 11 Mar 2024 11:05:41 +0100
Subject: [PATCH] Cleanup KeyPathHelper a bit

---
 .../v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php   | 10 ----------
 .../v/0.0.0/app/libraries/RainLoop/ServiceActions.php  |  2 +-
 .../v/0.0.0/app/libraries/snappymail/repository.php    |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
index 509711925..db07fc51e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
@@ -9,11 +9,6 @@ class KeyPathHelper
 		return '/Sso/Data/'.$sSsoHash.'/Login/';
 	}
 
-	static public function RepositoryCacheFile(string $sRepo, string $sRepoFile) : string
-	{
-		return '/RepositoryCache/Repo/'.$sRepo.'/File/'.$sRepoFile;
-	}
-
 	static public function ReadReceiptCache(string $sEmail, string $sFolderFullName, int $iUid) : string
 	{
 		return '/ReadReceipt/'.$sEmail.'/'.$sFolderFullName.'/'.$iUid;
@@ -29,11 +24,6 @@ class KeyPathHelper
 		return '/PluginsJsCache/'.$sPluginsHash.'/'.APP_VERSION.'/';
 	}
 
-	static public function CssCache(string $sTheme, string $sHash) : string
-	{
-		return '/CssCache/'.$sHash.'/'.$sTheme.'/'.APP_VERSION.'/';
-	}
-
 	static public function SessionAdminKey(string $sRand) : string
 	{
 		return '/Session/AdminKey/'.\md5($sRand).'/';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 6ff2831a2..f156b61cd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -458,7 +458,7 @@ class ServiceActions
 			$bCacheEnabled = !$bAppDebug && $this->Config()->Get('cache', 'system_data', true);
 			$sCacheFileName = '';
 			if ($bCacheEnabled) {
-				$sCacheFileName = KeyPathHelper::CssCache($sTheme, $this->oActions->Plugins()->Hash()) . $sMinify;
+				$sCacheFileName = '/CssCache/'.$this->oActions->Plugins()->Hash().'/'.$sTheme.'/'.APP_VERSION.'/' . $sMinify;
 				$this->oActions->verifyCacheByKey(\md5($sCacheFileName . ($bJson ? 1 : 0)));
 				$sResult = $this->Cacher()->Get($sCacheFileName);
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
index c105364a0..89499e55d 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
@@ -73,7 +73,7 @@ abstract class Repository
 
 		$oCache = \RainLoop\Api::Actions()->Cacher();
 
-		$sCacheKey = \RainLoop\KeyPathHelper::RepositoryCacheFile(static::BASE_URL, $sRepoFile);
+		$sCacheKey = '/RepositoryCache/Repo/' . static::BASE_URL . '/File/' . $sRepoFile;
 		$sRep = $oCache->Get($sCacheKey);
 		if ('' !== $sRep)
 		{