From 4bf30d1fcaf055fbe41bc72f3beb4bece97052a0 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 23 Oct 2019 00:08:29 +0200 Subject: [PATCH] Trimming emailaddress from user --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.rs b/src/main.rs index 741c51e..18c5c78 100644 --- a/src/main.rs +++ b/src/main.rs @@ -103,7 +103,7 @@ fn validate_name(name: &String) -> bool { fn validate_email(email: &String) -> bool { // Check if the emailaddress is valid // This function is not completely correct: emailregex.com - Regex::new(r"^[a-zA-Z0-9\.\-_]+@[a-zA-Z0-9\-\.]+\.[a-zA-Z]+$").unwrap().is_match(email) + Regex::new(r"^[a-zA-Z0-9\.\-_]+@[a-zA-Z0-9\-\.]+\.[a-zA-Z]+$").unwrap().is_match(email.trim()) } fn validate_guests(guests: &u8) -> bool { @@ -247,7 +247,7 @@ fn submit_task (host: HostHeader, if x.guests > 0 { // Send email about attendaning wedding result = send_email(&x.name, - &x.email, + &x.email.trim().to_string(), &language_strings.attending_email.subject, &strfmt(&language_strings.attending_email.message, &vars).unwrap(), Some(&language_strings.attending_email.attachment), //attachment @@ -256,7 +256,7 @@ fn submit_task (host: HostHeader, } else { // Send email about not attending wedding result = send_email(&x.name, - &x.email, + &x.email.trim().to_string(), &language_strings.not_attending_email.subject, &strfmt(&language_strings.not_attending_email.message, &vars).unwrap(), None, // No attachment