From d98e706e26b302b9231ced82c7e452499db35736 Mon Sep 17 00:00:00 2001
From: Christopher <git@clatza.dev>
Date: Wed, 1 Jul 2020 18:45:41 +0200
Subject: [PATCH] add some debug

---
 src/MailKitMailModule.cs | 56 +++++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/src/MailKitMailModule.cs b/src/MailKitMailModule.cs
index cad3943..798ddd2 100644
--- a/src/MailKitMailModule.cs
+++ b/src/MailKitMailModule.cs
@@ -37,6 +37,8 @@ namespace OpenSim.Modules.EMail
 
         private List<InternalMail> m_messages = new List<InternalMail>();
 
+        private bool m_debug = false;
+
         private String SMTP_SERVER_HOSTNAME = null;
         private String SMTP_SERVER_LOGIN = null;
         private String SMTP_SERVER_PASSWORD = null;
@@ -102,6 +104,8 @@ namespace OpenSim.Modules.EMail
             if (source.Configs["Mail"] == null)
                 return;
 
+            m_debug = m_config.Configs["Mail"].GetBoolean("DEBUG", m_debug);
+
             SMTP_SERVER_HOSTNAME = m_config.Configs["Mail"].GetString("SMTP_SERVER_HOSTNAME", String.Empty);
             SMTP_SERVER_PORT = m_config.Configs["Mail"].GetInt("SMTP_SERVER_PORT", 25);
             SMTP_SERVER_SSL = m_config.Configs["Mail"].GetBoolean("SMTP_SERVER_SSL", false);
@@ -135,7 +139,8 @@ namespace OpenSim.Modules.EMail
         {
             try
             {
-                m_log.Info("[" + Name + "] checkForMails");
+                if(m_debug)
+                    m_log.Info("[" + Name + "] checkForMails");
 
                 using (var client = new ImapClient())
                 {
@@ -177,8 +182,12 @@ namespace OpenSim.Modules.EMail
                         {
                             try
                             {
-                                m_log.Info("[" + Name + "] Message To: " + adress.Address);
-                                m_log.Info("[" + Name + "] Objekt ID: " + adress.Address.Split('@')[0]);
+                                if (m_debug)
+                                {
+                                    m_log.Info("[" + Name + "] Message To: " + adress.Address);
+                                    m_log.Info("[" + Name + "] Objekt ID: " + adress.Address.Split('@')[0]);
+                                }
+
 
                                 String UUIDString = adress.Address.Split('@')[0].Trim();
 
@@ -191,7 +200,9 @@ namespace OpenSim.Modules.EMail
                                     {
                                         m_messages.Add(new InternalMail(message, objID));
                                         IMAPInbox.SetFlags(i, MessageFlags.Deleted, true);
-                                        m_log.Info("[" + Name + "] Get Message for objekt " + sceneObject.Name + " (" + sceneObject.UUID + ")");
+
+                                        if (m_debug)
+                                            m_log.Info("[" + Name + "] Get Message for objekt " + sceneObject.Name + " (" + sceneObject.UUID + ")");
                                     }
                                 }
                                 else
@@ -266,26 +277,41 @@ namespace OpenSim.Modules.EMail
 
                 if(messages[0] != null)
                 {
-                    Email lslMessage = new Email();
+                    if(messages[0].Mail != null)
+                    {
+                        Email lslMessage = new Email();
+
+                        lslMessage.time = DateTime.Now.ToShortTimeString();
+                        lslMessage.message = messages[0].Mail.TextBody.ToString();
+                        lslMessage.sender = messages[0].Mail.Sender.GetAddress(true);
+                        lslMessage.subject = messages[0].Mail.Subject;
+                        lslMessage.numLeft = messages.Count - 1;
+
+                        m_messages.Remove(messages[0]);
+                        return lslMessage;
+                    }
+                    else
+                    {
+                        if (m_debug)
+                            m_log.Error("[" + Name + "] Cant find mail data!");
+
+                        return null;
+                    }
 
-                    lslMessage.time = messages[0].Mail.Date.ToUnixTimeSeconds().ToString();
-                    lslMessage.message = messages[0].Mail.TextBody.ToString();
-                    lslMessage.sender = messages[0].Mail.Sender.GetAddress(true);
-                    lslMessage.subject = messages[0].Mail.Subject;
-                    lslMessage.numLeft = messages.Count - 1;
-                    
-                    m_messages.Remove(messages[0]);
-                    return lslMessage;
                 }
                 else
                 {
-                    m_log.Error("[" + Name + "] Cant find caller objekt!");
+                    if (m_debug)
+                        m_log.Error("[" + Name + "] Cant find caller objekt!");
+
                     return null;
                 }
             }
             else
             {
-                m_log.Error("[" + Name + "] Cant find caller objekt!");
+                if (m_debug)
+                    m_log.Error("[" + Name + "] Cant find caller objekt!");
+
                 return null;
             }
         }