From 5fbca6fe4806e8a5e1f4ebff11646ba4944cde6c Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 11 Oct 2022 23:59:32 +0200
Subject: [PATCH] centralize some code to
 \SnappyMail\Repository::getEnabledPackagesNames()

---
 .../v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php   |  4 +---
 .../0.0.0/app/libraries/RainLoop/Plugins/Manager.php  |  2 +-
 .../v/0.0.0/app/libraries/snappymail/repository.php   | 11 ++++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index bb727987a..6e9f237df 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -704,9 +704,7 @@ class ActionsAdmin extends Actions
 
 		$oConfig = $this->Config();
 
-		$sEnabledPlugins = $oConfig->Get('plugins', 'enabled_list', '');
-		$aEnabledPlugins = \explode(',', \strtolower($sEnabledPlugins));
-		$aEnabledPlugins = \array_map('trim', $aEnabledPlugins);
+		$aEnabledPlugins = \SnappyMail\Repository::getEnabledPackagesNames();
 
 		$aNewEnabledPlugins = array();
 		if ($bEnable)
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 076ffe85d..12c06c309 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
@@ -39,7 +39,7 @@ class Manager
 		if ($this->bIsEnabled) {
 			$sList = $oConfig->Get('plugins', 'enabled_list', '');
 			if (\strlen($sList)) {
-				$aList = \array_map('trim', \explode(',', $sList));
+				$aList = \SnappyMail\Repository::getEnabledPackagesNames();
 				foreach ($aList as $i => $sName) {
 					$oPlugin = $this->CreatePluginByName($sName);
 					if ($oPlugin) {
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 5a259d160..a701fa334 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
@@ -177,6 +177,13 @@ abstract class Repository
 			&& \RainLoop\Api::Config()->Get('admin_panel', 'allow_update', false);
 	}
 
+	public static function getEnabledPackagesNames() : array
+	{
+		return \array_map('trim',
+			\explode(',', \strtolower(\RainLoop\Api::Config()->Get('plugins', 'enabled_list', '')))
+		);
+	}
+
 	public static function getPackagesList() : array
 	{
 		empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']) && \RainLoop\Api::Actions()->IsAdminLoggined();
@@ -185,9 +192,7 @@ abstract class Repository
 		$sError = '';
 		$aList = static::getRepositoryData($bReal, $sError);
 
-		$aEnabledPlugins = \array_map('trim',
-			\explode(',', \strtolower(\RainLoop\Api::Config()->Get('plugins', 'enabled_list', '')))
-		);
+		$aEnabledPlugins = static::getEnabledPackagesNames();
 
 		$aInstalled = \RainLoop\Api::Actions()->Plugins()->InstalledPlugins();
 		foreach ($aInstalled as $aItem) {