Changeset 569 for branches/1.1dev/lib

Timestamp:

Oct 29, 2016 2:56:51 AM (8 years ago)

Author:

anonymous

Message:

Fixed email and form validation.

File:

• branches/1.1dev/lib/FormValidator.inc.php (modified) (2 diffs)

branches/1.1dev/lib/FormValidator.inc.php

@@ -414 +414 @@
                 // Check domain exists: It's a domain if ip2long fails; checkdnsrr ensures a MX record exists; gethostbyname() ensures the domain exists.
                 $this->addError($form_name, sprintf(_("The email address <em>%s</em> does not have a valid domain name."), oTxt(getFormData($form_name))), MSG_ERR, __FILE__, __LINE__);
-                $app->logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)));
+                logMsg(sprintf('%s (line %s) failed: %s', __METHOD__, __LINE__, getDump($val)));
                 return false;
             }
@@ -435 +435 @@
         $phone = getFormData($form_name);
 
-        $this->checkRegex($form_name, '/^[0-9 +().-]*$/', true, sprintf(_("The phone number <strong>%s</strong> is not valid."), $phone));
-        $this->stringLength($form_name, 0, 25, sprintf(_("The phone number <strong>%s</strong> is too long"), $phone));
+        if ($this->checkRegex($form_name, '/^[0-9 +().-]*$/', true, sprintf(_("The phone number <strong>%s</strong> is not valid."), $phone))
+        && $this->stringLength($form_name, 0, 25, sprintf(_("The phone number <strong>%s</strong> is too long"), $phone))) {
+            return true;
+        }
+        return false;
     }