Mantis#1681. Thank you kindly, Vytek for a patch that:

Adds additional support for llEmail().

3 files changed, 185 insertions, 9 deletions

diff --git a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
index 77b2d29..26174e2 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/EMailModules/EmailModule.cs
@@ -28,12 +28,15 @@
 using System;
 using System.Reflection;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using libsecondlife;
 using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using log4net;
 using Nini.Config;
+using DotNetOpenMail;
+using DotNetOpenMail.SmtpAuth;
 
 namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
 {
@@ -48,6 +51,12 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
         // Module vars
         //
         private IConfigSource m_Config;
+        private string m_HostName = string.Empty;
+        private string m_RegionName = string.Empty;
+        private string SMTP_SERVER_HOSTNAME = string.Empty;
+        private int SMTP_SERVER_PORT = 25;
+        private string SMTP_SERVER_LOGIN = string.Empty;
+        private string SMTP_SERVER_PASSWORD = string.Empty;
 
         // Scenes by Region Handle
         private Dictionary<ulong, Scene> m_Scenes =
@@ -58,11 +67,44 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
         public void Initialise(Scene scene, IConfigSource config)
         {
             m_Config = config;
+            IConfig SMTPConfig;
+            
+            //FIXME: RegionName is correct??
+            //m_RegionName = scene.RegionInfo.RegionName;
 
             IConfig startupConfig = m_Config.Configs["Startup"];
 
-            m_Enabled = (startupConfig.GetString("emailmodule",
-                                                 "DefaultEmailModule") == "DefaultEmailModule");
+            m_Enabled = (startupConfig.GetString("emailmodule", "DefaultEmailModule") == "DefaultEmailModule");
+                        
+            //Load SMTP SERVER config
+            try
+                    {
+                        if ((SMTPConfig = m_Config.Configs["SMTP"]) == null)
+                        {
+                            m_log.InfoFormat("[SMTP] SMTP server not configured");
+                            m_Enabled = false;
+                            return;
+                        }
+                
+                        if (!SMTPConfig.GetBoolean("enabled", false))
+                        {
+                            m_log.InfoFormat("[SMTP] module disabled in configuration");
+                            m_Enabled = false;
+                            return;
+                        }
+                        
+                        m_HostName = SMTPConfig.GetString("host_domain_header_from", m_HostName);
+                        SMTP_SERVER_HOSTNAME = SMTPConfig.GetString("SMTP_SERVER_HOSTNAME",SMTP_SERVER_HOSTNAME);       
+                        SMTP_SERVER_PORT = SMTPConfig.GetInt("SMTP_SERVER_PORT", SMTP_SERVER_PORT);
+                        SMTP_SERVER_LOGIN = SMTPConfig.GetString("SMTP_SERVER_LOGIN", SMTP_SERVER_LOGIN);
+                        SMTP_SERVER_PASSWORD = SMTPConfig.GetString("SMTP_SERVER_PASSWORD", SMTP_SERVER_PASSWORD);
+                    }
+                        catch (Exception e)
+                        {
+                      m_log.Error("[EMAIL] DefaultEmailModule not configured: "+ e.Message);
+                      m_Enabled = false;
+                      return;
+                        }
 
             // It's a go!
             if (m_Enabled)
@@ -82,7 +124,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
                         m_Scenes.Add(scene.RegionInfo.RegionHandle, scene);
                     }
                 }
-
+                                                             
                 m_log.Info("[EMAIL] Activated DefaultEmailModule");
             }
         }
@@ -104,14 +146,143 @@ namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
         {
             get { return true; }
         }
-
-        public void SendEmail(LLUUID objectID, string address, string subject, string body)
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="seconds"></param>
+        private void DelayInSeconds(int seconds)
+                {
+                        TimeSpan DiffDelay = new TimeSpan(0, 0, seconds);
+                        DateTime EndDelay = DateTime.Now.Add(DiffDelay);
+                        while (DateTime.Now < EndDelay)
+                        {       
+                        ;//Do nothing!!
+                        }
+                }
+        
+        private SceneObjectPart findPrim(LLUUID objectID, out string ObjectRegionName)
         {
+            lock (m_Scenes)
+            {
+                foreach (Scene s in m_Scenes.Values)
+                {
+                    SceneObjectPart part = s.GetSceneObjectPart(objectID);
+                    if (part != null)
+                    {
+                        ObjectRegionName = s.RegionInfo.RegionName;
+                        return part;
+                    }
+                }
+            }
+            ObjectRegionName = string.Empty;
+            return null;
         }
 
-        public Email GetNextEmail(LLUUID objectID, string sender, string subject)
+        private void resolveNamePositionRegionName(LLUUID objectID, out string ObjectName, out string ObjectAbsolutePosition, out string ObjectRegionName)
         {
-            return null;
+                string m_ObjectRegionName;
+                SceneObjectPart part = findPrim(objectID, out m_ObjectRegionName);
+            if (part != null)
+            {
+                 ObjectAbsolutePosition = part.AbsolutePosition.ToString();
+                 ObjectName = part.Name;
+                 ObjectRegionName = m_ObjectRegionName; 
+                 return;
+            }
+            ObjectAbsolutePosition = part.AbsolutePosition.ToString();
+            ObjectName = part.Name;
+            ObjectRegionName = m_ObjectRegionName;
+            return;
         }
