svn commit: r1605279 - /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java

[gh...@apache.org]

Author: ghuber
Date: Wed Jun 25 07:11:11 2014
New Revision: 1605279

URL: http://svn.apache.org/r1605279
Log:
Additional fox for ROL-2002 to fix previous mistake, also make sure the authenticator is regenerated when an URL is entered.

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java?rev=1605279&r1=1605278&r2=1605279&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/CommentServlet.java Wed Jun 25 07:11:11 2014
@@ -274,21 +274,20 @@ public class CommentServlet extends Http
         if (!entry.getCommentsStillAllowed() || !entry.isPublished()) {
             error = messageUtils.getString("comments.disabled");
 
-            // if there is an email it must be valid
-        } else if (StringUtils.isNotEmpty(commentRequest.getEmail())
+            // Must have an email and also must be valid
+        } else if (StringUtils.isEmpty(commentRequest.getEmail())
+                || StringUtils.isNotEmpty(commentRequest.getEmail())
                 && !Utilities.isValidEmailAddress(commentRequest.getEmail())) {
             error = messageUtils
                     .getString("error.commentPostFailedEmailAddress");
             log.debug("Email Adddress is invalid : "
                     + commentRequest.getEmail());
             // if there is an URL it must be valid
-        } else if (StringUtils.isNotEmpty(commentRequest.getUrl())) {
-            String[] customSchemes = { "http", "https" };
-            if (!new UrlValidator(customSchemes).isValid(commentRequest
-                    .getUrl())) {
+        } else if (StringUtils.isNotEmpty(commentRequest.getUrl())
+                && !new UrlValidator(new String[] { "http", "https" })
+                        .isValid(commentRequest.getUrl())) {
                 error = messageUtils.getString("error.commentPostFailedURL");
                 log.debug("URL is invalid : " + commentRequest.getUrl());
-            }
             // if this is a real comment post then authenticate request
         } else if (!preview && !this.authenticator.authenticate(request)) {
             String[] msg = { request.getParameter("answer") };