From 04a66b2c9c0f1bee082aeac1adff8b9e15b0a0d9 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Wed, 25 May 2016 19:55:54 +0200
Subject: [PATCH] Updated ofunctions

---
 dev/debug_obackup.sh | 129 ++++++++++++++++++++++++++++++++++---------
 obackup.sh           | 129 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 208 insertions(+), 50 deletions(-)

diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh
index f36dbe4..2ab2770 100755
--- a/dev/debug_obackup.sh
+++ b/dev/debug_obackup.sh
@@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
 PROGRAM_BUILD=2016041201
 IS_STABLE=no
 
-## FUNC_BUILD=2016041402
+## FUNC_BUILD=2016052502
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -181,7 +181,7 @@ function KillChilds {
 	fi
 }
 
-# Script specific email alert function, please use SendEmail function for generic sends
+# osync/obackup/pmocr script specific mail alert function, use SendEmail function for generic mail sending
 function SendAlert {
 	__CheckArguments 0 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
@@ -189,12 +189,16 @@ function SendAlert {
 	local attachment_command=
 	local subject=
 
+	# Windows specific settings
+	local encryption_string=
+	local auth_string=
+
 	if [ "$DESTINATION_MAILS" == "" ]; then
 		return 0
 	fi
 
 	if [ "$_DEBUG" == "yes" ]; then
-		Logger "Debug mode, no warning email will be sent." "NOTICE"
+		Logger "Debug mode, no warning mail will be sent." "NOTICE"
 		return 0
 	fi
 
@@ -227,7 +231,7 @@ function SendAlert {
 	if type mutt > /dev/null 2>&1 ; then
 		echo "$MAIL_ALERT_MSG" | $(type -p mutt) -x -s "$subject" $DESTINATION_MAILS $attachment_command
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mutt) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p mutt) !!!" "WARN"
 		else
 			Logger "Sent alert mail using mutt." "NOTICE"
 			return 0
@@ -244,10 +248,10 @@ function SendAlert {
 		fi
 		echo "$MAIL_ALERT_MSG" | $(type -p mail) $attachment_command -s "$subject" $DESTINATION_MAILS
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mail) with attachments !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p mail) with attachments !!!" "WARN"
 			echo "$MAIL_ALERT_MSG" | $(type -p mail) -s "$subject" $DESTINATION_MAILS
 			if [ $? != 0 ]; then
-				Logger "Cannot send alert email via $(type -p mail) without attachments !!!" "WARN"
+				Logger "Cannot send alert mail via $(type -p mail) without attachments !!!" "WARN"
 			else
 				Logger "Sent alert mail using mail command without attachment." "NOTICE"
 				return 0
@@ -261,22 +265,46 @@ function SendAlert {
 	if type sendmail > /dev/null 2>&1 ; then
 		echo -e "Subject:$subject\r\n$MAIL_ALERT_MSG" | $(type -p sendmail) $DESTINATION_MAILS
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendmail) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p sendmail) !!!" "WARN"
 		else
 			Logger "Sent alert mail using sendmail command without attachment." "NOTICE"
 			return 0
 		fi
 	fi
 
+	# Windows specific
+        if type "mailsend.exe" > /dev/null 2>&1 ; then
+
+		if [ "$SMTP_ENCRYPTION" != "tls" ] && [ "$SMTP_ENCRYPTION" != "ssl" ]  && [ "$SMTP_ENCRYPTION" != "none" ]; then
+			Logger "Bogus smtp encryption, assuming none." "WARN"
+			encryption_string=
+		elif [ "$SMTP_ENCRYPTION" == "tls" ]; then
+			encryption_string=-starttls
+		elif [ "$SMTP_ENCRYPTION" == "ssl" ]:; then
+			encryption_string=-ssl
+		fi
+		if [ "$SMTP_USER" != "" ] && [ "$SMTP_USER" != "" ]; then
+			auth_string="-auth -user \"$SMTP_USER\" -pass \"$SMTP_PASSWORD\""
+		fi
+                $(type mailsend.exe) -f $SENDER_MAIL -t "$DESTINATION_MAILS" -sub "$subject" -M "$MAIL_ALERT_MSG" -attach "$attachment" -smtp "$SMTP_SERVER" -port "$SMTP_PORT" $encryption_string $auth_string
+                if [ $? != 0 ]; then
+                        Logger "Cannot send mail via $(type mailsend.exe) !!!" "WARN"
+                else
+                        Logger "Sent mail using mailsend.exe command with attachment." "NOTICE"
+                        return 0
+                fi
+        fi
+
+	# Windows specific, kept for compatibility (sendemail from http://caspian.dotconf.net/menu/Software/SendEmail/)
 	if type sendemail > /dev/null 2>&1 ; then
 		if [ "$SMTP_USER" != "" ] && [ "$SMTP_PASSWORD" != "" ]; then
 			SMTP_OPTIONS="-xu $SMTP_USER -xp $SMTP_PASSWORD"
 		else
 			SMTP_OPTIONS=""
 		fi
