Index: trunk/admin/users/adduser.php
===================================================================
diff -u -N -r5431 -r7391
--- trunk/admin/users/adduser.php	(.../adduser.php)	(revision 5431)
+++ trunk/admin/users/adduser.php	(.../adduser.php)	(revision 7391)
@@ -1,12 +1,12 @@
-<?php 
+<?php
 ##############################################################
 ##In-portal													##
 ##############################################################
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
-##															##	
-##	No portion of this code may be copied, reproduced or	##	
+##															##
+##	No portion of this code may be copied, reproduced or	##
 ##	   otherwise redistributed without proper written		##
 ##	  consent of Intechnic Corporation.  Violation will		##
 ##	   result in revocation of the license and support		##
@@ -21,9 +21,9 @@
 // new startup: end
 checkViewPermission('in-portal:user_list');
 
-require_once ($pathtoroot.$admin."/include/elements.php"); 
-require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
-//require_once ($pathtolocal."admin/include/navmenu.php"); 
+require_once ($pathtoroot.$admin."/include/elements.php");
+require_once ($pathtoroot."kernel/admin/include/navmenu.php");
+//require_once ($pathtolocal."admin/include/navmenu.php");
 require_once($pathtoroot.$admin."/toolbar.php");
 
 unset($objEditItems);
@@ -47,27 +47,27 @@
     $objUsers->CreateEmptyEditTable("PortalUserId");
     $objRelList->CreateEmptyEditTable("RelationshipId");
     $objCustomDataList->CreateEmptyEditTable('u');
-    $objImages->CreateEmptyEditTable("ResourceId");  
+    $objImages->CreateEmptyEditTable("ResourceId");
     $objUserGroupsList->CreateEmptyEditTable("PortalUserId");
-    
+
     $objItemTypes->BuildUserItemTable(-1, 1); // 0 - user_id, 1 - clear table
 }
 else
-{   
+{
 	$direct_id = GetVar('direct_id');
 	if($direct_id) $_POST['itemlist'] = Array($direct_id);
-	
+
 	$en = GetVar('en');
     if (isset($_POST["itemlist"]))
-    {         
-        $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);                
-    }   
+    {
+        $objUsers->CopyToEditTable("ResourceId",$_POST["itemlist"]);
+    }
     $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
     $first=1;
     foreach($objEditItems->Items as $u)
     {
-        $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);            
-        $first=0;        
+        $objItemTypes->BuildUserItemTable($u->Get("PortalUserId"),$first);
+        $first=0;
     }
 
     if(isset($_POST["itemlist"]))
@@ -86,24 +86,24 @@
     $c = $objEditItems->GetItemByIndex($en);
 
     if($itemcount>1)
-    {    
+    {
 	  if ($en+1 == $itemcount)
 		$en_next = -1;
 	  else
 		$en_next = $en+1;
-	
+
 	  if ($en == 0)
 		$en_prev = -1;
 	  else
-		$en_prev = $en-1;	
+		$en_prev = $en-1;
     }
     $action = "m_edit_user";
 }
 
 $envar = "env=" . BuildEnv() . "&en=$en";
-	
-$section = 'in-portal:edituser_general'; 
 
+$section = 'in-portal:edituser_general';
+
 if (strlen($c->Get("Login")))
 	$editing_title = "'".$c->Get("Login")."' ";
 else
@@ -123,10 +123,10 @@
 
 if ( isset($en_prev) || isset($en_next) )
 {
-  $url = $RootUrl.$admin."/users/adduser.php"; 
+  $url = $RootUrl.$admin."/users/adduser.php";
   $StatusField = "UserEditStatus";
   $form = "edituser";
-  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');  
+  MultiEditButtons($objCatToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');
 }
 
 int_header($objCatToolBar,NULL,$title);
@@ -140,149 +140,149 @@
     </td>
   </tr>
 </table>
-<?php } ?> 
+<?php } ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
-<form ID="edituser" name="edituser" action="" method=POST>	 
-  
+<form ID="edituser" name="edituser" action="" method=POST>
+
   <?php int_subsection_title(prompt_language("la_Text_User")); ?>
 
