Index: trunk/kernel/action.php
===================================================================
diff -u -N -r3888 -r3895
--- trunk/kernel/action.php	(.../action.php)	(revision 3888)
+++ trunk/kernel/action.php	(.../action.php)	(revision 3895)
@@ -104,13 +104,26 @@
             }
           	else
           	{
-          		$password = md5($_POST["password"]);
-		    	$u = $objEditItems->Add_User($_POST["user_login"], $password,
-                	                    $_POST["user_email"], $CreatedOn, $_POST["user_firstname"],
-                    	                $_POST["user_lastname"], $_POST["status"],
-                        	            $_POST["user_phone"],
-                            	        $_POST["user_street"], $_POST["user_city"],
-                                	    $_POST["user_state"], $_POST["user_zip"], $_POST["user_country"], $dob);
+				$fields_hash = Array(	'Login'		=>	$_POST['user_login'],
+										'Password'	=>	md5($_POST['password']),
+										'FirstName'	=>	$_POST['user_firstname'],
+										'LastName'	=>	$_POST['user_lastname'],
+										'Company'	=>	$_POST['user_company'],
+										'Email'		=>	$_POST['user_email'],
+										'Phone'		=>	$_POST['user_phone'],
+										'Fax'		=>	$_POST['user_fax'],
+										'Street'	=>	$_POST['user_street'],
+										'Street2'	=>	$_POST['user_street2'],
+										'City'		=>	$_POST['user_city'],
+										'State'		=>	$_POST['user_state'],
+										'Country'	=>	$_POST['user_country'],
+										'Zip'		=>	$_POST['user_zip'],
+										'Status'	=>	$_POST['status'],
+										'CreatedOn'	=>	$CreatedOn,
+										'dob'		=>	$dob
+								);
+				
+                $u =& $objEditItems->Add_User_NEW($fields_hash);
 
             	$objCustomEdit = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData"));
             	$objCustomEdit->SetTable('edit');
@@ -140,7 +153,7 @@
 			break;
 
 		case "m_edit_user":
-		    //$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
+			//$CreatedOn = DateTimestamp($_POST["user_date"],GetDateFormat());
          	//$CreatedOn += SecondsSinceMidnight($_POST["user_time"]);
             $dob = DateTimestamp($_POST["user_dob"],GetDateFormat());
 			$objEditItems = new clsUserManager();
@@ -149,21 +162,28 @@
             //$user_enabled = (int)$_POST["user_enabled"];
             $UserId = (int)$_POST["user_id"];
             //echo $UserId."<br>\n";
-            if(!strlen($_POST["user_login"]))
-              $dob = 0;
-            if(strlen($_POST["password"]))
-            {
-              $password = md5($_POST["password"]);
+            if (!GetVar('user_login')) {
+				$dob = 0;
             }
-            else
-              $password = "";
-			$u = $objEditItems->Edit_User($UserId, $_POST["user_login"], $password,
-                                     $_POST["user_email"], $CreatedOn, $_POST["user_firstname"],
-                                     $_POST["user_lastname"], $_POST["status"],
-                                     $_POST["user_phone"],
-                                     $_POST["user_street"], $_POST["user_city"],
-                                     $_POST["user_state"], $_POST["user_zip"], $_POST["user_country"],
-                                     $dob);
+			
+			$fields_hash = Array(	'Login'		=>	$_POST['user_login'],
+									'Password'	=>	GetVar('password') ? md5(GetVar('password')) : '',
+									'FirstName'	=>	$_POST['user_firstname'],
+									'LastName'	=>	$_POST['user_lastname'],
+									'Company'	=>	$_POST['user_company'],
+									'Email'		=>	$_POST['user_email'],
+									'Street'	=>	$_POST['user_street'],
+									'Street2'	=>	$_POST['user_street2'],
+									'City'		=>	$_POST['user_city'],
+									'State'		=>	$_POST['user_state'],
+									'Country'	=>	$_POST['user_country'],	// note: should issue some conversion from name to ISO code
+									'Zip'		=>	$_POST['user_zip'],
+									'Phone'		=>	$_POST['user_phone'],
+									'Fax'		=>	$_POST['user_fax'],
+									'Status'	=>	$_POST['status'],
+									'dob'		=>	$dob,
+							);
+			$u =& $objEditItems->Edit_User_NEW($UserId, $fields_hash);
 
             $objCustomEdit = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData"));
             $objCustomEdit->SetTable('edit');