Author: gmazza
Date: Tue Jun 24 03:06:24 2014
New Revision: 1605001
URL: http://svn.apache.org/r1605001
Log:
ROL-1414 Fix email scrambler to detect hyphens in email addresses.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/util/RegexUtil.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/util/RegexUtil.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/util/RegexUtil.java?rev=1605001&r1=1605000&r2=1605001&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/util/RegexUtil.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/util/RegexUtil.java Tue
Jun 24 03:06:24 2014
@@ -32,12 +32,12 @@ import org.apache.commons.codec.binary.H
public final class RegexUtil {
public static final Pattern MAILTO_PATTERN =
-
Pattern.compile("mailto:([a-zA-Z0-9\\.]+@[a-zA-Z0-9\\.]+\\.[a-zA-Z0-9]+)");
-
+
Pattern.compile("mailto:([a-zA-Z0-9\\.\\-]+@[a-zA-Z0-9\\.\\-]+\\.[a-zA-Z0-9]+)");
+
public static final Pattern EMAIL_PATTERN =
-
Pattern.compile("\\b[a-zA-Z0-9\\.]+(@)([a-zA-Z0-9\\.]+)(\\.)([a-zA-Z0-9]+)\\b");
-
-
+
Pattern.compile("\\b[a-zA-Z0-9\\.\\-]+(@)([a-zA-Z0-9\\.\\-]+)(\\.)([a-zA-Z0-9]+)\\b");
+
+
public static String encodeEmail(String str) {
// obfuscate mailto's: turns them into hex encoded,
// so that browsers can still understand the mailto link
