Changeset 305

Timestamp:

Jan 29, 2008 8:54:39 AM (16 years ago)

Author:

quinn

Message:

Fixed some errors in validateEmail.

File:

• trunk/lib/FormValidator.inc.php (modified) (2 diffs)

trunk/lib/FormValidator.inc.php

@@ -433 +433 @@
 
         if ('' == trim($email)) {
-            // No email address provided, and that's okay
+            // No email address provided, and that's okay.
             return true;
         }
@@ -441 +441 @@
         case VALIDATE_EMAIL_REGEX_FAIL:
             // Failed regex match.
-            $this->addError($form_name, sprintf(_("<em>%s</em> is not a valid email address."), oTxt($email)));
-            $app->logMsg(sprintf('The email address %s is not valid.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
+            $this->addError($form_name, sprintf(_("The email address <em>%s</em> is formatted incorrectly."), oTxt($email)));
+            $app->logMsg(sprintf('The email address %s is not valid.', oTxt($email)), LOG_DEBUG, __FILE__, __LINE__);
             return false;
             break;
+            
         case VALIDATE_EMAIL_LENGTH_FAIL :
             // Failed length requirements.
-            $this->addError($form_name, sprintf(_("<em>Email address</em> must contain less than 256 characters."), oTxt($email)));
-            $app->logMsg(sprintf('The email address %s must contain less than 256 characters.', getFormData($form_name)), LOG_DEBUG, __FILE__, __LINE__);
+            $this->addError($form_name, sprintf(_("The email address <em>%s</em> is too long (email addresses must have fewer than 256 characters)."), oTxt($email)));
+            $app->logMsg(sprintf('The email address %s must contain less than 256 characters.', oTxt($email)), LOG_DEBUG, __FILE__, __LINE__);
             return false;
             break;
+            
         case VALIDATE_EMAIL_MX_FAIL :
             // Failed MX record test.
-            $this->addError($form_name, sprintf(_("<em>%s</em> is not a valid email domain name"), oTxt($domain)));
-            $app->logMsg(sprintf('The email address %s contains an invalid email domain name (%s).', getFormData($form_name), $domain), LOG_INFO, __FILE__, __LINE__);
+            $this->addError($form_name, sprintf(_("The email address <em>%s</em> does not have a valid domain name"), oTxt($email));
+            $app->logMsg(sprintf('The email address %s does not have a valid domain name.', oTxt($email)), LOG_INFO, __FILE__, __LINE__);
             return false;
             break;
+            
         case VALIDATE_EMAIL_SUCCESS :
         default :