Index: branches/5.2.x/core/units/users/users_config.php
===================================================================
diff -u -N -r15586 -r15590
--- branches/5.2.x/core/units/users/users_config.php	(.../users_config.php)	(revision 15586)
+++ branches/5.2.x/core/units/users/users_config.php	(.../users_config.php)	(revision 15590)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 15586 2012-10-17 13:15:06Z alex $
+* @version	$Id: users_config.php 15590 2012-10-18 15:37:18Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -345,9 +345,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' => ''),
@@ -430,8 +438,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' => ''),
@@ -520,6 +528,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),