Index: trunk/admin/users/adduser.php
===================================================================
diff -u -r13 -r374
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 13)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 374)
@@ -14,7 +14,7 @@
 ##############################################################
 if(!strlen($pathtoroot))
 {
-  $path=dirname(realpath($_SERVER['SCRIPT_FILENAME']));
+  $path=dirname(realpath(__FILE__));
   if(strlen($path))
   {
     /* determine the OS type for path parsing */
@@ -96,7 +96,7 @@
 //$objUserGroupsList = new clsUserGroupList();
 
 //Multiedit init
-if ($_GET["new"] == 1)
+if ( GetVar('new') == 1)
 {
 	$c = new clsPortalUser(NULL);
 	$c->Set("CreatedOn", time());
@@ -111,7 +111,7 @@
 }
 else
 {   
-    $en = (int)$_GET["en"];
+    $en = GetVar('en');
     if (isset($_POST["itemlist"]))
     {         
         $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);                
@@ -190,15 +190,16 @@
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><span id="prompt_user_login" class="text"><?php echo prompt_language("la_prompt_Usermame"); ?></span></td>
     <td> 
-      <input type="text" tabindex="1" name="user_login" ID="user_login" class="text" ValidationType="exists" size="20" value="<?php echo $c->parsetag("user_login"); ?>">
+      <input type="text" tabindex="1" name="user_login" ID="user_login" class="text" ValidationType="exists" size="20" value="<?php echo isset($dupe_user) && $dupe_user ? $dupe_user : $c->parsetag("user_login"); ?>">
+      <span class="validation_error"><?php if( isset($dupe_user) && $dupe_user ) echo admin_language($lvErrorString); ?></span>
     </td>
     <td></td>
   </tr>
   <tr <?php int_table_color(); ?>> 
     <td valign="top"><span ID="prompt_password" class="text"><?php echo prompt_language("la_prompt_Password"); ?></span></td>
     <td> 
       <input type="password" id="password" tabindex="2" name="password" class="text" ValidationType="password" size="20" value="">
-      <?php if(!$_GET["new"]) echo prompt_language("la_password_info"); ?>
+      <?php if( !GetVar('new') ) echo prompt_language("la_password_info"); ?>
     </td>     
     <td></td>
   </tr>
@@ -307,10 +308,12 @@
 $CustomFieldUI = $objCustomFields->GetFieldUIList(TRUE);
 if($CustomFieldUI->NumItems()>0)
 {
+  $objCustomDataList->SetTable('edit');
+  
+  
   if((int)$c->Get("ResourceId")>0)
-  {
 	$objCustomDataList->LoadResource($c->Get("ResourceId"));
-  }
+	
   $headings = $CustomFieldUI->GetHeadingList();
   //echo "<PRE>";print_r($objCustomFields); echo "</PRE>";
   for($i=0;$i<=count($headings);$i++)
@@ -322,6 +325,7 @@
         $Items = $CustomFieldUI->GetHeadingItems($h);
         foreach($Items as $f)
         {
+        	if ($f->TabIndex)
         	$n = substr($f->name,1);
         	$cfield = $objCustomFields->GetItemByField("FieldName",$n,FALSE);
         	if(is_object($cfield))
@@ -334,18 +338,20 @@
         	}
             print "<tr ".int_table_color_ret().">\n"; 
             print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
-            print "  <td nowrap>".$f->ItemFormElement()."</TD>";       
+            
+            print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";       
             if(is_object($f->NextItem))
             {
                 $n = $f->NextItem;
-                print "  <td>".$n->ItemFormElement()."</TD>";       
+                print "  <td>".$n->ItemFormElement(17)."</TD>";       
             }
             else
               print "  <td><span class=\"text\">&nbsp;</span></td>\n";
             print "</tr>\n";
         }
     }
   }
+  $objCustomDataList->SetTable('live');
 }
 ?>
   <tr <?php int_table_color(); ?>>