[eGroupWare-cvs] felamimail/inc class.bofelamimail.inc.php,1.19,1.20

[<lkn...@us...>]

Update of /cvsroot/egroupware/felamimail/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv6540

Modified Files:
	class.bofelamimail.inc.php 
Log Message:
apply hooks only when profile > 0 and is_numeric


Index: class.bofelamimail.inc.php
===================================================================
RCS file: /cvsroot/egroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** class.bofelamimail.inc.php	28 Sep 2003 16:03:19 -0000	1.19
--- class.bofelamimail.inc.php	30 Sep 2003 05:52:07 -0000	1.20
***************
*** 81,88 ****
  		function addAccount($_hookValues)
  		{
! 			$hookData = array(
! 				'profileID'	=> $this->profileID,
! 				'hookValues'	=> $_hookValues);
! 			ExecMethod('emailadmin.bo.addAccount',$hookData);
  		}
  		
--- 81,91 ----
  		function addAccount($_hookValues)
  		{
! 			if($this->profileID > 0 && is_numeric($this->profileID))
! 			{
! 				$hookData = array(
! 					'profileID'	=> $this->profileID,
! 					'hookValues'	=> $_hookValues);
! 				ExecMethod('emailadmin.bo.addAccount',$hookData);
! 			}
  		}
  		
***************
*** 205,212 ****
  		function deleteAccount($_hookValues)
  		{
! 			$hookData = array(
! 				'profileID'	=> $this->profileID,
! 				'hookValues'	=> $_hookValues);
! 			ExecMethod('emailadmin.bo.deleteAccount',$hookData);
  		}
  		
--- 208,218 ----
  		function deleteAccount($_hookValues)
  		{
! 			if($this->profileID > 0 && is_numeric($this->profileID))
! 			{
! 				$hookData = array(
! 					'profileID'	=> $this->profileID,
! 					'hookValues'	=> $_hookValues);
! 				ExecMethod('emailadmin.bo.deleteAccount',$hookData);
! 			}
  		}
  		
***************
*** 1459,1487 ****
  		function updateAccount($_hookValues)
  		{
! 			$hookData = array(
! 				'profileID'	=> $this->profileID,
! 				'hookValues'	=> $_hookValues);
! 			ExecMethod('emailadmin.bo.updateAccount',$hookData);
! 		}
! 		
! 		function validate_email($_emailAddress)
! 		{
! 			if($val != "")
! 			{
! 				$pattern = "/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-]+)+/";
! 				if(preg_match($pattern, $val))
! 				{
! 					return true;
! 				}
! 				else
! 				{
! 					return false;
! 				}
! 			}
! 			else
  			{
! 				return false;
  			}
  		}
  	}
  ?>
--- 1465,1496 ----
  		function updateAccount($_hookValues)
  		{
! 			if($this->profileID > 0 && is_numeric($this->profileID))
  			{
! 				$hookData = array(
! 					'profileID'	=> $this->profileID,
! 					'hookValues'	=> $_hookValues);
! 				ExecMethod('emailadmin.bo.updateAccount',$hookData);
  			}
  		}
+ 		
+ #		function validate_email($_emailAddress)
+ #		{
+ #			if($val != "")
+ #			{
+ #				$pattern = "/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-]+)+/";
+ #				if(preg_match($pattern, $val))
+ #				{
+ #					return true;
+ #				}
+ #				else
+ #				{
+ #					return false;
+ #				}
+ #			}
+ #			else
+ #			{
+ #				return false;
+ #			}
+ #		}
  	}
  ?>