Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r4084 -r4120
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 4084)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 4120)
@@ -570,92 +570,71 @@
          $u->DeleteFavorite();
          DeleteModuleTagCache('kernel');
      break;   
-     case "m_acctinfo":
-//         phpinfo(INFO_VARIABLES);
-		$_POST=inp_escape($_POST);
-         $MissingCount = SetMissingDataErrors("m_acctinfo");
-         $UserId = $_GET["UserId"];
-         if($UserId != $objSession->Get("PortalUserId"))
-         {
-             $MissingCount++;
-             $FormError["m_acctinfo"]["UserId"] = language("lu_ferror_m_profile_userid");
-         }
-         if(strlen($_POST["password"])>0)
-         {
-           if(($_POST["password"] != $_POST["passwordverify"]) || !strlen($_POST["passwordverify"]))
-           {
-             $MissingCount++;
-             $FormError["m_acctinfo"]["passwordverify"] = language("lu_ferror_pswd_mismatch");
-           }
+	
+	case 'm_acctinfo':
+		$_POST = inp_escape($_POST);
+		$MissingCount = SetMissingDataErrors("m_acctinfo");
+		$UserId = $_GET["UserId"];
+		if ($UserId != $objSession->Get("PortalUserId")) {
+			$MissingCount++;
+			$FormError["m_acctinfo"]["UserId"] = language("lu_ferror_m_profile_userid");
+		}
+		
+		if ($_POST["password"]) {
+			if (($_POST["password"] != $_POST["passwordverify"]) || !strlen($_POST["passwordverify"])) {
+				$MissingCount++;
+				$FormError["m_acctinfo"]["passwordverify"] = language("lu_ferror_pswd_mismatch");
+			}
+
+			if (strlen($_POST["password"])>30) {
+				// echo "VAR: ".$_POST["password"]; die();
+				$MissingCount++;
+				$FormError["m_acctinfo"]["password"] = language("lu_ferror_pswd_toolong");
+			}
+
+			if (strlen($_POST['password']) < $objConfig->Get("Min_Password")) {
+				$MissingCount++;
+				$FormError["m_acctinfo"]["password"] = language("lu_ferror_pswd_tooshort");
+			}
+		}
          
-	         if(strlen($_POST["password"])>30)
-	         {
-	            // echo "VAR: ".$_POST["password"]; die();
-	         	 $MissingCount++;
-	             $FormError["m_acctinfo"]["password"] = language("lu_ferror_pswd_toolong");
-	         }
-	         
-	         if (strlen($_POST['password']) < $objConfig->Get("Min_Password"))
-	         {
-	         	 $MissingCount++;
-	             $FormError["m_acctinfo"]["password"] = language("lu_ferror_pswd_tooshort");         	
-	         }
-         }
+		$db =& GetADODBConnection();
+		$email = GetVar('email');
+		$test_id = $db->GetOne('SELECT PortalUserId FROM '.GetTablePrefix().'PortalUser WHERE Email = '.$db->qstr($email));
+		if ($test_id && ($test_id != $objSession->Get('PortalUserId')) ) {
+			$MissingCount++;
+			$FormError["m_acctinfo"]["email"] = language("lu_ferror_email_duplicate");
+		}
          
-         $db =& GetADODBConnection();
-         $email = GetVar('email');
-         $test_id = $db->GetOne('SELECT PortalUserId FROM '.GetTablePrefix().'PortalUser WHERE Email = '.$db->qstr($email));
-         if($test_id && ($test_id != $objSession->Get('PortalUserId')) )
-         {
-         	$MissingCount++;
-	        $FormError["m_acctinfo"]["email"] = language("lu_ferror_email_duplicate");         	
-         }
          
