Index: branches/5.2.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14092)
+++ branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: user_helper.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -40,7 +40,7 @@
 			}
 
 			if (!$password && !$remember_login_cookie) {
-				return LOGIN_RESULT_INVALID_PASSWORD;
+				return LoginResult::INVALID_PASSWORD;
 			}
 
 			$object =& $this->getUserObject();
@@ -62,7 +62,7 @@
 				$password_formatter =& $this->Application->recallObject('kPasswordFormatter');
 
 				if ($root_password != $password_formatter->EncryptPassword($password, 'b38')) {
-					return LOGIN_RESULT_INVALID_PASSWORD;
+					return LoginResult::INVALID_PASSWORD;
 				}
 
 				$user_id = USER_ROOT;
@@ -83,7 +83,7 @@
 					$this->_processInterfaceLanguage();
 				}
 
-				return LOGIN_RESULT_OK;
+				return LoginResult::OK;
 			}
 
 			$user_id = $this->getUserId($username, $password, $remember_login_cookie);
@@ -92,12 +92,12 @@
 				$object->Load($user_id);
 
 				if (!$this->checkBanRules($object)) {
-					return LOGIN_RESULT_BANNED;
+					return LoginResult::BANNED;
 				}
 
 				if ($object->GetDBField('Status') == STATUS_ACTIVE) {
 					if ( !$this->checkLoginPermission() ) {
-						return LOGIN_RESULT_NO_PERMISSION;
+						return LoginResult::NO_PERMISSION;
 					}
 
 					if (!$dry_run) {
@@ -118,7 +118,7 @@
 						}
 					}
 
-					return LOGIN_RESULT_OK;
+					return LoginResult::OK;
 				}
 				else {
 					$pending_template = $this->Application->GetVar('pending_disabled_template');
@@ -129,7 +129,7 @@
 					}
 					else {
 						// when no notification template given return an error
-						return LOGIN_RESULT_INVALID_PASSWORD;
+						return LoginResult::INVALID_PASSWORD;
 					}
 				}
 			}
@@ -139,7 +139,7 @@
 //				$this->event->SetRedirectParam('pass_category', 1); // to test
 			}
 
-			return LOGIN_RESULT_INVALID_PASSWORD;
+			return LoginResult::INVALID_PASSWORD;
 		}
 
 		/**
@@ -203,7 +203,7 @@
 				$this->event = new kEvent('u:OnLogout');
 			}
 
-			$sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
+			$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
 			$sync_manager->performAction('LogoutUser');
 
 			$this->Application->HandleEvent($dummy, 'session-log:OnEndSession');
@@ -275,7 +275,7 @@
 			}
 
 			// syncronize login
-			$sync_manager =& $this->Application->recallObjectP('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize');
+			$sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize'));
 			$sync_manager->performAction('LoginUser', $username, $password);
 		}
 
@@ -326,7 +326,7 @@
 		 */
 		function verifySuperAdmin()
 		{
-			$sa_mode = ipMatch(defined('SA_IP') ? SA_IP : '');
+			$sa_mode = kUtil::ipMatch(defined('SA_IP') ? SA_IP : '');
 			return $sa_mode || $this->Application->isDebugMode();
 		}