Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-06-27 00:36:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix: plugin "readme" failed

Browse source 
Removed: plugin PreInit
This commit is contained in:
djmaze 2021-03-04 11:55:42 +01:00
parent 93b1159a50
commit 46ff83c41d
3 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
View file

@ -877,7 +877,7 @@ trait Admin
{
$mResult = array(
'Name' => $sName,
'Readme' => file_exists($oPlugin->Path().'/README') ? file_get_contents($oPlugin->Path().'/README') : '',
'Readme' => $oPlugin->Description(),
'Config' => array()
);

11
snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
View file

@ -70,6 +70,12 @@ abstract class AbstractPlugin
return $this->sName;
}
public function Description() : string
{
return static::DESCRIPTION;
// file_exists($oPlugin->Path().'/README') ? file_get_contents($oPlugin->Path().'/README') : ''
}
public function UseLangs(?bool $bLangs = null) : bool
{
if (null !== $bLangs)
@ -146,11 +152,6 @@ abstract class AbstractPlugin
return $this;
}
public function PreInit() : void
{
}
public function Init() : void
{

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

@ -96,7 +96,6 @@ class Manager
$oPlugin = $this->CreatePluginByName($sName);
if ($oPlugin)
{
$oPlugin->PreInit();
$oPlugin->Init();
$this->aPlugins[] = $oPlugin;
@ -136,15 +135,13 @@ class Manager
{
foreach ($aGlob as $sPathName)
{
try {
$sName = \basename($sPathName);
$sClassName = $this->loadPluginByName($sName);
$sName = \basename($sPathName);
$sClassName = $this->loadPluginByName($sName);
if ($sClassName) {
$aList[] = array(
$sName,
$sClassName::VERSION
);
} catch (\Throwable $e) {
\error_log($e->getMessage() . "\n\t{$sPathName}");
}
}
}
@ -168,19 +165,16 @@ class Manager
public function loadPluginByName(string $sName) : ?string
{
if (\preg_match('/^[a-z0-9\-]+$/', $sName)
&& \file_exists(APP_PLUGINS_PATH.$sName.'/index.php'))
&& \is_readable(APP_PLUGINS_PATH.$sName.'/index.php'))
{
$sClassName = $this->convertPluginFolderNameToClassName($sName);
if (!\class_exists($sClassName)) {
include APP_PLUGINS_PATH.$sName.'/index.php';
include_once APP_PLUGINS_PATH.$sName.'/index.php';
}
if (\class_exists($sClassName) && \is_subclass_of($sClassName, 'RainLoop\\Plugins\\AbstractPlugin')) {
return $sClassName;
}
else
{
\trigger_error("Invalid plugin class {$sClassName}");
}
\trigger_error("Invalid plugin class {$sClassName}");
}
return null;
@ -222,7 +216,7 @@ class Manager
$aJs = $bAdminScope ? $this->aAdminJs : $this->aJs;
foreach ($aJs as $sFile)
{
if (\file_exists($sFile))
if (\is_readable($sFile))
{
$aResult[] = \file_get_contents($sFile);
}
@ -247,7 +241,7 @@ class Manager
$aTemplates = $bAdminScope ? $this->aAdminTemplates : $this->aTemplates;
foreach ($aTemplates as $sFile)
{
if (\file_exists($sFile))
if (\is_readable($sFile))
{
$sTemplateName = \substr(\basename($sFile), 0, -5);
$aList[$sTemplateName] = $sFile;