From fdcd047e6a68aa7f6ced3ae76255fcb6302de7c8 Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Fri, 6 Jun 2003 10:05:56 +0000
Subject: [PATCH] added check for valid email address before attempting to send mail

---
 lib/email/Email.inc | 67 ++++++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/lib/email/Email.inc b/lib/email/Email.inc
index e9e5f8d..a2d9eca 100644
--- a/lib/email/Email.inc
+++ b/lib/email/Email.inc
@@ -46,40 +46,45 @@ class Email {
      */
     function send($sToEmail, $sSubject, $sBody, $sFromEmail = "", $sFromName = "") {
         global $default, $lang_err_email;
-
-        // set defaults for optional params
-        $sFromEmail = ((strlen($sFromEmail) == 0) || ($sFromEmail == "")) ? $default->system->get("emailFrom") : $sFromEmail;
-        $sFromName = ((strlen($sFromName) == 0) || ($sFromName == "")) ? $default->system->get("emailFromName") : $sFromName;
-
-        // set optional params
-        if ((strlen($sFromEmail) > 0) && ($sFromEmail != "")) {
-            $this->oMailer->From = $sFromEmail;
-        }
-        if ((strlen($sFromName) > 0) && ($sFromName != "")) {
-            $this->oMailer->FromName = $sFromName;
-        }
         
-        // if there are multiple addresses (; separated)
-        $aEmailAddresses = array();
-        if (strpos($sToEmail, ";") > 0) {
-            // explode them
-            $aEmailAddresses = explode(";", $sToEmail);
-            for ($i=0; $i<count($aEmailAddresses); $i++) {
-                $this->oMailer->AddAddress($aEmailAddresses[$i]);
-                $default->log->info("Email.inc adding " . $aEmailAddresses[$i]);
-            }
+        if (strlen($sToEmail) > 0) {
+	        // set defaults for optional params
+	        $sFromEmail = ((strlen($sFromEmail) == 0) || ($sFromEmail == "")) ? $default->system->get("emailFrom") : $sFromEmail;
+	        $sFromName = ((strlen($sFromName) == 0) || ($sFromName == "")) ? $default->system->get("emailFromName") : $sFromName;
+	
+	        // set optional params
+	        if ((strlen($sFromEmail) > 0) && ($sFromEmail != "")) {
+	            $this->oMailer->From = $sFromEmail;
+	        }
+	        if ((strlen($sFromName) > 0) && ($sFromName != "")) {
+	            $this->oMailer->FromName = $sFromName;
+	        }
+	        
+	        // if there are multiple addresses (; separated)
+	        $aEmailAddresses = array();
+	        if (strpos($sToEmail, ";") > 0) {
+	            // explode them
+	            $aEmailAddresses = explode(";", $sToEmail);
+	            for ($i=0; $i<count($aEmailAddresses); $i++) {
+	                $this->oMailer->AddAddress($aEmailAddresses[$i]);
+	                $default->log->info("Email.inc adding " . $aEmailAddresses[$i]);
+	            }
+	        } else {
+	            $this->oMailer->AddAddress($sToEmail);
+	        }
+	        $this->oMailer->Subject = stripslashes($sSubject);
+	        $this->oMailer->Body = stripslashes($sBody);
+	
+	        //send the email
+	        if(!$this->oMailer->Send()) {
+	            $_SESSION["errorMessage"] = $lang_err_email . " " . $this->oMailer->ErrorInfo;
+	            return false;
+	        }
+	        return true;
         } else {
-            $this->oMailer->AddAddress($sToEmail);
+        	// no valid email address supplied
+        	return false;
         }
-        $this->oMailer->Subject = stripslashes($sSubject);
-        $this->oMailer->Body = stripslashes($sBody);
-
-        //send the email
-        if(!$this->oMailer->Send()) {
-            $_SESSION["errorMessage"] = $lang_err_email . " " . $this->oMailer->ErrorInfo;
-            return false;
-        }
-        return true;
     }
 
     /**
--
libgit2 0.21.4