From b926a26dc839e32f799a604b54b2452e15d9f86f Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 11 May 2022 23:14:12 +0200
Subject: [PATCH] Small cleanups

---
 plugins/ldap-contacts-suggestions/index.php   |  1 +
 .../libraries/RainLoop/Config/Application.php | 24 +++++++++----------
 .../app/libraries/RainLoop/ServiceActions.php |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/ldap-contacts-suggestions/index.php b/plugins/ldap-contacts-suggestions/index.php
index 9f7be9e2f..702a753c7 100644
--- a/plugins/ldap-contacts-suggestions/index.php
+++ b/plugins/ldap-contacts-suggestions/index.php
@@ -5,6 +5,7 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME = 'Contacts suggestions (LDAP)',
 		VERSION = '2.9',
+		RELEASE  = '2022-05-05',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'Get contacts suggestions from LDAP.',
 		REQUIRED = '2.9.1';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 5e8de360d..36a508409 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -127,7 +127,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 				'title'                       => array('SnappyMail Webmail', 'Text displayed as page title'),
 				'loading_description'         => array('SnappyMail', 'Text displayed on startup'),
-				'favicon_url'                 => array('', ''),
+				'favicon_url'                 => array(''),
 				'app_path'                    => array(''),
 
 				'theme'                       => array('Default', 'Theme used by default'),
@@ -138,8 +138,8 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'language_admin'              => array('en', 'Admin Panel interface language'),
 				'allow_languages_on_settings' => array(true, 'Allow language selection on settings screen'),
 
-				'allow_additional_accounts'   => array(true, ''),
-				'allow_additional_identities' => array(true, ''),
+				'allow_additional_accounts'   => array(true),
+				'allow_additional_identities' => array(true),
 
 				'messages_per_page'           => array(20, 'Number of messages displayed on page by default'),
 				'message_read_delay'          => array(5, 'Mark message read after N seconds'),
@@ -149,7 +149,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 			),
 
 			'interface' => array(
-				'show_attachment_thumbnail' => array(true, ''),
+				'show_attachment_thumbnail' => array(true),
 				'new_move_to_folder_button' => array(true)
 			),
 
@@ -157,10 +157,10 @@ class Application extends \RainLoop\Config\AbstractConfig
 				'enable'            => array(false, 'Enable contacts'),
 				'allow_sync'        => array(false),
 				'sync_interval'     => array(20),
-				'type'              => array('sqlite', ''),
-				'pdo_dsn'           => array('host=127.0.0.1;port=3306;dbname=snappymail', ''),
-				'pdo_user'          => array('root', ''),
-				'pdo_password'      => array('', ''),
+				'type'              => array('sqlite'),
+				'pdo_dsn'           => array('host=127.0.0.1;port=3306;dbname=snappymail'),
+				'pdo_user'          => array('root'),
+				'pdo_password'      => array(''),
 				'suggestions_limit' => array(30)
 			),
 
@@ -218,17 +218,17 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 			'login' => array(
 
-				'default_domain' => array('', ''),
+				'default_domain' => array(''),
 
 				'allow_languages_on_login' => array(true,
 					'Allow language selection on webmail login screen'),
 
-				'determine_user_language' => array(true, ''),
-				'determine_user_domain' => array(false, ''),
+				'determine_user_language' => array(true),
+				'determine_user_domain' => array(false),
 
 				'hide_submit_button' => array(false),
 
-				'login_lowercase' => array(true, ''),
+				'login_lowercase' => array(true),
 
 				'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF,
 					'This option allows webmail to remember the logged in user
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 2e01361f9..1dd9e772f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -172,7 +172,7 @@ class ServiceActions
 		{
 			\SnappyMail\Log::warning('SERVICE', $oException->getMessage());
 			if ($e = $oException->getPrevious()) {
-				\SnappyMail\Log::warning('SERVICE', "\t{$e->getMessage()} @ {$e->getFile()}#{$e->getLine()}");
+				\SnappyMail\Log::warning('SERVICE', "- {$e->getMessage()} @ {$e->getFile()}#{$e->getLine()}");
 			}
 
 			$aResponseItem = $this->oActions->ExceptionResponse(