From e15a8926cf6cf525998cd097a9bfca0f26b7728b Mon Sep 17 00:00:00 2001
From: Adrian Gallagher <thrasher@addictionsoftware.com>
Date: Fri, 27 Nov 2015 19:17:24 +1100
Subject: [PATCH] Adjusted SMS global logic in main.go

---
 config.go | 31 +++++++++++++------------------
 main.go   | 18 ++++++++++--------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/config.go b/config.go
index 45808f53..3f4eb1a2 100644
--- a/config.go
+++ b/config.go
@@ -101,26 +101,21 @@ func UpdateExchangeConfig(e Exchanges) error {
 }
 
 func CheckSMSGlobalConfigValues() error {
-	if bot.config.SMS.Enabled {
-		if bot.config.SMS.Username == "" || bot.config.SMS.Username == "Username" || bot.config.SMS.Password == "" || bot.config.SMS.Password == "Password" {
-			bot.config.SMS.Enabled = false
-			return errors.New(WarningSMSGlobalDefaultOrEmptyValues)
-		}
-		contacts := 0
-		for i := range bot.config.SMS.Contacts {
-			if bot.config.SMS.Contacts[i].Enabled {
-				if bot.config.SMS.Contacts[i].Name == "" || bot.config.SMS.Contacts[i].Number == "" || (bot.config.SMS.Contacts[i].Name == "Bob" && bot.config.SMS.Contacts[i].Number == "12345") {
-					log.Printf(WarningSSMSGlobalSMSContactDefaultOrEmptyValues, i)
-					bot.config.SMS.Contacts[i].Enabled = false
-					continue
-				}
-				contacts++
+	if bot.config.SMS.Username == "" || bot.config.SMS.Username == "Username" || bot.config.SMS.Password == "" || bot.config.SMS.Password == "Password" {
+		return errors.New(WarningSMSGlobalDefaultOrEmptyValues)
+	}
+	contacts := 0
+	for i := range bot.config.SMS.Contacts {
+		if bot.config.SMS.Contacts[i].Enabled {
+			if bot.config.SMS.Contacts[i].Name == "" || bot.config.SMS.Contacts[i].Number == "" || (bot.config.SMS.Contacts[i].Name == "Bob" && bot.config.SMS.Contacts[i].Number == "12345") {
+				log.Printf(WarningSSMSGlobalSMSContactDefaultOrEmptyValues, i)
+				continue
 			}
+			contacts++
 		}
-		if contacts == 0 {
-			bot.config.SMS.Enabled = false
-			return errors.New(WarningSSMSGlobalSMSNoContacts)
-		}
+	}
+	if contacts == 0 {
+		return errors.New(WarningSSMSGlobalSMSNoContacts)
 	}
 	return nil
 }
diff --git a/main.go b/main.go
index 64fe6469..5d3f491f 100644
--- a/main.go
+++ b/main.go
@@ -56,16 +56,18 @@ func main() {
 		return
 	}
 
-	err = CheckSMSGlobalConfigValues()
-	if err != nil {
-		// non fatal event
-		log.Println(err)
-	}
-
 	log.Printf("Bot '%s' started.\n", bot.config.Name)
+
 	if bot.config.SMS.Enabled {
-		log.Printf("SMS support enabled. Number of SMS contacts %d.\n", GetEnabledSMSContacts())
-	} else {
+		err = CheckSMSGlobalConfigValues()
+		if err != nil {
+			log.Println(err) // non fatal event
+			bot.config.SMS.Enabled = false
+		} else {
+			log.Printf("SMS support enabled. Number of SMS contacts %d.\n", GetEnabledSMSContacts())
+		}
+	}
+	if !bot.config.SMS.Enabled {
 		log.Println("SMS support disabled.")
 	}