From b94b89c69195a0708add8dedb1721f12bcafbf8c Mon Sep 17 00:00:00 2001 From: Derek Allard 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 ++++++++++++++++++++++++++ user_guide/changelog.html | 1 + user_guide/libraries/validation.html | 7 ++++++- 4 files changed, 35 insertions(+), 5 deletions(-) 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 * diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 767dd2a48..ef1b7ace7 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -83,6 +83,7 @@ SVN Commit: not currently released

  • The MySQLi forge class is now in sync with MySQL forge.
  • Added the ability to set CRLF settings via config in the Email class.
  • Unit Testing results are now colour coded, and a change was made to the default template of results.
    • +
  • Added a valid_emails rule to the Validation class.
  • Helpers diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html index 815b542be..e539fbfa8 100644 --- a/user_guide/libraries/validation.html +++ b/user_guide/libraries/validation.html @@ -18,7 +18,6 @@ - @@ -596,6 +595,12 @@ For example, your "username" error will be available at:
    $this->valida Returns FALSE if the form element does not contain a valid email address.   + + valid_emails + No + Returns FALSE if any value provided in a comma separated list is not a valid email. +   + valid_ip No -- cgit v1.2.3-24-g4f1b