Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r15541 -r15545
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15541)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15545)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 15541 2012-09-14 15:38:40Z alex $
+* @version	$Id: users_event_handler.php 15545 2012-09-27 10:54:08Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -289,8 +289,8 @@
 			$password = $object->GetDBField('UserPassword');
 			$remember_login = $object->GetDBField('UserRememberLogin') == 1;
 
-			$user_helper = $this->Application->recallObject('UserHelper');
 			/* @var $user_helper UserHelper */
+			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->event =& $event;
 			$result = $user_helper->loginUser($username, $password, false, $remember_login);
@@ -335,8 +335,8 @@
 				return ;
 			}
 
-			$user_helper = $this->Application->recallObject('UserHelper');
 			/* @var $user_helper UserHelper */
+			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->loginUser('', '', false, false, $remember_login_cookie);
 		}
@@ -381,8 +381,8 @@
 		 */
 		protected function OnLogout($event)
 		{
-			$user_helper = $this->Application->recallObject('UserHelper');
 			/* @var $user_helper UserHelper */
+			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user_helper->event =& $event;
 			$user_helper->logoutUser();
@@ -496,8 +496,8 @@
 			/* @var $object UsersItem */
 
 			if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
-				$user_helper = $this->Application->recallObject('UserHelper');
 				/* @var $user_helper UserHelper */
+				$user_helper = $this->Application->recallObject('UserHelper');
 
 				$user =& $user_helper->getUserObject();
 				$user->Load($object->GetID());
@@ -540,8 +540,8 @@
 
 			$this->setUserGroup($object);
 
-			$user_helper = $this->Application->recallObject('UserHelper');
 			/* @var $user_helper UserHelper */
+			$user_helper = $this->Application->recallObject('UserHelper');
 
 			if ( !$user_helper->checkBanRules($object) ) {
 				$object->SetError('Username', 'banned');
@@ -1147,8 +1147,8 @@
 					break;
 
 				case 'forgot':
-					$user_helper = $this->Application->recallObject('UserHelper');
 					/* @var $user_helper UserHelper */
+					$user_helper = $this->Application->recallObject('UserHelper');
 
 					$id = $user_helper->validateUserCode($this->Application->GetVar('user_key'), 'forgot_password');
 
@@ -1173,7 +1173,7 @@
 		 */
 		function OnUpdateRootPassword($event)
 		{
-			return $this->OnUpdatePassword($event);
+			$this->OnUpdatePassword($event);
 		}
 
 		/**
@@ -1866,7 +1866,9 @@
 		 */
 		function OnAfterLogin($event)
 		{
-
+			if ( is_object($event->MasterEvent) && !$this->Application->isAdmin ) {
+				$event->MasterEvent->SetRedirectParam('login', 1);
+			}
 		}
 
 		/**
@@ -1876,7 +1878,9 @@
 		 */
 		function OnBeforeLogout($event)
 		{
-
+			if ( is_object($event->MasterEvent) && !$this->Application->isAdmin ) {
+				$event->MasterEvent->SetRedirectParam('logout', 1);
+			}
 		}
 
 		/**
@@ -1906,8 +1910,8 @@
 			$event->CallSubEvent('OnUpdate');
 
 			if ( $event->status == kEvent::erSUCCESS ) {
+				/* @var $user_helper UserHelper */
 				$user_helper = $this->Application->recallObject('UserHelper');
-		    	/* @var $user_helper UserHelper */
 
 			    $user =& $user_helper->getUserObject();
 				$user->Load( $object->GetID() );
@@ -1949,8 +1953,8 @@
 		 */
 		protected function OnLoginAs(kEvent $event)
 		{
-			$user_helper = $this->Application->recallObject('UserHelper');
 			/* @var $user_helper UserHelper */
+			$user_helper = $this->Application->recallObject('UserHelper');
 
 			$user =& $user_helper->getUserObject();
 			$user->Load( $this->Application->GetVar('user_id') );