Fix cPanel user initialization

the-djmaze · Nov 24, 2022 · 56fe363 · 56fe363
1 parent 6c8d8d5
commit 56fe363
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
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
@@ -41,15 +41,11 @@ public function __construct(\RainLoop\Actions $oActions)
 			if (\strlen($sList)) {
 				$aList = \SnappyMail\Repository::getEnabledPackagesNames();
 				foreach ($aList as $i => $sName) {
-					$oPlugin = $this->CreatePluginByName($sName);
-					if ($oPlugin) {
-						$oPlugin->Init();
-						$this->aPlugins[] = $oPlugin;
-					} else {
+					if (!$this->loadPlugin($sName)) {
 						unset($aList[$i]);
 					}
 				}
-				$aList = \implode(',', \array_unique($aList));
+				$aList = \implode(',', \array_keys($this->aPlugins));
 				if ($sList != $aList) {
 					$oConfig->Set('plugins', 'enabled_list', $aList);
 					$oConfig->Save();
@@ -58,6 +54,18 @@ public function __construct(\RainLoop\Actions $oActions)
 		}
 	}
 
+	public function loadPlugin(string $sName) : bool
+	{
+		if (!isset($this->aPlugins[$sName])) {
+			$oPlugin = $this->CreatePluginByName($sName);
+			if ($oPlugin) {
+				$oPlugin->Init();
+				$this->aPlugins[$sName] = $oPlugin;
+			}
+		}
+		return isset($this->aPlugins[$sName]);
+	}
+
 	protected static function getPluginPath(string $sName) : ?string
 	{
 		$sPath = APP_PLUGINS_PATH.$sName;

diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
@@ -23,5 +23,11 @@
 		file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
 	}
 
+//	\RainLoop\Api::Actions()->Plugins()->loadPlugin('login-remote');
+	if (!isset($_GET['installed'])) {
+		\header('Location: ?RemoteAutoLogin&installed');
+		exit;
+	}
+
 	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
 }