added some email validation

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@811 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog
index 584c15148c9c88c244fc97942aa4be531f5ce195..554d45fde50a712362f2deb425c8559ede157796 100644 (file)
--- a/SOGo/UI/Contacts/ChangeLog
+++ b/SOGo/UI/Contacts/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * English.lproj/Localizable.strings: added text for invalid emails
+         (v0.9.25)
+
 2005-07-13  Helge Hess  <helge.hess@opengroupware.org>
 
        * UIxContactEditorBase.m: added a safeguard for vCard contacts

diff --git a/SOGo/UI/Contacts/English.lproj/Localizable.strings b/SOGo/UI/Contacts/English.lproj/Localizable.strings
index ceac8d480c9ef03cafb8c7a10405c8f239af20c0..bfe7e055ed690425e295afffe24388cd8edcd32d 100644 (file)
--- a/SOGo/UI/Contacts/English.lproj/Localizable.strings
+++ b/SOGo/UI/Contacts/English.lproj/Localizable.strings
@@ -34,3 +34,7 @@
 "Save"              = "Save";
 "Cancel"            = "Cancel";
 "Copy from Anais"   = "Copy from Anaïs";
+
+/* error */
+
+"invalidemailwarn"  = "Invalid E-Mail Field, Continue?";

diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version
index 097fb071ecacfe46f2e29ea6692bc7ef84c2cceb..931bb0747560e143e40e9a7445fd084fa6875be8 100644 (file)
--- a/SOGo/UI/Contacts/Version
+++ b/SOGo/UI/Contacts/Version
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
-SUBMINOR_VERSION:=24
+SUBMINOR_VERSION:=25
 
 # v0.9.18 requires NGExtensions v4.5.136
 # v0.9.16 requires libSOGoUI    v0.9.16

diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog
index 574cdefc75c6f0dc738b3f14571a1f08f7260b65..8bb43e210e2d7437c4f5f43d70253c5f81385309 100644 (file)
--- a/SOGo/UI/WebServerResources/ChangeLog
+++ b/SOGo/UI/WebServerResources/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-18  Helge Hess  <helge.hess@opengroupware.org>
 
+       * generic.js: added regex for email field checks
+
        * uix.css: added .homepagefont class (as it was used in the deprecated
          uix.css inside Common
 

diff --git a/SOGo/UI/WebServerResources/generic.js b/SOGo/UI/WebServerResources/generic.js
index aec909d2d9c5289793cfa14358bd752445e7e437..2c2b0a0ed84e1c1df6788276ec9abab0e368ec46 100644 (file)
--- a/SOGo/UI/WebServerResources/generic.js
+++ b/SOGo/UI/WebServerResources/generic.js
@@ -20,6 +20,8 @@
 */
 /* some generic JavaScript code for SOGo */
 
+// TODO: replace things with Prototype where applicable
+
 /* generic stuff */
 
 function ml_stripActionInURL(url) {
@@ -34,6 +36,16 @@ function ml_stripActionInURL(url) {
   return url;
 }
 
+/* emails */
+
+var uixEmailUsr = 
+  "([a-zA-Z0-9][a-zA-Z0-9_.-]*|\"([^\\\\\x80-\xff\015\012\"]|\\\\[^\x80-\xff])+\")";
+var uixEmailDomain = 
+  "([a-zA-Z0-9][a-zA-Z0-9._-]*\\.)*[a-zA-Z0-9][a-zA-Z0-9._-]*\\.[a-zA-Z]{2,5}";
+var uixEmailRegex = new RegExp("^"+uixEmailUsr+"\@"+uixEmailDomain+"$");
+
+/* escaping */
+
 function escapeHTML(s) {
         s = s.replace(/&/g, "&");
         s = s.replace(/</g, "&lt;");