From 4525650ffa69a9a73d95b902613b2995c5d685d5 Mon Sep 17 00:00:00 2001
From: Nicholas Mayne <Jetski5822@gmail.com>
Date: Mon, 12 May 2014 21:09:14 +0100
Subject: [PATCH] #20689 Reverting previous changes and jsut forcing validation
 if author is null when user is not signed in

---
 .../Modules/Orchard.Comments/Drivers/CommentPartDriver.cs   | 6 +++++-
 .../Modules/Orchard.Comments/Models/CommentPart.cs          | 4 ++--
 .../Views/EditorTemplates/Parts.Comment.cshtml              | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
index 77eaae0b6..4687f711d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentPartDriver.cs
@@ -106,7 +106,11 @@ namespace Orchard.Comments.Drivers {
             var currentUser = workContext.CurrentUser;
             part.UserName = (currentUser != null ? currentUser.UserName : null);
 
-            if (currentUser != null) part.Author = currentUser.UserName;
+            if (currentUser != null) 
+                part.Author = currentUser.UserName;
+            else if (string.IsNullOrWhiteSpace(part.Author)) {
+                updater.AddModelError("Comments.Author", T("Name is mandatory"));
+            }
 
             var moderateComments = workContext.CurrentSite.As<CommentSettingsPart>().ModerateComments;
             part.Status = moderateComments ? CommentStatus.Pending : CommentStatus.Approved;
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
index 79b3d126f..4ef90c4ff 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Models/CommentPart.cs
@@ -12,7 +12,7 @@ namespace Orchard.Comments.Models {
         public LazyField<ContentItem> CommentedOnContentItemField { get { return _commentedOnContentItem; } }
         public LazyField<ContentItemMetadata> CommentedOnContentItemMetadataField { get { return _commentedOnContentItemMetadata; } }
 
-        [Required, StringLength(255)]
+        [StringLength(255)]
         public string Author {
             get { return Record.Author; }
             set { Record.Author = value; }
@@ -31,7 +31,7 @@ namespace Orchard.Comments.Models {
             set { Record.UserName = value; }
         }
 
-        [Required, RegularExpression(@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")]
+        [RegularExpression(@"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]$")]
         public string Email {
             get { return Record.Email; }
             set { Record.Email = value; }
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
index acb54f1b0..11be54050 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comment.cshtml
@@ -7,11 +7,11 @@
         <ol>
             <li>
                 @Html.LabelFor(m => m.Author, T("Name"))
-                @Html.TextBoxFor(m => m.Author, new { required = "required" })
+                @Html.TextBoxFor(m => m.Author)
             </li>
             <li>
                 @Html.LabelFor(m => m.Email, T("Email"))
-                @Html.TextBoxFor(m => m.Email, new { required = "required" })
+                @Html.TextBoxFor(m => m.Email)
             </li>
             <li>
                 @Html.LabelFor(m => m.SiteName, T("Url"))
@@ -21,7 +21,7 @@
     </fieldset>
 }
 else {
-    @Html.Hidden("Author", WorkContext.CurrentUser.UserName ?? "")
+    @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
     @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
 }