Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-08 22:18:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix cPanel user initialization

Browse source
This commit is contained in:
the-djmaze 2022-11-24 15:36:02 +01:00
parent 6c8d8d597b
commit 56fe3637f3
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
View file

@ -41,15 +41,11 @@ class Manager
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 @@ class Manager
}
}
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;

6
snappymail/v/0.0.0/cpanel.php
View file

@ -23,5 +23,11 @@ if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGIN
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;
}