Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r13840 -r14095
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 13840)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 13773 2010-06-15 18:26:04Z alex $
+* @version	$Id: users_event_handler.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -219,18 +219,18 @@
 			$user_helper->event =& $event;
 			$result = $user_helper->loginUser($username, $password, false, $rember_login);
 
-			if ($result != LOGIN_RESULT_OK) {
+			if ($result != LoginResult::OK) {
 				$object =& $user_helper->getUserObject();
 
-				if ($result == LOGIN_RESULT_NO_PERMISSION) {
+				if ($result == LoginResult::NO_PERMISSION) {
 					$object->SetError('ValidateLogin', 'no_permission', 'la_no_permissions');
 				}
 				else {
 					$object->SetID(USER_GUEST);
 					$object->SetError('ValidateLogin', 'invalid_password', 'la_invalid_password');
 				}
 
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 			}
 		}
 
@@ -260,12 +260,12 @@
 		 */
 		function OnInpLogin(&$event)
 		{
-			$sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
+			$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
 			$sync_manager->performAction('LoginUser', $event->getEventParam('user'), $event->getEventParam('pass') );
 
 			if ($event->redirect && is_string($event->redirect)) {
 				// some real template specified instead of true
-				$this->Application->Redirect($event->redirect, $event->redirect_params);
+				$this->Application->Redirect($event->redirect, $event->getRedirectParams());
 			}
 		}
 
@@ -276,7 +276,7 @@
 		 */
 		function OnInpLogout(&$event)
 		{
-			$sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
+			$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
 			$sync_manager->performAction('LogoutUser');
 		}
 
@@ -305,7 +305,7 @@
 				$object =& $event->getObject();
 
 				$ug_table = TABLE_PREFIX.'UserGroup';
-				if ($object->mode == 't') {
+				if ($object->IsTempTable()) {
 					$ug_table = $this->Application->GetTempName($ug_table, 'prefix:'.$event->Prefix);
 				}
 
@@ -419,7 +419,7 @@
 				$object =& $event->getObject( Array('skip_autoload' => true) );
 				$this->OnUpdate($event);
 
-				if ($event->status == erSUCCESS) {
+				if ($event->status == kEvent::erSUCCESS) {
 					$this->OnAfterItemCreate($event);
 					$object->SendEmailEvents();
 
@@ -447,7 +447,7 @@
 				$object =& $event->getObject( Array('skip_autoload' => true) );
 				/* @var $object kDBItem */
 				if ($this->Application->ConfigValue('User_Password_Auto')) {
-					$pass = makepassword4(rand(5,8));
+					$pass = kUtil::generatePassword(rand(5,8));
 					$object->SetField('Password', $pass);
 					$object->SetField('VerifyPassword', $pass);
 					$this->Application->SetVar('user_password',$pass);
@@ -458,7 +458,7 @@
 
 				$this->setNextTemplate($event);
 
-				if (!$this->Application->isAdmin && ($event->status == erSUCCESS) && $event->redirect) {
+				if (!$this->Application->isAdmin && ($event->status == kEvent::erSUCCESS) && $event->redirect) {
 					$object->SendEmailEvents();
 					$this->autoLoginUser($event);
 				}
@@ -534,7 +534,7 @@
 			/* @var $user_helper UserHelper */
 
 			if (!$user_helper->checkBanRules($object)) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				return ;
 			}
 		}
@@ -577,7 +577,7 @@
 						WHERE email = ' . $this->Conn->qstr($friend_email) . ' AND sent < ' . $cutoff;
              	if ($this->Conn->GetRow($sql) !== false) {
              		$object->SetError('Email', 'send_error', 'lu_email_already_suggested');
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 					return ;
              	}*/
 
@@ -589,28 +589,28 @@
 				$email_event =& $this->Application->EmailEventUser('USER.SUGGEST', $user_id, $send_params);
 				$email_event =& $this->Application->EmailEventAdmin('USER.SUGGEST');
 
-				if ($email_event->status == erSUCCESS){
+				if ($email_event->status == kEvent::erSUCCESS){
 					/*$fields_hash = Array (
 						'email' => $friend_email,
 						'sent' => adodb_mktime(),
 					);
 
 					$this->Conn->doInsert($fields_hash, TABLE_PREFIX . 'SuggestMail');*/
 
-					$event->redirect_params = array('opener' => 's', 'pass' => 'all');
+					$event->setRedirectParams(Array('opener' => 's', 'pass' => 'all'), true);
 					$event->redirect = $this->Application->GetVar('template_success');
 				}
 				else {
-//					$event->redirect_params = array('opener' => 's', 'pass' => 'all');
+//					$event->setRedirectParams(Array('opener' => 's', 'pass' => 'all'), true);
 //					$event->redirect = $this->Application->GetVar('template_fail');
 
 					$object->SetError('Email', 'send_error', 'lu_email_send_error');
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 				}
 		    }
 		    else {
 		    	$object->SetError('Email', 'invalid_email', 'lu_InvalidEmail');
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 		    }
 		}
 
@@ -675,7 +675,7 @@
 				/* @var $object UsersItem */
 
 				$object->SetError('SubscribeEmail', 'invalid_email', 'lu_InvalidEmail');
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 			}
 		}
 
@@ -850,7 +850,7 @@
 					}
 				}
 
