From dbf0af22931cdfe152e3bd7f2d5190b3fe744cfe Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Mon, 8 Apr 2013 07:02:37 +0930 Subject: [PATCH] correct tsl to tls for sendEmail --- .../current-stable/nzbget-postprocess.conf | 2 +- .../current-stable/nzbget-postprocess.sh | 4 ++-- nzbget-postprocessing-files/previous/nzbget-postprocess.conf | 2 +- nzbget-postprocessing-files/previous/nzbget-postprocess.sh | 4 ++-- nzbget-postprocessing-files/testing/README.md | 2 +- nzbget-postprocessing-files/testing/nzbget-postprocess.conf | 2 +- nzbget-postprocessing-files/testing/nzbget-postprocess.sh | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.conf b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.conf index f9a904d4..1c5ac244 100644 --- a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.conf +++ b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.conf @@ -150,7 +150,7 @@ Email_To= Email_Server= # Server uses tsl (auto, yes, no). -Tsl=auto +Tls=auto # Enter your smtp server user name (if required) Email_User= diff --git a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh index b263d2c6..a8bed4e3 100755 --- a/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh +++ b/nzbget-postprocessing-files/current-stable/nzbget-postprocess.sh @@ -258,7 +258,7 @@ do_exit() { Email_Message="$Email_Message
Log Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done for item in $Email_failed; do if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then @@ -272,7 +272,7 @@ do_exit() { Email_Message="$Email_Message
nLog Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done exit $1 } diff --git a/nzbget-postprocessing-files/previous/nzbget-postprocess.conf b/nzbget-postprocessing-files/previous/nzbget-postprocess.conf index 9ac02222..c7604a7a 100644 --- a/nzbget-postprocessing-files/previous/nzbget-postprocess.conf +++ b/nzbget-postprocessing-files/previous/nzbget-postprocess.conf @@ -149,7 +149,7 @@ Email_To= Email_Server= # Server uses tsl (auto, yes, no). -Tsl=auto +Tls=auto # Enter your smtp server user name (if required) Email_User= diff --git a/nzbget-postprocessing-files/previous/nzbget-postprocess.sh b/nzbget-postprocessing-files/previous/nzbget-postprocess.sh index 854d1397..0b6b54a0 100644 --- a/nzbget-postprocessing-files/previous/nzbget-postprocess.sh +++ b/nzbget-postprocessing-files/previous/nzbget-postprocess.sh @@ -227,7 +227,7 @@ do_exit() { Email_Message="$Email_Message
Log Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done for item in $Email_failed; do if [ "${NZBPP_CATEGORY}" = "$item" -a "$nzbStatus" != 0 ]; then @@ -241,7 +241,7 @@ do_exit() { Email_Message="$Email_Message
nLog Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done exit $1 } diff --git a/nzbget-postprocessing-files/testing/README.md b/nzbget-postprocessing-files/testing/README.md index eb3af0ce..dabaf843 100644 --- a/nzbget-postprocessing-files/testing/README.md +++ b/nzbget-postprocessing-files/testing/README.md @@ -1 +1 @@ -Currently testing NZBGet V10+ +Currently testing NZBGet V11 diff --git a/nzbget-postprocessing-files/testing/nzbget-postprocess.conf b/nzbget-postprocessing-files/testing/nzbget-postprocess.conf index f9a904d4..1c5ac244 100644 --- a/nzbget-postprocessing-files/testing/nzbget-postprocess.conf +++ b/nzbget-postprocessing-files/testing/nzbget-postprocess.conf @@ -150,7 +150,7 @@ Email_To= Email_Server= # Server uses tsl (auto, yes, no). -Tsl=auto +Tls=auto # Enter your smtp server user name (if required) Email_User= diff --git a/nzbget-postprocessing-files/testing/nzbget-postprocess.sh b/nzbget-postprocessing-files/testing/nzbget-postprocess.sh index b263d2c6..a8bed4e3 100755 --- a/nzbget-postprocessing-files/testing/nzbget-postprocess.sh +++ b/nzbget-postprocessing-files/testing/nzbget-postprocess.sh @@ -258,7 +258,7 @@ do_exit() { Email_Message="$Email_Message
Log Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done for item in $Email_failed; do if [ "${NZBPP_CATEGORY}" = "$item" -o "$item" = "all" ] && [ "$nzbStatus" != 0 ]; then @@ -272,7 +272,7 @@ do_exit() { Email_Message="$Email_Message
nLog Result" while read line; do Email_Message="$Email_Message
$line"; done < $tmplog fi - $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tsl=$Tsl" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" + $sendEmail -f "$Email_From" -t "$Email_To" -s "$Email_Server" -o "tls=$Tls" -o "message-content-type=html" $User -u "$Email_Subject" -m "$Email_Message" fi; done exit $1 }