-  <tr <?php int_table_color(); ?>> 
+  <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> 
+    <td>
       <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(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_password" class="text"><?php echo prompt_language("la_prompt_Password"); ?></span></td>
-    <td> 
+    <td>
       <input type="password" id="password" tabindex="2" name="password" class="text" ValidationType="password" size="20" value="">
       <?php if( !GetVar('new') ) echo prompt_language("la_password_info"); ?>
-    </td>     
+    </td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_password_verify" class="text"><?php echo prompt_language("la_prompt_PasswordRepeat"); ?></span></td>
-    <td> 
+    <td>
      <input type="password" id="password_verify" tabindex="4" name="password_verify" class="text" size="20" value="">
     </td>
     <td></td>
   </tr>
 
   <?php int_subsection_title(prompt_language("la_prompt_PersonalInfo")); ?>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_firstname" class="text"><?php echo prompt_language("la_prompt_FirstName"); ?></span></td>
-    <td> 
+    <td>
       <input type="text" name="user_firstname" class="text" tabindex="5" size="30" value="<?php echo $c->parsetag("user_firstname"); ?>">
     </td>
     <td></td>
   </tr>
-  
-	<tr <?php int_table_color(); ?>> 
+
+	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_lastname" class="text"><?php echo prompt_language("la_prompt_LastName"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_lastname" class="text" tabindex="6" size="30" value="<?php echo $c->parsetag("user_lastname"); ?>">
     	</td>
     	<td></td>
   	</tr>
-  	
-  	<tr <?php int_table_color(); ?>> 
+
+  	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_company" class="text"><?php echo prompt_language("la_fld_Company"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_company" class="text" tabindex="7" size="30" value="<?php echo inp_htmlize($c->Get('Company')); ?>">
     	</td>
     	<td></td>
   	</tr>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span ID="prompt_user_email" class="text"><?php echo prompt_language("la_prompt_Email"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" ValidationType="exists" name="user_email" tabindex="8" ID="user_email" class="text" size="30" value="<?php echo $c->parsetag("user_email"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_dob" class="text"><?php echo prompt_language("la_prompt_birthday"); ?></SPAN></td>
-    <td> 
-      <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">            
+    <td>
+      <input type="text" ValidationType="date,exists" tabindex="9" name="user_dob" id="user_dob_selector" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_dob"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
 
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_phone" class="text"><?php echo prompt_language("la_prompt_Phone"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_phone" tabindex="10" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Phone')); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  
-	<tr <?php int_table_color(); ?>> 
+
+	<tr <?php int_table_color(); ?>>
     	<td valign="top">
     		<span id="prompt_user_fax" class="text"><?php echo prompt_language("la_fld_Fax"); ?></span>
     	</td>
-    	<td> 
+    	<td>
      		<input type="text" name="user_fax" tabindex="11" class="text" size="30" value="<?php echo inp_htmlize($c->Get('Fax')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
 	</tr>
 
-	<tr <?php int_table_color(); ?>> 
+	<tr <?php int_table_color(); ?>>
 		<td valign="top">
 			<span id="prompt_user_street" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 1</span>
 		</td>
-		<td> 
+		<td>
      		<input type="text" name="user_street" tabindex="12" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
   	</tr>
-  	
-  	<tr <?php int_table_color(); ?>> 
+
+  	<tr <?php int_table_color(); ?>>
 		<td valign="top">
 			<span id="prompt_user_street2" class="text"><?php echo prompt_language("la_fld_AddressLine"); ?> 2</span>
 		</td>
-		<td> 
+		<td>
      		<input type="text" name="user_street2" tabindex="13" class="text" size="40" value="<?php echo inp_htmlize($c->Get('Street2')); ?>">
     	</td>
     	<td>
     		<span class="text">&nbsp;</span>
     	</td>
   	</tr>
-  
-  <tr <?php int_table_color(); ?>> 
+
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_city" class="text"><?php echo prompt_language("la_prompt_City"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_city" class="text" tabindex="14" size="30" value="<?php echo $c->parsetag("user_city"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-    <tr <?php int_table_color(); ?>> 
+    <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_state" class="text"><?php echo prompt_language("la_prompt_State"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_state" class="text" tabindex="15" size="20" value="<?php echo $c->parsetag("user_state"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_zip" class="text"><?php echo prompt_language("la_prompt_Zip"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_zip" class="text" size="6" tabindex="16" value="<?php echo $c->parsetag("user_zip"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
   </tr>
-    <tr <?php int_table_color(); ?>> 
+    <tr <?php int_table_color(); ?>>
     <td valign="top"><span id="prompt_user_country" class="text"><?php echo prompt_language("la_prompt_Country"); ?></span></td>
-    <td> 
+    <td>
      <input type="text" name="user_country" class="text" tabindex="17" size="30" value="<?php echo $c->parsetag("user_country"); ?>">
     </td>
     <td><span class="text">&nbsp;</span></td>
@@ -297,33 +297,35 @@
      </td>
     <td class="text">&nbsp;</td>
   </tr>
+
+
   <!-- User: CreatedOn: begin -->
- <tr <?php int_table_color(); ?>> 
+ <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_date" class="text"><?php echo prompt_language("la_prompt_CreatedOn"); ?></SPAN></td>
-    <td> 
-      <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">            
+    <td>
+      <input type="text" name="user_date" id="user_date_selector" tabindex="19" datepickerIcon="<?php echo $adminURL; ?>/images/ddarrow.gif" class="text" size="20" value="<?php echo $c->parsetag("user_date"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_DateFormat"); ?></span></td>
     <td></td>
   </tr>
-  <tr <?php int_table_color(); ?>> 
+  <tr <?php int_table_color(); ?>>
     <td valign="top"><SPAN id="prompt_user_time" class="text"><?php echo prompt_language("la_prompt_CreatedOn_Time"); ?></SPAN></td>
-    <td> 
+    <td>
       <input type="text" name="user_time" tabindex="20" class="text" size="20" value="<?php echo $c->parsetag("user_time"); ?>">
       <span class="small"><?php echo prompt_language("la_prompt_TimeFormat"); ?></span></td>
     <td></td>
   </tr>
   <!-- User: CreatedOn: end -->
-  
+
 <?php
 
 $CustomFieldUI = $objCustomFields->GetFieldUIList(TRUE); // get custom fields to show on general tab
 if($CustomFieldUI->NumItems()>0)
 {
   $objCustomDataList->SetTable('edit');
-  
+
   if((int)$c->Get("ResourceId")>0)
 	$objCustomDataList->LoadResource($c->Get("ResourceId"));
-	
+
   $headings = $CustomFieldUI->GetHeadingList();
   // draw headings
   for($i = 0; $i < count($headings); $i++)
@@ -340,13 +342,13 @@
         	if (is_object($cfield)) {
 				$f->default_value = $c->GetCustomFieldValue($n, '', 0, true);
         	}
-            print "<tr ".int_table_color_ret().">\n"; 
+            print "<tr ".int_table_color_ret().">\n";
             print "  <td valign=\"top\"><span class=\"text\">".$f->GetPrompt()."</span></td>\n";
-            
-            print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";       
+
+            print "  <td nowrap>".$f->ItemFormElement(17)."</TD>";
             if (is_object($f->NextItem)) {
                 $n = $f->NextItem;
-                print "  <td>".$n->ItemFormElement(17)."</TD>";       
+                print "  <td>".$n->ItemFormElement(17)."</TD>";
             }
             else {
               	print "  <td><span class=\"text\">&nbsp;</span></td>\n";
@@ -367,8 +369,8 @@
 <SCRIPT language="JavaScript">
     initCalendar("user_date_selector", CalDateFormat);
     initCalendar("user_dob_selector", CalDateFormat);
-</SCRIPT> 
-<?php 
+</SCRIPT>
+<?php
 	MarkFields('edituser');
-	int_footer(); 
+	int_footer();
 ?>
\ No newline at end of file