-    }
+                
+                /// <summary>
+                /// SendMail function utilized by llEMail
+                /// </summary>
+                /// <param name="objectID"></param>
+                /// <param name="address"></param>
+                /// <param name="subject"></param>
+                /// <param name="body"></param>
+                public void SendEmail(LLUUID objectID, string address, string subject, string body)
+                {
+                        //Check if address is empty
+                        if (address == string.Empty) 
+                                return;
+                        
+                        //FIXED:Check the email is correct form in REGEX
+                        string EMailpatternStrict = @"^(([^<>()[\]\\.,;:\s@\""]+" 
+                              + @"(\.[^<>()[\]\\.,;:\s@\""]+)*)|(\"".+\""))@" 
+                              + @"((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" 
+                              + @"\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+" 
+                              + @"[a-zA-Z]{2,}))$";
+                                Regex EMailreStrict = new Regex(EMailpatternStrict);
+                                bool isEMailStrictMatch = EMailreStrict.IsMatch(address);
+                        if (!isEMailStrictMatch)
+                        {
+                                m_log.Error("[EMAIL] REGEX Problem in EMail Address: "+address);
+                                return;
+                        }
+                        //FIXME:Check if subject + body = 4096 Byte
+                        if ((subject.Length + body.Length) > 1024)
+                        {
+                            m_log.Error("[EMAIL] subject + body > 1024 Byte");
+                                return;         
+                        }
+                                                
+                        try
+                        {
+                                        string LastObjectName = string.Empty;
+                                        string LastObjectPosition = string.Empty;
+                                        string LastObjectRegionName = string.Empty;
+                                //DONE: Message as Second Life style
+                                        //20 second delay - AntiSpam System - for now only 10 seconds
+                                        DelayInSeconds(10);
+                                        //Creation EmailMessage
+                                        EmailMessage emailMessage = new EmailMessage();
+                                        //From
+                                        emailMessage.FromAddress = new EmailAddress(objectID.UUID.ToString()+"@"+m_HostName);
+                                        //To - Only One
+                                        emailMessage.AddToAddress(new EmailAddress(address));   
+                                        //Subject
+                                        emailMessage.Subject = subject;
+                                        //TEXT Body
+                                        resolveNamePositionRegionName(objectID, out LastObjectName, out LastObjectPosition, out LastObjectRegionName);
+                                        emailMessage.TextPart = new TextAttachment("Object-Name: " + LastObjectName +
+                                        "\r\nRegion: " + LastObjectRegionName + "\r\nLocal-Position: " +
+                                        LastObjectPosition+"\r\n\r\n\r\n" + body);                              
+                                        //HTML Body
+                                        emailMessage.HtmlPart = new HtmlAttachment("<html><body><p>" + 
+                                "<BR>Object-Name: " + LastObjectName +
+                                "<BR>Region: " + LastObjectRegionName +
+                                "<BR>Local-Position: " + LastObjectPosition + "<BR><BR><BR>"
+                                                +body+"\r\n</p></body><html>");
+                                        
+                                        //Set SMTP SERVER config
+                                        SmtpServer smtpServer=new SmtpServer(SMTP_SERVER_HOSTNAME,SMTP_SERVER_PORT);
+                                        //Authentication
+                                        smtpServer.SmtpAuthToken=new SmtpAuthToken(SMTP_SERVER_LOGIN, SMTP_SERVER_PASSWORD);
+                                        //Send Email Message
+                                        emailMessage.Send(smtpServer);
+                                        //Log
+                                        m_log.Info("[EMAIL] EMail sent to: " + address + " from object: " + objectID.UUID.ToString());
+                        }
+                        catch (Exception e)
+                    {
+                                m_log.Error("[EMAIL] DefaultEmailModule Exception: "+e.Message);
+                                return;
+                        }
+                        }
+                        
+                /// <summary>
+                /// 
+                /// </summary>
+                /// <param name="objectID"></param>
+                /// <param name="sender"></param>
+                /// <param name="subject"></param>
+                /// <returns></returns>
+                public Email GetNextEmail(LLUUID objectID, string sender, string subject)
+                {
+                    return null;
+                }
+            }
 }
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 53d1209..4fc4608 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2222,7 +2222,11 @@ namespace OpenSim.Region.ScriptEngine.Common
         public void llEmail(string address, string subject, string message)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llEmail");
+            IEmailModule emailModule = m_ScriptEngine.World.RequestModuleInterface<IEmailModule>();
+            if (emailModule == null)
+                return;
+
+            emailModule.SendEmail(m_host.UUID, address, subject, message);
         }
 
         public void llGetNextEmail(string address, string subject)
diff --git a/prebuild.xml b/prebuild.xml
index 7e5bd5b..e66f470 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -783,6 +783,7 @@
       <Reference name="OpenSim.Data.Base"/>
       <Reference name="Nini.dll" />
       <Reference name="log4net.dll"/>
+      <Reference name="DotNetOpenMail.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>