-				if($user_current_object->FieldErrors){
+				if ( $user_current_object->HasErrors() ) {
 					$event->redirect = false;
 				}
 			}
@@ -885,7 +885,7 @@
 			$passed_key = trim($this->Application->GetVar('user_key'));
 
 		    if (!$passed_key) {
-				$event->redirect_params = Array('opener' => 's', 'pass' => 'all');
+				$event->setRedirectParams(Array('opener' => 's', 'pass' => 'all'), true);
 				$event->redirect = false;
 
 				$user_current_object->SetError('PwResetConfirm', 'code_is_not_valid', 'lu_code_is_not_valid');
@@ -902,7 +902,7 @@
 		      	$user_object->SetDBField('PwRequestTime', 0);
 
 		      	if ($exp_time > adodb_mktime()) {
-			    	$newpw = makepassword4();
+			    	$newpw = kUtil::generatePassword();
 
 			    	$this->Application->StoreVar('password', $newpw);
 
@@ -921,8 +921,8 @@
 
 			     	$this->Application->DeleteVar('ForgottenPassword');
 
-			      	if ($email_event_user->status == erSUCCESS) {
-						$event->redirect_params = array('opener' => 's', 'pass' => 'all');
+			      	if ($email_event_user->status == kEvent::erSUCCESS) {
+						$event->setRedirectParams(array('opener' => 's', 'pass' => 'all'), true);
 						$event->redirect = $this->Application->GetVar('template_success');
 					}
 		      	} else {
@@ -974,7 +974,7 @@
 				return ;
 			}
 
-			$event->redirect_params['opener'] = 's';
+			$event->SetRedirectParam('opener', 's');
 			$object =& $event->getObject();
 
 			if ($object->GetDBField('Status') == STATUS_ACTIVE) {
@@ -1044,7 +1044,7 @@
 		function OnRefreshForm(&$event)
 		{
 			$event->redirect = false;
-			$item_info = $this->Application->GetVar($event->Prefix_Special);
+			$item_info = $this->Application->GetVar($event->getPrefixSpecial());
 			list($id, $fields) = each($item_info);
 
 			$object =& $event->getObject( Array('skip_autoload' => true) );
@@ -1167,7 +1167,7 @@
 					$event->SetRedirectParam('opener', 'u');
 				}
 				else {
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 					return;
 				}
@@ -1177,7 +1177,7 @@
 				$object->SetFieldsFromHash($field_values);
 
 				if (!$object->Update()) {
-					$event->status = erFAIL;
+					$event->status = kEvent::erFAIL;
 					$event->redirect = false;
 				}
 			}
@@ -1216,7 +1216,7 @@
 		function OnMassResetSettings(&$event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				return;
 			}
 
@@ -1432,11 +1432,11 @@
 		function OnMassCloneUsers(&$event)
 		{
 			if ($this->Application->CheckPermission('SYSTEM_ACCESS.READONLY', 1)) {
-				$event->status = erFAIL;
+				$event->status = kEvent::erFAIL;
 				return;
 			}
 
-			$event->status=erSUCCESS;
+			$event->status=kEvent::erSUCCESS;
 			$ids = $this->StoreSelectedIDs($event);
 
 			$this->Application->SetVar('skip_set_primary', 1); // otherwise it will default primary group, search for skip_set_primary above
@@ -1602,7 +1602,7 @@
 		{
 			parent::OnPreCreate($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$this->_makePasswordRequired($event);
 			}
 		}
@@ -1616,7 +1616,7 @@
 		{
 			parent::OnNew($event);
 
-			if ($event->status == erSUCCESS) {
+			if ($event->status == kEvent::erSUCCESS) {
 				$this->_makePasswordRequired($event);
 			}
 		}