-		$(type -p sendemail) -f $SENDER_MAIL -t $DESTINATION_MAILS -u "$subject" -m "$MAIL_ALERT_MSG" -s $SMTP_SERVER $SMTP_OPTIONS > /dev/null 2>&1
+		$(type -p sendemail) -f $SENDER_MAIL -t "$DESTINATION_MAILS" -u "$subject" -m "$MAIL_ALERT_MSG" -s $SMTP_SERVER $SMTP_OPTIONS > /dev/null 2>&1
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendemail) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p sendemail) !!!" "WARN"
 		else
 			Logger "Sent alert mail using sendemail command without attachment." "NOTICE"
 			return 0
@@ -287,7 +315,7 @@ function SendAlert {
 	if [ -f /usr/local/bin/mail.php ]; then
 		echo "$MAIL_ALERT_MSG" | /usr/local/bin/mail.php -s="$subject"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
+			Logger "Cannot send alert mail via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
 		else
 			Logger "Sent alert mail using pfSense mail.php." "NOTICE"
 			return 0
@@ -295,7 +323,7 @@ function SendAlert {
 	fi
 
 	# If function has not returned 0 yet, assume it's critical that no alert can be sent
-	Logger "Cannot send alert (neither mutt, mail, sendmail, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
+	Logger "Cannot send alert (neither mutt, mail, sendmail, mailsend, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
@@ -303,19 +331,36 @@ function SendAlert {
 	fi
 }
 
-# Generic email sending function. Usage:
-# SendEmail "subject" "Body text" "receiver@email.fr receiver2@otheremail.fr" "/path/to/attachment.file"
+# Generic email sending function.
+# Usage (linux / BSD), attachment is optional, can be "/path/to/my.file" or ""
+# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file"
+# Usage (Windows, make sure you have mailsend.exe in executable path, see http://github.com/muquit/mailsend)
+# attachment is optional but must be in windows format like "c:\\some\path\\my.file", or ""
+# smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587)
+# encryption can be set to tls, ssl or none
+# smtp_user and smtp_password are optional
+# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encrpytion" "smtp_user" "smtp_password"
 function SendEmail {
 	local subject="${1}"
 	local message="${2}"
 	local destination_mails="${3}"
-	local attachment="{$4}"
+	local attachment="${4}"
+	local sender_email="${5}"
+	local smtp_server="${6}"
+	local smtp_port="${7}"
+	local encrpytion="${8}"
+	local smtp_user="${9}"
+	local smtp_password="${10}"
 
+	# CheckArguments will report a warning that can be ignored if used in Windows with paranoia debug enabled
 	__CheckArguments 4 $# ${FUNCNAME[0]} "$@"	#__WITH_PARANOIA_DEBUG
 
 	local mail_no_attachment=
 	local attachment_command=
 
+	local encryption_string=
+	local auth_string=
+
 	if [ ! -f "$attachment" ]; then
 		attachment_command="-a $ALERT_LOG_FILE"
 		mail_no_attachment=1
@@ -326,9 +371,9 @@ function SendEmail {
 	if type mutt > /dev/null 2>&1 ; then
 		echo "$message" | $(type -p mutt) -x -s "$subject" "$destination_mails" $attachment_command
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mutt) !!!" "WARN"
+			Logger "Cannot send mail via $(type -p mutt) !!!" "WARN"
 		else
-			Logger "Sent alert mail using mutt." "NOTICE"
+			Logger "Sent mail using mutt." "NOTICE"
 			return 0
 		fi
 	fi
@@ -343,16 +388,16 @@ function SendEmail {
 		fi
 		echo "$message" | $(type -p mail) $attachment_command -s "$subject" "$destination_mails"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mail) with attachments !!!" "WARN"
+			Logger "Cannot send mail via $(type -p mail) with attachments !!!" "WARN"
 			echo "$message" | $(type -p mail) -s "$subject" "$destination_mails"
 			if [ $? != 0 ]; then
-				Logger "Cannot send alert email via $(type -p mail) without attachments !!!" "WARN"
+				Logger "Cannot send mail via $(type -p mail) without attachments !!!" "WARN"
 			else
-				Logger "Sent alert mail using mail command without attachment." "NOTICE"
+				Logger "Sent mail using mail command without attachment." "NOTICE"
 				return 0
 			fi
 		else
-			Logger "Sent alert mail using mail command." "NOTICE"
+			Logger "Sent mail using mail command." "NOTICE"
 			return 0
 		fi
 	fi
@@ -360,26 +405,60 @@ function SendEmail {
 	if type sendmail > /dev/null 2>&1 ; then
 		echo -e "Subject:$subject\r\n$message" | $(type -p sendmail) "$destination_mails"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendmail) !!!" "WARN"
+			Logger "Cannot send mail via $(type -p sendmail) !!!" "WARN"
 		else
-			Logger "Sent alert mail using sendmail command without attachment." "NOTICE"
+			Logger "Sent mail using sendmail command without attachment." "NOTICE"
 			return 0
 		fi
 	fi
 
+	# Windows specific
+        if type "mailsend.exe" > /dev/null 2>&1 ; then
+		if [ "$sender_email" == "" ]; then
+			Logger "Missing sender email." "ERROR"
+			return 1
+		fi
+		if [ "$smtp_server" == "" ]; then
+			Logger "Missing smtp port." "ERROR"
+			return 1
+		fi
+		if [ "$smtp_port" == "" ]; then
+			Logger "Missing smtp port, assuming 25." "WARN"
+			smtp_port=25
+		fi
+		if [ "$encryption" != "tls" ] && [ "$encryption" != "ssl" ]  && [ "$encryption" != "none" ]; then
+			Logger "Bogus smtp encryption, assuming none." "WARN"
+			encryption_string=
+		elif [ "$encryption" == "tls" ]; then
+			encryption_string=-starttls
+		elif [ "$encryption" == "ssl" ]:; then
+			encryption_string=-ssl
+		fi
+		if [ "$smtp_user" != "" ] && [ "$smtp_password" != "" ]; then
+			auth_string="-auth -user \"$smtp_user\" -pass \"$smtp_password\""
+		fi
+                $(type mailsend.exe) -f "$sender_email" -t "$destination_mails" -sub "$subject" -M "$message" -attach "$attachment" -smtp "$smtp_server" -port "$smtp_port" $encryption_string $auth_string
+                if [ $? != 0 ]; then
+                        Logger "Cannot send mail via $(type mailsend.exe) !!!" "WARN"
+                else
+                        Logger "Sent mail using mailsend.exe command with attachment." "NOTICE"
+                        return 0
+                fi
+        fi
+
 	# pfSense specific
 	if [ -f /usr/local/bin/mail.php ]; then
 		echo "$message" | /usr/local/bin/mail.php -s="$subject"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
+			Logger "Cannot send mail via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
 		else
-			Logger "Sent alert mail using pfSense mail.php." "NOTICE"
+			Logger "Sent mail using pfSense mail.php." "NOTICE"
 			return 0
 		fi
 	fi
 
 	# If function has not returned 0 yet, assume it's critical that no alert can be sent
-	Logger "Cannot send alert (neither mutt, mail, sendmail, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
+	Logger "Cannot send mail (neither mutt, mail, sendmail, sendemail, mailsend (windows) or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
 }
 
 function TrapError {
diff --git a/obackup.sh b/obackup.sh
index 875802f..52c9f0c 100755
--- a/obackup.sh
+++ b/obackup.sh
@@ -8,7 +8,7 @@ PROGRAM_VERSION=2.0-pre
 PROGRAM_BUILD=2016041201
 IS_STABLE=no
 
-## FUNC_BUILD=2016041402
+## FUNC_BUILD=2016052502
 ## BEGIN Generic functions for osync & obackup written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
 
 ## type -p does not work on platforms other than linux (bash). If if does not work, always assume output is not a zero exitcode
@@ -170,19 +170,23 @@ function KillChilds {
 	fi
 }
 
-# Script specific email alert function, please use SendEmail function for generic sends
+# osync/obackup/pmocr script specific mail alert function, use SendEmail function for generic mail sending
 function SendAlert {
 
 	local mail_no_attachment=
 	local attachment_command=
 	local subject=
 
+	# Windows specific settings
+	local encryption_string=
+	local auth_string=
+
 	if [ "$DESTINATION_MAILS" == "" ]; then
 		return 0
 	fi
 
 	if [ "$_DEBUG" == "yes" ]; then
-		Logger "Debug mode, no warning email will be sent." "NOTICE"
+		Logger "Debug mode, no warning mail will be sent." "NOTICE"
 		return 0
 	fi
 
@@ -215,7 +219,7 @@ function SendAlert {
 	if type mutt > /dev/null 2>&1 ; then
 		echo "$MAIL_ALERT_MSG" | $(type -p mutt) -x -s "$subject" $DESTINATION_MAILS $attachment_command
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mutt) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p mutt) !!!" "WARN"
 		else
 			Logger "Sent alert mail using mutt." "NOTICE"
 			return 0
@@ -232,10 +236,10 @@ function SendAlert {
 		fi
 		echo "$MAIL_ALERT_MSG" | $(type -p mail) $attachment_command -s "$subject" $DESTINATION_MAILS
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mail) with attachments !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p mail) with attachments !!!" "WARN"
 			echo "$MAIL_ALERT_MSG" | $(type -p mail) -s "$subject" $DESTINATION_MAILS
 			if [ $? != 0 ]; then
-				Logger "Cannot send alert email via $(type -p mail) without attachments !!!" "WARN"
+				Logger "Cannot send alert mail via $(type -p mail) without attachments !!!" "WARN"
 			else
 				Logger "Sent alert mail using mail command without attachment." "NOTICE"
 				return 0
@@ -249,22 +253,46 @@ function SendAlert {
 	if type sendmail > /dev/null 2>&1 ; then
 		echo -e "Subject:$subject\r\n$MAIL_ALERT_MSG" | $(type -p sendmail) $DESTINATION_MAILS
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendmail) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p sendmail) !!!" "WARN"
 		else
 			Logger "Sent alert mail using sendmail command without attachment." "NOTICE"
 			return 0
 		fi
 	fi
 
+	# Windows specific
+        if type "mailsend.exe" > /dev/null 2>&1 ; then
+
+		if [ "$SMTP_ENCRYPTION" != "tls" ] && [ "$SMTP_ENCRYPTION" != "ssl" ]  && [ "$SMTP_ENCRYPTION" != "none" ]; then
+			Logger "Bogus smtp encryption, assuming none." "WARN"
+			encryption_string=
+		elif [ "$SMTP_ENCRYPTION" == "tls" ]; then
+			encryption_string=-starttls
+		elif [ "$SMTP_ENCRYPTION" == "ssl" ]:; then
+			encryption_string=-ssl
+		fi
+		if [ "$SMTP_USER" != "" ] && [ "$SMTP_USER" != "" ]; then
+			auth_string="-auth -user \"$SMTP_USER\" -pass \"$SMTP_PASSWORD\""
+		fi
+                $(type mailsend.exe) -f $SENDER_MAIL -t "$DESTINATION_MAILS" -sub "$subject" -M "$MAIL_ALERT_MSG" -attach "$attachment" -smtp "$SMTP_SERVER" -port "$SMTP_PORT" $encryption_string $auth_string
+                if [ $? != 0 ]; then
+                        Logger "Cannot send mail via $(type mailsend.exe) !!!" "WARN"
+                else
+                        Logger "Sent mail using mailsend.exe command with attachment." "NOTICE"
+                        return 0
+                fi
+        fi
+
+	# Windows specific, kept for compatibility (sendemail from http://caspian.dotconf.net/menu/Software/SendEmail/)
 	if type sendemail > /dev/null 2>&1 ; then
 		if [ "$SMTP_USER" != "" ] && [ "$SMTP_PASSWORD" != "" ]; then
 			SMTP_OPTIONS="-xu $SMTP_USER -xp $SMTP_PASSWORD"
 		else
 			SMTP_OPTIONS=""
 		fi
-		$(type -p sendemail) -f $SENDER_MAIL -t $DESTINATION_MAILS -u "$subject" -m "$MAIL_ALERT_MSG" -s $SMTP_SERVER $SMTP_OPTIONS > /dev/null 2>&1
+		$(type -p sendemail) -f $SENDER_MAIL -t "$DESTINATION_MAILS" -u "$subject" -m "$MAIL_ALERT_MSG" -s $SMTP_SERVER $SMTP_OPTIONS > /dev/null 2>&1
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendemail) !!!" "WARN"
+			Logger "Cannot send alert mail via $(type -p sendemail) !!!" "WARN"
 		else
 			Logger "Sent alert mail using sendemail command without attachment." "NOTICE"
 			return 0
