From 0ee4dda4f30bb3963deb5a1d088b27aae5ced48a Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 18 Oct 2006 23:59:23 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11311
---
 checkin_notes                      |   7 +++++++
 clientgui/ValidateEmailAddress.cpp |  14 ++++++++------
 win_build/installerv2/BOINC.ism    | Bin 206336 -> 206336 bytes
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 19a2a57369..c2ec9e60a4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11193,3 +11193,10 @@ David  18 Oct 2006
 
     clientgui/
         ViewResources.cpp,h
+
+Rom    18 Oct 2006
+    - Bug Fix: Change the regex that validates email addresses in the manager to a 5 star rated
+        expression. See http://regexlib.com/REDetails.aspx?regexp_id=328
+        
+    clientgui/
+        ValidateEmailAddress.cpp
diff --git a/clientgui/ValidateEmailAddress.cpp b/clientgui/ValidateEmailAddress.cpp
index e83054848b..c17de04f1a 100644
--- a/clientgui/ValidateEmailAddress.cpp
+++ b/clientgui/ValidateEmailAddress.cpp
@@ -65,13 +65,15 @@ bool CValidateEmailAddress::Validate(wxWindow *parent) {
     wxString val(control->GetValue().Trim().Trim(false));  // trim spaces before and after
 
     // Regular Expression found here:
-    //   http://www.regexlib.com/REDetails.aspx?regexp_id=284
+    //   http://www.regexlib.com/REDetails.aspx?regexp_id=328
     wxRegEx reEmail(
-        wxT("^([a-zA-Z0-9_\\-])+(\\.([a-zA-Z0-9_\\-])+)*@((\\[(((([0-1])?([0-9])?[0-9])|"
-            "(2[0-4][0-9])|(2[0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2["
-            "0-5][0-5])))\\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\\.(("
-            "(([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\\]))|((([a-zA-Z0-9])+("
-            "([\\-])+([a-zA-Z0-9])+)*\\.)+([a-zA-Z])+(([\\-])+([a-zA-Z0-9])+)*))$"));
+        wxT("^((\\\"[^\\\"\\f\\n\\r\\t\\v\\b]+\\\")|([\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\"
+            "}]+(\\.[\\w\\!\\#\\$\\%\\&\\'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4]["
+            "0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2["
+            "0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25["
+            "0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\."
+            "((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]"
+            ")))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$"));
 
     if (val.Length() == 0) {
         ok = FALSE;
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 3c9b74d0a19574857f24ba0a4a0d913fa656aa66..a56280d5738777ab876583a4ae281c46a20586da 100644
GIT binary patch
delta 767
zcmZ`#TS!z<6rH`#bsjc%)X6d$XHrK)3M@^7q|67SGZy1uqFI5IU35Ta)Krwj=C21t
z<zYP95rX-+UlnpM&82>-A5k$s{EQ4C`pRCWX-d?cjQ(P?*n6$L&f0JybJob5b+SVc
zm!i*4S-wqyYA_fg>Y(t;24m{r&g;p7)Zuos?z8Bi&+b(#E>2=O#gu1DO5+4k;oK}-
zYYle|_5|D7d#maK&Go+F!lCV<#@lcy91OJ<NCQ&w@jyj`x22)3rLxZFuWG6Go%Wn5
zyYSDL$Owko65Qvn`M+6T)?d6F3|IE`_J%_>J>kAC_5JzyF3OuFrH2#ByCpi*Z>3A!
z>1tO0RfjU7m>`9!<Jk_20StB>$p$p+)4S;}oCZ)okEfX_?~{}m-w}H(Q2t0#6z+)4
z>*Fhl`U6F3(L&G>`=s-a67{awRNKmJhin6ZaS^1r9k^RQs<Xl}aI&t~Xkjl);3T7E
zVE;okM=3;7;<X@9VMhODW?qC$mbD0P<hM}7xK9sBMQ)P!ATpkT5}SC3X3e}8DUn^6
z%etMI!4xO@<CVyXT#fo=4@z{cJxxoi#anJUq)QVWc#utXVkrxBqEmDB;ILaBO?abv
z<jpANYx(!_${~3+q0Q)8qy+Rc^GMzC72L334r-fQSSuv0!8-hidPtsq8S-!$L>=43
z#3vC_ZgkmjUCcJ?TawV9;;Og|P4EG}!vk>>*n*L`nY4=8?Cu>XU;z`EWc({iaWml%
zPbL+}ekNf$J7Gj?!g7q=w~|JhWy)e-tYrVFNCe{n+qAd=tXw277`G59ZcDsPCFLj-
z+qQsZiX@MD>?A{r*vT|7ubmv$2GYq5U_3>)?<Pl*v@r*HXpA<Yi^c3DM-@hfK+Yxj
E8{)zP8UO$Q

delta 639
zcmYj~Pe>GT6vut<_iJ|CoY{4>Roql;U5S+bs7Ne9>mMZdU<-v}S!DX7q*U00W<d>6
zd8)%q?ZcfQ*uxw{c4&t{$}S=$9y~>V?9weYkiaNto25(d-9F#X`#ycOOkXWqxXzV@
z#aGhBtz~dZN=o9+EH9|g=FC>i`5jSbF=Iev541aC;3+d9HI_T~4*Zv=#wSM)iyNZd
zi48CBGp2<jQl6R>rZQ7acZN}R?oZze8+9UQ<b0r*&U}M;l*?w^#{=G*|Ht`0UoJZ$
zYwb01BKw>>B4>q-b&*};W`DBPq4n{wX>Vz!wsR)C?ZrD*IIV%ORp3%GHFc$L%v|be
zaY=*m2#uV8TI&CZrPLIIlXeGidJ}`NtH(eO(EC29r}`lF<`ck8{-;nVko+0;(<x-1
z><wu3jZAc36{FY83-@Z=2SL2)qxmqZq}Je|U5)698nhUhU06j`UD$8eVWTU$JeE$N
zuzQiaB7s(fh9<C?no}6FCy`TN0&Cs7DZCw_nGA*~l)=+>x+rJRIzme;p2OF0#C}_3
zYhHo*c($C%Wp*~dgFj1g8{A*NF~MQ?Ngs=bqNv~|{995~+*KOnO?aWRxTHl{k-x+r
z$|elLH+ZJdhQuOtOu}l?=b)RCKDOWrnOQ(zD!@;Em7UM~Stl0bA<C4o0SYRtNjjvi
zDD5isXe>&d3VZDe)jLXun8*iN94TJOj#ILd$*!)k6`)5CAz17<=<1bB2Umnx+aBnk
U58K${UJA3XlEaNfup1fv1xat#bpQYW