Fixed for compatibility with php 5.3

qcodo · Feb 24, 2010 · 960220c · 960220c
1 parent e72f257
commit 960220c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/includes/qcodo/qform/EmailTextBox.class.php b/includes/qcodo/qform/EmailTextBox.class.php
@@ -8,9 +8,12 @@ class EmailTextBox extends QTextBox {
 		//////////
 		public function Validate() {
 			if (parent::Validate()) {
-				if ($this->strText != "") {
+				if (strlen(trim($this->strText))) {
 					// RegExp taken from php.net
-					if ( !eregi("^[a-z0-9]+([_\\.-][a-z0-9]+)*"."@([a-z0-9]+([\.-][a-z0-9]{1,})+)*$", $this->strText) ) {
+					$this->strText = trim($this->strText);
+					$strEmailAddressArray = QEmailServer::GetEmailAddresses($this->strText);
+					if ((count($strEmailAddressArray) != 1) ||
+						(strtolower($strEmailAddressArray[0]) != strtolower($this->strText))) {
 						$this->strValidationError = "Invalid e-mail address";
 						return false;
 					}