-         
-         if(!$MissingCount)
-         {
-             /* save profile */
-             $u =& $objUsers->GetItem($UserId);
-             $status = $u->Get("Status");
-             $dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']);
-             $password = strlen($_POST["password"]) > 0 ? md5($_POST["password"]) : '';
-
-             $fields_hash = Array(	'Login'				=>	$_POST['username'],
-             						'FirstName'			=>	$_POST['firstname'],
-             						'LastName'			=>	$_POST['lastname'],
-             						'Company'			=>	$_POST['company'],
-             						'Email'				=>	$_POST['email'],
-             						'Status'			=>	$status,
-             						'Phone'				=>	$_POST['phone'],
-             						'Fax'				=>	$_POST['fax'],
-             						'Street'			=>	$_POST['street'],
-             						'Street2'			=>	$_POST['street2'],
-             						'City'				=>	$_POST['city'],
-             						'State'				=>	$_POST['state'],
-             						'Zip'				=>	$_POST['zip'],
-             						'Country'			=>	$_POST['country'],
-             						'dob'				=>	$dob,
-             						'MinPwResetDelay'	=>	$_POST['minpwresetdelay'],
-             	
-             				);
-               
-             $user =& $objUsers->Edit_User_NEW($UserId, $fields_hash);
+		if (!$MissingCount) {
+			/* save profile */
+			$u =& $objUsers->GetItem($UserId);
+			$status = $u->Get("Status");
+			$dob = adodb_mktime(0, 0, 0, $_POST['dob_month'], $_POST['dob_day'], $_POST['dob_year']);
+			$password = strlen($_POST["password"]) > 0 ? md5($_POST["password"]) : '';
 			
-               $ResourceId= $u->Get("ResourceId");
-               $objCustomDataList->LoadResource($ResourceId);
-               $objCustomFields = new clsCustomFieldList(6);
-               for($i=0;$i<$objCustomFields->NumItems(); $i++)
-               {
-                   $field = & $objCustomFields->GetItemRefByIndex($i);
-                   $fieldid= $field->Get("CustomFieldId");
-	               $fname = $field->Get("FieldName");
-		           if(isset($_POST[$fname]))                   
-                       $objCustomDataList->SetFieldValue($fieldid,$ResourceId,$_POST[$fname]);
-		           elseif(isset($_POST[strtolower($fname)]))
-                       $objCustomDataList->SetFieldValue($fieldid,$ResourceId,$_POST[strtolower($fname)]);
-               }
-               $objCustomDataList->SaveData('u', $ResourceId); 
-
+			$fields_hash = Array(	'Login'				=>	$_POST['username'],
+									'FirstName'			=>	$_POST['firstname'],
+									'LastName'			=>	$_POST['lastname'],
+									'Company'			=>	$_POST['company'],
+									'Email'				=>	$_POST['email'],
+									'Status'			=>	$status,
+									'Phone'				=>	$_POST['phone'],
+									'Fax'				=>	$_POST['fax'],
+									'Street'			=>	$_POST['street'],
+									'Street2'			=>	$_POST['street2'],
+									'City'				=>	$_POST['city'],
+									'State'				=>	$_POST['state'],
+									'Zip'				=>	$_POST['zip'],
+									'Country'			=>	$_POST['country'],
+									'dob'				=>	$dob,
+									'MinPwResetDelay'	=>	$_POST['minpwresetdelay'],
+				
+							);
+               
+			$user =& $objUsers->Edit_User_NEW($UserId, $fields_hash);
+			saveCustomFields('u', $u->Get('ResourceId'), 6);
          }
          DeleteModuleTagCache('kernel');
      break;
@@ -774,28 +753,9 @@
 					$metadesc = $_POST["meta_description"];
 					$keywords = $_POST["meta_keywords"];
 					$parent = $objCatList->CurrentCategoryID();
-					$cat =& $objCatList->Add($parent, $name, $desc, $CreatedOn,
-					0, $perm, 2, 2, 2, 0, $keywords,$metadesc);
+					$cat =& $objCatList->Add($parent, $name, $desc, $CreatedOn, 0, $perm, 2, 2, 2, 0, $keywords,$metadesc);
+					saveCustomFields('c', $cat->Get('ResourceId'), $cat->type);
 
-					$CatResourceId= $cat->Get('ResourceId');
-					$objCustomFields = new clsCustomFieldList($cat->type);
-					$field_list = $objCustomFields->Query_CustomField('Type='.$cat->type);
-					for($i=0;$i<$objCustomFields->NumItems(); $i++)
-					{
-						$field = & $objCustomFields->GetItemRefByIndex($i);
-						$fieldid= $field->Get('CustomFieldId');
-						$fname = $field->Get('FieldName');
-						if(isset($_POST[$fname]))
-						{
-							$objCustomDataList->SetFieldValue($fieldid,$CatResourceId,$_POST[$fname]);
-						}
-						elseif(isset($_POST[strtolower($fname)]))
-						{
-							$objCustomDataList->SetFieldValue($fieldid,$CatResourceId,$_POST[strtolower($fname)]);
-						}
-					}
-					$objCustomDataList->SaveData('c', $CatResourceId);
-
 					$cat->UpdateCachedPath();
 					$cat->Update();
 					$cat->UpdateACL();