Index: branches/5.3.x/core/units/users/users_config.php
===================================================================
diff -u -N -r15659 -r15677
--- branches/5.3.x/core/units/users/users_config.php	(.../users_config.php)	(revision 15659)
+++ branches/5.3.x/core/units/users/users_config.php	(.../users_config.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 15659 2013-01-02 17:25:37Z alex $
+* @version	$Id: users_config.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -344,9 +344,17 @@
 					'unique' => Array (), 'default' => '',
 				),
 				'Password' => Array (
-					'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword',
-					'default' => 'd41d8cd98f00b204e9800998ecf8427e'
+					'formatter' => 'kPasswordFormatter', 'hashing_method_field' => 'PasswordHashingMethod', 'verify_field' => 'VerifyPassword',
+					'default' => ''
 				),
+				'PasswordHashingMethod' => Array (
+					'formatter' => 'kOptionsFormatter', 'options' => Array (
+						PasswordHashingMethod::MD5 => 'md5',
+						PasswordHashingMethod::MD5_AND_PHPPASS => 'md5+phppass',
+						PasswordHashingMethod::PHPPASS => 'phppass'
+					),
+					'default' => PasswordHashingMethod::PHPPASS
+				),
 				'FirstName' => Array ('default' => ''),
 				'LastName' => Array ('default' => ''),
 				'Company' => Array ('default' => ''),
@@ -429,8 +437,8 @@
 			'VirtualFields' => Array (
 				'PrimaryGroup' => Array ('default' => ''),
 				'RootPassword' => Array (
-					'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5',
-					'verify_field' => 'VerifyRootPassword', 'default' => 'd41d8cd98f00b204e9800998ecf8427e'
+					'formatter' => 'kPasswordFormatter', 'hashing_method' => PasswordHashingMethod::PHPPASS, 'salt' => 'b38',
+					'verify_field' => 'VerifyRootPassword', 'default' => 'b38:d41d8cd98f00b204e9800998ecf8427e'
 				),
 				'EmailPassword' => Array ('default' => ''),
 				'FullName' => Array ('default' => ''),
@@ -488,18 +496,10 @@
 					'error_msgs' => Array (
 						'required' => '!lu_ferror_forgotpw_nodata!',
 						'unknown_username' => '!lu_ferror_unknown_username!',
-						'reset_denied' => '!lu_ferror_reset_denied!',
-					),
-					'default' => ''
-				),
-				'ForgotEmail' => Array (
-					'type' => 'string',
-					'error_msgs' => Array (
-						'required' => '!lu_ferror_forgotpw_nodata!',
 						'unknown_email' => '!lu_ferror_unknown_email!',
 						'reset_denied' => '!lu_ferror_reset_denied!',
 					),
-					'default' => ''
+					'required' => 1, 'default' => ''
 				),
 			),
 		),
@@ -527,6 +527,7 @@
 		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1),
 		'Username' => Array ('type' => 'string', 'not_null' => 1),
 		'Password' => Array ('type' => 'string', 'skip_empty' => 1),
+		'PasswordHashingMethod' => Array ('type' => 'int'),
 		'FirstName' => Array ('type' => 'string', 'not_null' => 1),
 		'LastName' => Array ('type' => 'string', 'not_null' => 1),
 		'Company' => Array ('type' => 'string', 'not_null' => 1),
@@ -593,6 +594,7 @@
 				'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'),
 				'Modified' => Array ('filter_block' => 'grid_date_range_filter'),
 				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, 'hidden' => 1),
 			),
 		),
 
@@ -613,6 +615,7 @@
 				'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
 				'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 150, ),
 				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
+				'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, 'hidden' => 1),
 			),
 		),
 
@@ -650,7 +653,7 @@
 				'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ),
 				'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100),
 				'Modified' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100),
-				'IPAddress' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 100, 'hidden' => 1),
+				'IPAddress' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, 'hidden' => 1),
 				'EmailVerified' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, 'hidden' => 1),
 			),
 		),