From b94b89c69195a0708add8dedb1721f12bcafbf8c Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Mon, 28 Apr 2008 23:18:00 +0000
Subject: Added a valid_emails rule to the Validation class.

---
 system/database/drivers/mysql/mysql_driver.php |  5 +----
 system/libraries/Validation.php                | 27 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

(limited to 'system')

diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index 2bc66ecf2..f435c0bc4 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -314,11 +314,8 @@ class CI_DB_mysql_driver extends CI_DB {
 	
 		$query = $this->query($this->_count_string . $this->_protect_identifiers('numrows'). " FROM " . $this->_protect_identifiers($this->dbprefix.$table));
 		
-		if ($query->num_rows() == 0)
-			return '0';
-
 		$row = $query->row();
-		return $row->numrows;
+		return (int)$row->numrows;
 	}
 
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index d0714d040..18fdba2d3 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -487,6 +487,33 @@ class CI_Validation {
 
 	// --------------------------------------------------------------------
 	
+	/**
+	 * Valid Emails
+	 *
+	 * @access	public
+	 * @param	string
+	 * @return	bool
+	 */	
+	function valid_emails($str)
+	{
+		if (strpos($str, ',') === FALSE)
+		{
+			return $this->valid_email(trim($str));
+		}
+		
+		foreach(explode(',', $str) as $email)
+		{
+			if (trim($email) != '' && $this->valid_email(trim($email)) === FALSE)
+			{
+				return FALSE;
+			}
+		}
+		
+		return TRUE;
+	}
+
+	// --------------------------------------------------------------------
+	
 	/**
 	 * Validate IP Address
 	 *
-- 
cgit v1.2.3-24-g4f1b