Changeset 1278

Timestamp:

1/31/2010 4:04:30 AM (7 weeks ago)

Author:

vessper

Message:

31/01/2010 (1.14.0.1278)

---

- Core: EveMail? class changed from a static class

Location:

trunk

Files:

• EveHQ.Core/EveMail.vb (modified) (7 diffs)
• EveHQ/Forms/frmEveHQ.vb (modified) (1 diff)
• EveHQ/Forms/frmMail.vb (modified) (1 diff)

trunk/EveHQ.Core/EveMail.vb

@@ -5 +5 @@
 Public Class EveMail
 
-    Shared MailTimeFormat As String = "yyyy-MM-dd HH:mm:ss"
-    Shared culture As System.Globalization.CultureInfo = New System.Globalization.CultureInfo("en-GB")
-
-    Public Shared Sub GetEveMail()
+    Dim MailTimeFormat As String = "yyyy-MM-dd HH:mm:ss"
+    Dim culture As System.Globalization.CultureInfo = New System.Globalization.CultureInfo("en-GB")
+
+    Public Sub GetMail()
+        Call Me.GetEveMail()
+        Call Me.GetNotifications()
+    End Sub
+
+    Private Sub GetEveMail()
         ' Stage 1: Download the latest EveMail API using the standard API method
         ' Stage 2: Populate the class with our EveMail
@@ -143 +148 @@
         ' Send E-mail notification of new mails if required
         If EveHQ.Core.HQ.EveHQSettings.NotifyEveMail = True And NewMails.Count > 0 Then
-            Call EveMail.SendEmailForNewEveMails(NewMails, IDs)
+            Call SendEmailForNewEveMails(NewMails, IDs)
         End If
 
@@ -152 +157 @@
     End Sub
 
-    Public Shared Sub GetNotifications()
+    Private Sub GetNotifications()
         ' Stage 1: Download the latest EveNotifications API using the standard API method
         ' Stage 2: Populate the class with our Eve Notifications
@@ -271 +276 @@
         ' Send E-mail notification of new mails if required
         If EveHQ.Core.HQ.EveHQSettings.NotifyEveMail = True And newNotifys.Count > 0 Then
-            Call EveMail.SendEmailForNewEveNotifications(newNotifys, IDs)
+            Call SendEmailForNewEveNotifications(newNotifys, IDs)
         End If
 
@@ -281 +286 @@
     End Sub
 
-    Private Shared Sub SendEmailForNewEveMails(ByVal NewMails As ArrayList, ByVal IDs As ArrayList)
+    Private Sub SendEmailForNewEveMails(ByVal NewMails As ArrayList, ByVal IDs As ArrayList)
         ' Get the name data from the DB
         Dim strID As New StringBuilder
@@ -330 +335 @@
                 End If
             Next
-            EveMail.SendEveHQMail("New Eve Mail Messages Notification", strBody.ToString)
+            Call SendEveHQMail("New Eve Mail Messages Notification", strBody.ToString)
         End If
     End Sub
 
-    Private Shared Sub SendEmailForNewEveNotifications(ByVal NewNotifys As ArrayList, ByVal IDs As ArrayList)
+    Private Sub SendEmailForNewEveNotifications(ByVal NewNotifys As ArrayList, ByVal IDs As ArrayList)
         ' Get the name data from the DB
         Dim strID As New StringBuilder
@@ -368 +373 @@
             MessageCount += 1
         Next
-        EveMail.SendEveHQMail("New Eve Notification Messages Notification", strBody.ToString)
+        Call SendEveHQMail("New Eve Notification Messages Notification", strBody.ToString)
     End Sub
 
-    Private Shared Sub SendEveHQMail(ByVal mailSubject As String, ByVal mailText As String)
+    Private Sub SendEveHQMail(ByVal mailSubject As String, ByVal mailText As String)
         Dim eveHQMail As New System.Net.Mail.SmtpClient
         Try

trunk/EveHQ/Forms/frmEveHQ.vb

@@ -2721 +2721 @@
 
         ' Call the main routines!
-        Call EveHQ.Core.EveMail.GetEveMail()
-        Call EveHQ.Core.EveMail.GetNotifications()
+        Dim myMail As New EveHQ.Core.EveMail
+        Call myMail.GetMail()
 
         ' Update the display with EveMail

trunk/EveHQ/Forms/frmMail.vb

@@ -79 +79 @@
         Me.Cursor = Cursors.WaitCursor
 
-        Call EveHQ.Core.EveMail.GetEveMail()
-        Call EveHQ.Core.EveMail.GetNotifications()
+        Dim myMail As New EveHQ.Core.EveMail
+        Call myMail.GetMail()
 
         ' Update the display with EveMail