Skip to content

Commit

Permalink
LPS-31986 Source formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed Jan 19, 2013
1 parent 73fd963 commit 5253694
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public String sanitize(
}

private static final Pattern _pattern = Pattern.compile(
PortletPropsValues.EMAIL_QUOTED_TEXT_BEGINNING_REGEXP);
PortletPropsValues.PLAIN_TEXT_EMAIL_REGEXP);

private static Log _log = LogFactoryUtil.getLog(
EmailToMBMessageFilterSanitizerImpl.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
public interface PortletPropsKeys {

public static final String EMAIL_QUOTED_TEXT_BEGINNING_REGEXP =
"email.quoted.text.beginning.regexp";
public static final String PLAIN_TEXT_EMAIL_REGEXP =
"plain.text.email.regexp";

}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
public class PortletPropsValues {

public static final String EMAIL_QUOTED_TEXT_BEGINNING_REGEXP =
PortletProps.get(PortletPropsKeys.EMAIL_QUOTED_TEXT_BEGINNING_REGEXP);
public static final String PLAIN_TEXT_EMAIL_REGEXP = PortletProps.get(
PortletPropsKeys.PLAIN_TEXT_EMAIL_REGEXP);

}
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
##
## Email Regex
##
#
# Spacer Regular Expression
#
spacer.regexp=[\\s\,/\\.\\-]

#
# Basic Regex
#
spacer.regexp=[\\s\,/\\.\\-]
#
# Date and Time Regular Expressions
#
day.of.month.regexp=[0-3]?[0-9]${spacer.regexp}*(?:(?:th)|(?:st)|(?:nd)|(?:rd))?
day.of.week.regexp=(?:(?:Mon(?:day)?)|(?:Tue(?:sday)?)|(?:Wed(?:nesday)?)|(?:Thu(?:rsday)?)|(?:Fri(?:day)?)|(?:Sat(?:urday)?)|(?:Sun(?:day)?))
month.regexp=(?:(?:Jan(?:uary)?)|(?:Feb(?:uary)?)|(?:Mar(?:ch)?)|(?:Apr(?:il)?)|(?:May)|(?:Jun(?:e)?)|(?:Jul(?:y)?)|(?:Aug(?:ust)?)|(?:Sep(?:tember)?)|(?:Oct(?:ober)?)|(?:Nov(?:ember)?)|(?:Dec(?:ember)?)|(?:[0-1]?[0-9]))
time.regexp=(?:[0-2])?[0-9]:[0-5][0-9](?::[0-5][0-9])?(?:(?:\\s)?[AP]M)?
year.regexp=(?:[1-2]?[0-9])[0-9][0-9]

#
# Date and Time Regex
#
day.of.month.regexp=[0-3]?[0-9]${spacer.regexp}*(?:(?:th)|(?:st)|(?:nd)|(?:rd))?
day.of.week.regexp=(?:(?:Mon(?:day)?)|(?:Tue(?:sday)?)|(?:Wed(?:nesday)?)|(?:Thu(?:rsday)?)|(?:Fri(?:day)?)|(?:Sat(?:urday)?)|(?:Sun(?:day)?))
month.regexp=(?:(?:Jan(?:uary)?)|(?:Feb(?:uary)?)|(?:Mar(?:ch)?)|(?:Apr(?:il)?)|(?:May)|(?:Jun(?:e)?)|(?:Jul(?:y)?)|(?:Aug(?:ust)?)|(?:Sep(?:tember)?)|(?:Oct(?:ober)?)|(?:Nov(?:ember)?)|(?:Dec(?:ember)?)|(?:[0-1]?[0-9]))
time.regexp=(?:[0-2])?[0-9]:[0-5][0-9](?::[0-5][0-9])?(?:(?:\\s)?[AP]M)?
year.regexp=(?:[1-2]?[0-9])[0-9][0-9]
#
# Formatted Date and Time Regular Expressions
#
formatted.date.regexp=(?:${day.of.week.regexp}${spacer.regexp}+)?(?:(?:${day.of.month.regexp}${spacer.regexp}+${month.regexp})|(?:${month.regexp}${spacer.regexp}+${day.of.month.regexp}))${spacer.regexp}+${year.regexp}
formatted.date.time.regexp=(?:${formatted.date.regexp}[\\s\,]*(?:(?:at)|(?:@))?\\s*${time.regexp})|(?:${time.regexp}[\\s\,]*(?:on)?\\s*${formatted.date.regexp})

#
# Date and Time Regex
#
formatted.date.regexp=(?:${day.of.week.regexp}${spacer.regexp}+)?(?:(?:${day.of.month.regexp}${spacer.regexp}+${month.regexp})|(?:${month.regexp}${spacer.regexp}+${day.of.month.regexp}))${spacer.regexp}+${year.regexp}
formatted.date.time.regexp=(?:${formatted.date.regexp}[\\s\,]*(?:(?:at)|(?:@))?\\s*${time.regexp})|(?:${time.regexp}[\\s\,]*(?:on)?\\s*${formatted.date.regexp})
#
# Email Regular Expressions
#
email.date.time.header.regexp=(?:(?:date)|(?:sent)|(?:time)):\\s*(${formatted.date.time.regexp}).*\r\n
email.gmail.quote.regexp=(On\\s+${formatted.date.time.regexp}.*wrote:\n)
email.line.quote.regexp=[-\,_]+\\s*(?:Original(?:\\sMessage)?)?\\s*[-\,_]+\r\n\\s*
email.subject.address.header.regexp=((?:from)|(?:subject)|(?:b?cc)|(?:to)):.*\r\n

#
# Common Email Regex
#
date.time.header.regexp=(?:(?:date)|(?:sent)|(?:time)):\\s*(${formatted.date.time.regexp}).*\r\n
gmail.quote.regexp=(On\\s+${formatted.date.time.regexp}.*wrote:\n)
line.quote.regexp=[-\,_]+\\s*(?:Original(?:\\sMessage)?)?\\s*[-\,_]+\r\n\\s*
subject.address.header.regexp=((?:from)|(?:subject)|(?:b?cc)|(?:to)):.*\r\n

#
# Plain Text Email Regex
#
email.quoted.text.beginning.regexp=(?i)(?:(?:${line.quote.regexp})?(?:(?:${subject.address.header.regexp})|(?:${date.time.header.regexp})){2\,6})|(?:${gmail.quote.regexp})
#
# Plain Text Email Regular Expressions
#
plain.text.email.regexp=(?i)(?:(?:${email.line.quote.regexp})?(?:(?:${email.subject.address.header.regexp})|(?:${email.date.time.header.regexp})){2\,6})|(?:${email.gmail.quote.regexp})

0 comments on commit 5253694

Please sign in to comment.