Use email_valid() to check email addresses throughout

diff --git a/cgi/actions.c b/cgi/actions.c
index a139eaf681f68af7fea8a883b694e6b7a22eb892..4d064e0fb8e86c8ae6a44e0360b0992eed8165e3 100644 (file)
--- a/cgi/actions.c
+++ b/cgi/actions.c
@@ -435,8 +435,7 @@ static void act_register(void) {
   }
   /* We could well do better address validation but for now we'll just do the
    * minimum */
   }
   /* We could well do better address validation but for now we'll just do the
    * minimum */

-   /* TODO use email_valid() */
-  if(!strchr(email, '@')) {
+  if(!email_valid(email)) {

     login_error("bademail");
     return;
   }
     login_error("bademail");
     return;
   }


@@ -525,8 +524,7 @@ static void act_edituser(void) {
     }
   } else
     password = password2 = 0;
     }
   } else
     password = password2 = 0;

-  /* TODO use email_valid() */
-  if(email && !strchr(email, '@')) {
+  if(email && !email_valid(email)) {

     login_error("bademail");
     return;
   }
     login_error("bademail");
     return;
   }

diff --git a/lib/trackdb.c b/lib/trackdb.c
index 3647f1068639ea755a4e63c8a505f5798a6f594c..08aeac2677b38befc531960c76504abfaeaf0697 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -60,6 +60,7 @@
 #include "unicode.h"
 #include "unidata.h"
 #include "base64.h"
 #include "unicode.h"
 #include "unidata.h"
 #include "base64.h"

+#include "sendmail.h"

 
 #define RESCAN "disorder-rescan"
 #define DEADLOCK "disorder-deadlock"
 
 #define RESCAN "disorder-rescan"
 #define DEADLOCK "disorder-deadlock"


@@ -2784,8 +2785,8 @@ int trackdb_edituserinfo(const char *user,
     }
   } else if(!strcmp(key, "email")) {
     if(*value) {
     }
   } else if(!strcmp(key, "email")) {
     if(*value) {

-      if(!strchr(value, '@')) {
-        error(0, "invalid email address '%s' for user '%s'", user, value);
+      if(!email_valid(value)) {
+        error(0, "invalid email address '%s' for user '%s'", value, user);

         return -1;
       }
     } else
         return -1;
       }
     } else

diff --git a/server/server.c b/server/server.c
index ad3a7ab9e773663ad6989fc883fe03339fa68426..c4c889a448f909d6b9bcff26dc14d90d6760735b 100644 (file)
--- a/server/server.c
+++ b/server/server.c
@@ -1426,9 +1426,8 @@ static int c_reminder(struct conn *c,
     sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
     return 1;
   }
     sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
     return 1;
   }

-  /* TODO use email_valid() */

   if(!(email = kvp_get(k, "email"))
   if(!(email = kvp_get(k, "email"))

-     || !strchr(email, '@')) {
+     || !email_valid(email)) {

     error(0, "user '%s' has no valid email address", vec[0]);
     sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
     return 1;
     error(0, "user '%s' has no valid email address", vec[0]);
     sink_writes(ev_writer_sink(c->w), "550 Cannot send a reminder email\n");
     return 1;