diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-18 09:18:57 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-18 09:18:57 (GMT) |
| commit | 5260651e7e3c5a2a788b2de752028899b5e10c7f (patch) | |
| tree | 026a176fee554c1a211680faa1a288547ef9a2d3 | |
| parent | cb7d4fcf8dff6183581914465dcc9abfb3ed5a31 (diff) | |
| parent | c68ae6ebd44ae66ba35154d868c686cf14c7f6b8 (diff) | |
| download | Doxygen-5260651e7e3c5a2a788b2de752028899b5e10c7f.zip Doxygen-5260651e7e3c5a2a788b2de752028899b5e10c7f.tar.gz Doxygen-5260651e7e3c5a2a788b2de752028899b5e10c7f.tar.bz2 | |
Merge branch 'albert-github-feature/bug_nospam_email'
| -rw-r--r-- | src/doctokenizer.l | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index c45bc9e..a527672 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -344,7 +344,9 @@ PHPTYPE [\\:a-z_A-Z0-9\x80-\xFF\-]+ CITESCHAR [a-z_A-Z0-9\x80-\xFF\-\?] CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/\?] CITEID {CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*|"\""{CITESCHAR}{CITEECHAR}*("."{CITESCHAR}{CITEECHAR}*)*"\"" -MAILADR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+ +MAILADDR ("mailto:")?[a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+ +MAILWS [\t a-z_A-Z0-9+-] +MAILADDR2 {MAILWS}+{BLANK}+("at"|"AT"|"_at_"|"_AT_"){BLANK}+{MAILWS}+("dot"|"DOT"|"_dot_"|"_DOT_"){BLANK}+{MAILWS}+ OPTSTARS ("//"{BLANK}*)?"*"*{BLANK}* LISTITEM {BLANK}*[-]("#")?{WS} MLISTITEM {BLANK}*[+*]{WS} @@ -642,19 +644,23 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->isEMailAddr=FALSE; return TK_URL; } -<St_Para>{MAILADR} { // Mail address +<St_Para>{MAILADDR} { // Mail address g_token->name=yytext; g_token->name.stripPrefix("mailto:"); g_token->isEMailAddr=TRUE; return TK_URL; } -<St_Para>"<"{MAILADR}">" { // Mail address +<St_Para>"<"{MAILADDR}">" { // Mail address g_token->name=yytext; g_token->name = g_token->name.mid(1,g_token->name.length()-2); g_token->name.stripPrefix("mailto:"); g_token->isEMailAddr=TRUE; return TK_URL; } +<St_Para>"<"{MAILADDR2}">" { // anti spam mail address + g_token->name=yytext; + return TK_WORD; + } <St_Para>"$"{ID}":"[^:\n$][^\n$]*"$" { /* RCS tag */ QCString tagName(yytext+1); int index=tagName.find(':'); |