From ce7305faf04ab6e4f037b553d628880fcdb48488 Mon Sep 17 00:00:00 2001
From: TidusJar <jamierees@outlook.com>
Date: Sat, 23 Jul 2016 09:52:47 +0100
Subject: [PATCH] Should fix #429

---
 .../EmailNotificationSettings.cs              |  1 +
 .../EmailNotificationSettingsValidator.cs     | 90 +++++++++----------
 .../Views/Admin/EmailNotifications.cshtml     | 60 ++++++++++---
 3 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs b/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs
index c0eea75dc..36013b563 100644
--- a/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs
+++ b/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs
@@ -34,6 +34,7 @@ namespace PlexRequests.Core.SettingModels
         public string EmailSender { get; set; }
         public string EmailUsername { get; set; }
         public bool Enabled { get; set; }
+      public bool Authentication { get; set; }
         public bool EnableUserEmailNotifications { get; set; }
         public string RecipientEmail { get; set; }
     }
diff --git a/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs b/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs
index ddf4a5268..4418b7ed2 100644
--- a/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs
+++ b/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs
@@ -1,47 +1,45 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: SonarrValidator.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-using FluentValidation;
-
-using PlexRequests.Core.SettingModels;
-
-namespace PlexRequests.UI.Validators
-{
-    public class EmailNotificationSettingsValidator : AbstractValidator<EmailNotificationSettings>
-    {
-        public EmailNotificationSettingsValidator()
-        {
-            RuleFor(request => request.EmailHost).NotEmpty().WithMessage("You must specify a Host name.");
-            RuleFor(request => request.EmailPort).NotEmpty().WithMessage("You must specify a Port.");
-            RuleFor(request => request.RecipientEmail).NotEmpty().WithMessage("You must specify a Recipient.");
-            RuleFor(request => request.RecipientEmail).EmailAddress().WithMessage("You must specify a valid Recipient.");
-            RuleFor(request => request.EmailUsername).NotEmpty().WithMessage("You must specify a Username.");
-            RuleFor(request => request.EmailPassword).NotEmpty().WithMessage("You must specify a valid password.");
-            RuleFor(request => request.EmailSender).EmailAddress().WithMessage("You must specify a valid Email for the email sender.");
-            RuleFor(request => request.EmailSender).NotEmpty().WithMessage("You must specify a Email Sender.");
-        }
-    }
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//  ************************************************************************/
+#endregion
+using FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class EmailNotificationSettingsValidator : AbstractValidator<EmailNotificationSettings>
+    {
+        public EmailNotificationSettingsValidator()
+        {
+            RuleFor(request => request.EmailHost).NotEmpty().WithMessage("You must specify a Host name.");
+            RuleFor(request => request.EmailPort).NotEmpty().WithMessage("You must specify a Port.");
+            RuleFor(request => request.RecipientEmail).NotEmpty().WithMessage("You must specify a Recipient.");
+            RuleFor(request => request.RecipientEmail).EmailAddress().WithMessage("You must specify a valid Recipient.");
+            RuleFor(request => request.EmailSender).EmailAddress().WithMessage("You must specify a valid Email for the email sender.");
+            RuleFor(request => request.EmailSender).NotEmpty().WithMessage("You must specify a Email Sender.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
index 6c45024e1..a73a46951 100644
--- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@@ -18,7 +18,7 @@
     <form class="form-horizontal" method="POST" id="mainForm">
         <fieldset>
             <legend>Email Notifications</legend>
-
+ 
             <div class="form-group">
                 <div class="checkbox">
 
@@ -33,21 +33,35 @@
 
                 </div>
             </div>
-            <div class="form-group">
-                <div class="checkbox">
+          <div class="form-group">
+            <div class="checkbox">
+
+              @if (Model.EnableUserEmailNotifications)
+              {
+                <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications" checked="checked"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
+              }
+              else
+              {
+                <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
+              }
 
-                    @if (Model.EnableUserEmailNotifications)
-                    {
-                        <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications" checked="checked"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
-                    }
-                    else
-                    {
-                        <input type="checkbox" id="EnableUserEmailNotifications" name="EnableUserEmailNotifications"><label for="EnableUserEmailNotifications">Enable user email notifications</label>
-                    }
+            </div>
+          </div>
+          <div class="form-group">
+            <div class="checkbox">
+
+              @if (Model.Authentication)
+              {
+                <input type="checkbox" id="Authentication" name="Authentication" checked="checked"><label for="Authentication">Enable SMTP Authentication</label>
+              }
+              else
+              {
+                <input type="checkbox" id="Authentication" name="Authentication"><label for="Authentication">Enable SMTP Authentication</label>
+              }
 
-                </div>
             </div>
-            <small>Please note that if user notifications is enabled, the email will get sent with the SMTP set-up below.</small>
+          </div>
+          <small>Please note that if user notifications is enabled, the email will get sent with the SMTP set-up below.</small>
             <div class="form-group">
                 <label for="EmailHost" class="control-label">SMTP Host name or IP</label>
                 <div class="">
@@ -144,6 +158,15 @@
 <script>
     $(function () {
 
+      var auth = $('#Authentication').prop('checked');
+      ChangeUsernameAndPassword(auth);
+
+
+      $("#Authentication")
+        .change(function(e) {
+           ChangeUsernameAndPassword(auth);
+        });
+
         var base = '@Html.GetBaseUrl()';
         $('#save').click(function (e) {
             e.preventDefault();
@@ -207,6 +230,17 @@
                 }
             });
         });
+function ChangeUsernameAndPassword(checked) {
+      var $userName = $('#EmailUsername');
+      var $password = $('#EmailPassword');
+      if (!checked) {
+        $userName.attr('disabled', 'disabled');
+        $password.attr('disabled', 'disabled');
+      } else {
+        $userName.removeAttr('disabled', 'disabled');
+        $password.removeAttr('disabled', 'disabled');
+      }
+};
 
 
     });