From a1ad4a8f274da646ec708d8da92bc3ccfdfde4b9 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 4 Mar 2021 12:15:11 +0100
Subject: [PATCH] Improve plugin Description/README functionality

---
 plugins/add-x-originating-ip-header/README                    | 1 -
 plugins/black-list/README                                     | 1 -
 plugins/custom-login-mapping/README                           | 1 -
 plugins/custom-system-folders/README                          | 1 -
 plugins/custom-system-folders/index.php                       | 2 +-
 plugins/override-smtp-credentials/README                      | 1 -
 plugins/snowfall-on-login-screen/README                       | 1 -
 plugins/white-list/README                                     | 1 -
 .../v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php | 4 ++--
 9 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 plugins/add-x-originating-ip-header/README
 delete mode 100644 plugins/black-list/README
 delete mode 100644 plugins/custom-login-mapping/README
 delete mode 100644 plugins/custom-system-folders/README
 delete mode 100644 plugins/override-smtp-credentials/README
 delete mode 100644 plugins/snowfall-on-login-screen/README
 delete mode 100644 plugins/white-list/README

diff --git a/plugins/add-x-originating-ip-header/README b/plugins/add-x-originating-ip-header/README
deleted file mode 100644
index 4dfe7fc72..000000000
--- a/plugins/add-x-originating-ip-header/README
+++ /dev/null
@@ -1 +0,0 @@
-Adds X-Originating-IP header to outgoing message, containing sender's IP address.
\ No newline at end of file
diff --git a/plugins/black-list/README b/plugins/black-list/README
deleted file mode 100644
index 86ca74eb9..000000000
--- a/plugins/black-list/README
+++ /dev/null
@@ -1 +0,0 @@
-Simple black list plugin
\ No newline at end of file
diff --git a/plugins/custom-login-mapping/README b/plugins/custom-login-mapping/README
deleted file mode 100644
index 39aafa739..000000000
--- a/plugins/custom-login-mapping/README
+++ /dev/null
@@ -1 +0,0 @@
-Plugin which allows you to set up custom username (login) by email address
\ No newline at end of file
diff --git a/plugins/custom-system-folders/README b/plugins/custom-system-folders/README
deleted file mode 100644
index 38b29fe96..000000000
--- a/plugins/custom-system-folders/README
+++ /dev/null
@@ -1 +0,0 @@
-custom-sytem-folders
\ No newline at end of file
diff --git a/plugins/custom-system-folders/index.php b/plugins/custom-system-folders/index.php
index 53e3152de..269785413 100644
--- a/plugins/custom-system-folders/index.php
+++ b/plugins/custom-system-folders/index.php
@@ -5,7 +5,7 @@ class CustomSystemFoldersPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME     = '',
 		CATEGORY = 'General',
-		DESCRIPTION = '';
+		DESCRIPTION = 'Set custom sytem folders';
 
 	/**
 	 * @var string
diff --git a/plugins/override-smtp-credentials/README b/plugins/override-smtp-credentials/README
deleted file mode 100644
index 291c3e8d3..000000000
--- a/plugins/override-smtp-credentials/README
+++ /dev/null
@@ -1 +0,0 @@
-Plugin which allows you to override smtp credentials specified users.
\ No newline at end of file
diff --git a/plugins/snowfall-on-login-screen/README b/plugins/snowfall-on-login-screen/README
deleted file mode 100644
index 86af64815..000000000
--- a/plugins/snowfall-on-login-screen/README
+++ /dev/null
@@ -1 +0,0 @@
-Add snowfall to your login screen :)
\ No newline at end of file
diff --git a/plugins/white-list/README b/plugins/white-list/README
deleted file mode 100644
index 64fb7dc2a..000000000
--- a/plugins/white-list/README
+++ /dev/null
@@ -1 +0,0 @@
-Simple white list plugin
\ No newline at end of file
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
index d53e3427b..3960f7f63 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
@@ -72,8 +72,8 @@ abstract class AbstractPlugin
 
 	public function Description() : string
 	{
-		return static::DESCRIPTION;
-//		file_exists($oPlugin->Path().'/README') ? file_get_contents($oPlugin->Path().'/README') : ''
+		$sFile = $this->Path().'/README';
+		return \is_readable($sFile) ? \file_get_contents($sFile) : static::DESCRIPTION;
 	}
 
 	public function UseLangs(?bool $bLangs = null) : bool