@@ -275,7 +303,7 @@ function SendAlert {
 	if [ -f /usr/local/bin/mail.php ]; then
 		echo "$MAIL_ALERT_MSG" | /usr/local/bin/mail.php -s="$subject"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
+			Logger "Cannot send alert mail via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
 		else
 			Logger "Sent alert mail using pfSense mail.php." "NOTICE"
 			return 0
@@ -283,7 +311,7 @@ function SendAlert {
 	fi
 
 	# If function has not returned 0 yet, assume it's critical that no alert can be sent
-	Logger "Cannot send alert (neither mutt, mail, sendmail, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
+	Logger "Cannot send alert (neither mutt, mail, sendmail, mailsend, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
 
 	# Delete tmp log file
 	if [ -f "$ALERT_LOG_FILE" ]; then
@@ -291,18 +319,35 @@ function SendAlert {
 	fi
 }
 
-# Generic email sending function. Usage:
-# SendEmail "subject" "Body text" "receiver@email.fr receiver2@otheremail.fr" "/path/to/attachment.file"
+# Generic email sending function.
+# Usage (linux / BSD), attachment is optional, can be "/path/to/my.file" or ""
+# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file"
+# Usage (Windows, make sure you have mailsend.exe in executable path, see http://github.com/muquit/mailsend)
+# attachment is optional but must be in windows format like "c:\\some\path\\my.file", or ""
+# smtp_server.domain.tld is mandatory, as is smtp_port (should be 25, 465 or 587)
+# encryption can be set to tls, ssl or none
+# smtp_user and smtp_password are optional
+# SendEmail "subject" "Body text" "receiver@example.com receiver2@otherdomain.com" "/path/to/attachment.file" "sender_email@example.com" "smtp_server.domain.tld" "smtp_port" "encrpytion" "smtp_user" "smtp_password"
 function SendEmail {
 	local subject="${1}"
 	local message="${2}"
 	local destination_mails="${3}"
-	local attachment="{$4}"
+	local attachment="${4}"
+	local sender_email="${5}"
+	local smtp_server="${6}"
+	local smtp_port="${7}"
+	local encrpytion="${8}"
+	local smtp_user="${9}"
+	local smtp_password="${10}"
 
+	# CheckArguments will report a warning that can be ignored if used in Windows with paranoia debug enabled
 
 	local mail_no_attachment=
 	local attachment_command=
 
+	local encryption_string=
+	local auth_string=
+
 	if [ ! -f "$attachment" ]; then
 		attachment_command="-a $ALERT_LOG_FILE"
 		mail_no_attachment=1
@@ -313,9 +358,9 @@ function SendEmail {
 	if type mutt > /dev/null 2>&1 ; then
 		echo "$message" | $(type -p mutt) -x -s "$subject" "$destination_mails" $attachment_command
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mutt) !!!" "WARN"
+			Logger "Cannot send mail via $(type -p mutt) !!!" "WARN"
 		else
-			Logger "Sent alert mail using mutt." "NOTICE"
+			Logger "Sent mail using mutt." "NOTICE"
 			return 0
 		fi
 	fi
@@ -330,16 +375,16 @@ function SendEmail {
 		fi
 		echo "$message" | $(type -p mail) $attachment_command -s "$subject" "$destination_mails"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p mail) with attachments !!!" "WARN"
+			Logger "Cannot send mail via $(type -p mail) with attachments !!!" "WARN"
 			echo "$message" | $(type -p mail) -s "$subject" "$destination_mails"
 			if [ $? != 0 ]; then
-				Logger "Cannot send alert email via $(type -p mail) without attachments !!!" "WARN"
+				Logger "Cannot send mail via $(type -p mail) without attachments !!!" "WARN"
 			else
-				Logger "Sent alert mail using mail command without attachment." "NOTICE"
+				Logger "Sent mail using mail command without attachment." "NOTICE"
 				return 0
 			fi
 		else
-			Logger "Sent alert mail using mail command." "NOTICE"
+			Logger "Sent mail using mail command." "NOTICE"
 			return 0
 		fi
 	fi
@@ -347,26 +392,60 @@ function SendEmail {
 	if type sendmail > /dev/null 2>&1 ; then
 		echo -e "Subject:$subject\r\n$message" | $(type -p sendmail) "$destination_mails"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via $(type -p sendmail) !!!" "WARN"
+			Logger "Cannot send mail via $(type -p sendmail) !!!" "WARN"
 		else
-			Logger "Sent alert mail using sendmail command without attachment." "NOTICE"
+			Logger "Sent mail using sendmail command without attachment." "NOTICE"
 			return 0
 		fi
 	fi
 
+	# Windows specific
+        if type "mailsend.exe" > /dev/null 2>&1 ; then
+		if [ "$sender_email" == "" ]; then
+			Logger "Missing sender email." "ERROR"
+			return 1
+		fi
+		if [ "$smtp_server" == "" ]; then
+			Logger "Missing smtp port." "ERROR"
+			return 1
+		fi
+		if [ "$smtp_port" == "" ]; then
+			Logger "Missing smtp port, assuming 25." "WARN"
+			smtp_port=25
+		fi
+		if [ "$encryption" != "tls" ] && [ "$encryption" != "ssl" ]  && [ "$encryption" != "none" ]; then
+			Logger "Bogus smtp encryption, assuming none." "WARN"
+			encryption_string=
+		elif [ "$encryption" == "tls" ]; then
+			encryption_string=-starttls
+		elif [ "$encryption" == "ssl" ]:; then
+			encryption_string=-ssl
+		fi
+		if [ "$smtp_user" != "" ] && [ "$smtp_password" != "" ]; then
+			auth_string="-auth -user \"$smtp_user\" -pass \"$smtp_password\""
+		fi
+                $(type mailsend.exe) -f "$sender_email" -t "$destination_mails" -sub "$subject" -M "$message" -attach "$attachment" -smtp "$smtp_server" -port "$smtp_port" $encryption_string $auth_string
+                if [ $? != 0 ]; then
+                        Logger "Cannot send mail via $(type mailsend.exe) !!!" "WARN"
+                else
+                        Logger "Sent mail using mailsend.exe command with attachment." "NOTICE"
+                        return 0
+                fi
+        fi
+
 	# pfSense specific
 	if [ -f /usr/local/bin/mail.php ]; then
 		echo "$message" | /usr/local/bin/mail.php -s="$subject"
 		if [ $? != 0 ]; then
-			Logger "Cannot send alert email via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
+			Logger "Cannot send mail via /usr/local/bin/mail.php (pfsense) !!!" "WARN"
 		else
-			Logger "Sent alert mail using pfSense mail.php." "NOTICE"
+			Logger "Sent mail using pfSense mail.php." "NOTICE"
 			return 0
 		fi
 	fi
 
 	# If function has not returned 0 yet, assume it's critical that no alert can be sent
-	Logger "Cannot send alert (neither mutt, mail, sendmail, sendemail or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
+	Logger "Cannot send mail (neither mutt, mail, sendmail, sendemail, mailsend (windows) or pfSense mail.php could be used)." "ERROR" # Is not marked critical because execution must continue
 }
 
 function TrapError {