From f44507a69bae7b289a7193ec0e82cc7a29d80604 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Fri, 4 Mar 2022 23:46:37 +0100
Subject: [PATCH] Cleanup some code

---
 .../0.0.0/app/libraries/RainLoop/Actions.php  |  7 ++--
 .../libraries/RainLoop/Plugins/Manager.php    |  2 +-
 .../app/libraries/snappymail/repository.php   | 34 -------------------
 .../app/libraries/snappymail/upgrade.php      |  4 +--
 4 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 636580c45..313fa69e5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -919,10 +919,9 @@ class Actions
 		$aResult['Language'] = $this->ValidateLanguage($sLanguage, '', false);
 		$aResult['UserLanguage'] = $this->ValidateLanguage($UserLanguageRaw, '', false, true);
 
-		$aResult['PluginsLink'] = '';
-		if (0 < $this->oPlugins->Count() && $this->oPlugins->HaveJs($bAdmin)) {
-			$aResult['PluginsLink'] = './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/';
-		}
+		$aResult['PluginsLink'] = $this->oPlugins->HaveJs($bAdmin)
+			? './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/'
+			: '';
 
 		$bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false);
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index 169475a6e..fffa58ae9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -116,7 +116,7 @@ class Manager
 		}
 		else
 		{
-			$this->Actions()->Logger()->Write('Cannot get installed plugins from '.APP_PLUGINS_PATH,
+			$this->oActions->Logger()->Write('Cannot get installed plugins from '.APP_PLUGINS_PATH,
 				\MailSo\Log\Enumerations\Type::ERROR);
 		}
 
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 614eb1ed5..1eee2695b 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
@@ -262,38 +262,4 @@ abstract class Repository
 		return $bResult;
 	}
 
-	private static function pluginEnable(string $sName, bool $bEnable = true) : bool
-	{
-		if (!\strlen($sName))
-		{
-			return false;
-		}
-
-		$oConfig = \RainLoop\Api::Config();
-
-		$sEnabledPlugins = $oConfig->Get('plugins', 'enabled_list', '');
-		$aEnabledPlugins = \explode(',', \strtolower($sEnabledPlugins));
-		$aEnabledPlugins = \array_map('trim', $aEnabledPlugins);
-
-		$aNewEnabledPlugins = array();
-		if ($bEnable)
-		{
-			$aNewEnabledPlugins = $aEnabledPlugins;
-			$aNewEnabledPlugins[] = $sName;
-		}
-		else
-		{
-			foreach ($aEnabledPlugins as $sPlugin)
-			{
-				if ($sName !== $sPlugin && \strlen($sPlugin))
-				{
-					$aNewEnabledPlugins[] = $sPlugin;
-				}
-			}
-		}
-
-		$oConfig->Set('plugins', 'enabled_list', \trim(\implode(',', \array_unique($aNewEnabledPlugins)), ' ,'));
-
-		return $oConfig->Save();
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index 78479434b..a1d03ef42 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -146,13 +146,13 @@ abstract class Upgrade
 	/**
 	 * Decodes old less secure data
 	 */
-	private static function DecodeKeyValues(string $sData, string $sCustomKey = '') : array
+	private static function DecodeKeyValues(string $sData) : array
 	{
 		$sData = \MailSo\Base\Utils::UrlSafeBase64Decode($sData);
 		if (!\strlen($sData)) {
 			return '';
 		}
-		$sKey = \md5(APP_SALT . $sCustomKey);
+		$sKey = \md5(APP_SALT);
 		$sData = \is_callable('xxtea_decrypt')
 			? \xxtea_decrypt($sData, $sKey)
 			: \MailSo\Base\Xxtea::decrypt($sData, $sKey);