Index: branches/5.0.x/core/units/users/users_item.php
===================================================================
diff -u -r12117 -r12159
--- branches/5.0.x/core/units/users/users_item.php	(.../users_item.php)	(revision 12117)
+++ branches/5.0.x/core/units/users/users_item.php	(.../users_item.php)	(revision 12159)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_item.php 11892 2009-07-01 08:35:06Z alex $
+* @version	$Id: users_item.php 12159 2009-08-01 13:31:10Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -48,22 +48,16 @@
 
 		function SendEmailEvents()
 		{
-			switch( $this->GetDBField('Status') )
-			{
-				case 1:
-					if ($this->Application->ConfigValue('User_Password_Auto')) {
-						$this->Application->EmailEventAdmin('USER.VALIDATE', $this->GetID() );
-						$this->Application->EmailEventUser('USER.VALIDATE', $this->GetID() );
-					}
-					else {
-						$this->Application->EmailEventAdmin('USER.ADD', $this->GetID() );
-						$this->Application->EmailEventUser('USER.ADD', $this->GetID() );
-					}
+			switch ($this->GetDBField('Status')) {
+				case STATUS_ACTIVE:
+					$event_name = $this->Application->ConfigValue('User_Password_Auto') ? 'USER.VALIDATE' : 'USER.ADD';
+					$this->Application->EmailEventAdmin($event_name, $this->GetID());
+					$this->Application->EmailEventUser($event_name, $this->GetID());
 					break;
 
-				case 2:
-					$this->Application->EmailEventAdmin('USER.ADD.PENDING', $this->GetID() );
-					$this->Application->EmailEventUser('USER.ADD.PENDING', $this->GetID() );
+				case STATUS_PENDING:
+					$this->Application->EmailEventAdmin('USER.ADD.PENDING', $this->GetID());
+					$this->Application->EmailEventUser('USER.ADD.PENDING', $this->GetID());
 					break;
 			}
 		}