Index: trunk/admin/users/adduser_custom.php
===================================================================
--- trunk/admin/users/adduser_custom.php	(revision 517)
+++ trunk/admin/users/adduser_custom.php	(revision 518)
@@ -1,234 +1,236 @@
 <?php 
 ##############################################################
 ##In-portal													##
 ##############################################################
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
 ##															##	
 ##	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		##
 ##	 privileges along maximum prosecution allowed by law.	##
 ##############################################################
 if(!strlen($pathtoroot))
 {
   $path=dirname(realpath(__FILE__));
   if(strlen($path))
   {
     /* determine the OS type for path parsing */
     $pos = strpos($path,":");
     if ($pos === false)
     {
       $gOS_TYPE="unix";
       $pathchar = "/";
     }
     else
     {
       $gOS_TYPE="win";
       $pathchar="\\";
     }
     $p = $path.$pathchar;
     /*Start looking for the root flag file */
     while(!strlen($pathtoroot) && strlen($p))
     {
       $sub = substr($p,strlen($pathchar)*-1);
       if($sub==$pathchar)
       {
         $filename = $p."root.flg";
       }
       else
         $filename = $p.$pathchar."root.flg";
       if(file_exists($filename))
       {
         $pathtoroot = $p;
       }
       else
       {
         $parent = realpath($p.$pathchar."..".$pathchar);
 	if($parent!=$p)
 	{
 	  $p = $parent;
 	}
 	else
 	  $p = "";
       }
     }
     if(!strlen($pathtoroot))
       $pathtoroot = ".".$pathchar;
   }
   else
   {
     $pathtoroot = ".".$pathchar;
   }
 }
 
 $sub = substr($pathtoroot,strlen($pathchar)*-1);
 if($sub!=$pathchar)
 {
   $pathtoroot = $pathtoroot.$pathchar;
 }
 //echo $pathtoroot;
 
 require_once($pathtoroot."kernel/startup.php");
 //admin only util
 $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
 $admin = $objConfig->Get("AdminDirectory");
 if(!strlen($admin))
     $admin = "admin";
 $localURL=$rootURL."kernel/";
 $adminURL = $rootURL.$admin;
 $imagesURL = $adminURL."/images"; 
 
 require_once ($pathtoroot.$admin."/include/elements.php"); 
 require_once ($pathtoroot."kernel/admin/include/navmenu.php"); 
 require_once($pathtoroot.$admin."/toolbar.php");
 require_once($pathtoroot.$admin."/listview/listview.php");
 
 $m = GetModuleArray();
 foreach($m as $key=>$value)
 {
     $path = $pathtoroot. $value."admin/include/parser.php";
     if(file_exists($path))
     {    
       include_once($path);
     }
 }
 unset($objEditItems);
 $objEditItems = new clsUserManager();
 $objEditItems->SourceTable = $objSession->GetEditTable("PortalUser");
 $objEditItems->EnablePaging = FALSE;
 //Multiedit init
 $en = GetVar('en');
 $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
 $itemcount=$objEditItems->NumItems();
 
 $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;	
 }
 $action = "m_edit_user";
 
 $envar = "env=" . BuildEnv() . "&en=$en";
 	
 $section = 'in-portal:edituser_custom'; 
 
 $title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_User")." '".$c->Get("Login")."' - ".prompt_language("la_tab_Custom");
 
 $formaction = $adminURL."/user/adduser_custom.php?".$envar;
 
 //Display header
 $sec = $objSections->GetSection($section);
 $objListToolbar = new clsToolBar();
 $objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('edituser','UserEditStatus','".$admin."/users/user_list.php',1);","tool_select.gif");
 $objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('edituser','UserEditStatus','".$admin."/users/user_list.php',2);","tool_cancel.gif");
 
 if ( isset($en_prev) || isset($en_next) )
 {
   $url = $RootUrl.$admin."/users/adduser_custom.php"; 
   $StatusField = "UserEditStatus";
   $form = "edituser";
   MultiEditButtons($objListToolbar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');  
 }
 
 int_header($objListToolbar,NULL,$title);
 
 ?>
 <form ID="edituser" name="edituser" action="" method=POST>
 <?php
   
   $objCustomFields = new clsCustomFieldList(6);  
   
   $field_list = $objCustomFieldList->Query_CustomField("Type=6");
 
   
   $objCustomDataList->SourceTable = $objSession->GetEditTable("CustomMetaData");
   $objCustomDataList->LoadResource($c->Get("ResourceId"));
 
   for($i=0;$i<$objCustomFields->NumItems(); $i++)
   {  
       $field =& $objCustomFields->GetItemRefByIndex($i);     
       $fieldid = $field->Get("CustomFieldId");
 
       $f = $objCustomDataList->GetDataItem($fieldid);
       $fieldname = "CustomData[$fieldid]";
+      $field->Set('FieldLabel', admin_language($field->Get('Prompt')) );
+      
       if(is_object($f))
       {
         $val_field = "<input type=\"text\" tabindex=\"".($i+1)."\" VALUE=\"".$f->Get("Value")."\" name=\"$fieldname\">";
         $field->Set("Value", $val_field);
         $field->Set("DataId",$f->Get("CustomDataId"));
       }
       else
       {      
         $val_field = "<input type=\"text\" tabindex=\"".($i+1)."\"  VALUE=\"\" name=\"$fieldname\">";
         $field->Set("Value", $val_field);
         $field->Set("DataId",0);
       }
   }
   $objCustomFields->SortField =  $objConfig->Get("CustomData_LV_Sortfield");;
   $objCustomFields->SortItems($objConfig->Get("CustomData_LV_Sortorder")!="desc");
 
   $objListView = new clsListView($objListToolbar,$objCustomFields);
   $objListView->IdField = "DataId";
 
   $order = $objConfig->Get("CustomData_LV_Sortfield");
   $SortOrder=0;
   if($objConfig->Get("CustomData_LV_Sortorder")=="asc")
      $SortOrder=1;
   
   $objListView->ColumnHeaders->Add("FieldName",admin_language("la_ColHeader_FieldName"),1,0,$order,"width=\"30%\"","CustomData_LV_Sortfield","CustomData_LV_Sortorder","FieldName");
   $objListView->ColumnHeaders->Add("FieldLabel",admin_language("la_ColHeader_FieldLabel"),1,0,$order,"width=\"30%\"","CustomData_LV_Sortfield","CustomData_LV_Sortorder","FieldLabel");
   $objListView->ColumnHeaders->Add("Value",admin_language("la_ColHeader_Value"),1,0,$order,"width=\"40%\"","CustomData_LV_Sortfield","CustomData_LV_Sortorder","Value");
         
   $objListView->ColumnHeaders->SetSort($objConfig->Get("CustomData_LV_Sortfield"), $objConfig->Get("CustomData_LV_Sortorder"));
 
   $objListView->PrintToolBar = FALSE;
   $objListView->checkboxes = FALSE;
   $objListView->PageURL = "javascript:page_submit('edituser','".$adminURL."/users/adduser_custom.php',0,'{TargetPage}');";
 
   $objListView->CurrentPageVar = "Page_CustomData";
   $objListView->PerPageVar = "Perpage_CustomData";
   //$objListView->CheckboxName = "itemlist[]";     
 
   for($i=0;$i<count($objCustomFields->Items);$i++)
   {   
     $objListView->RowIcons[] = $imagesURL."/itemicons/icon16_custom.gif";
   }
 
   $objListView->PageLinks = $objListView->PrintPageLinks();
 
   $objListView->SliceItems();
   print $objListView->PrintList();
 ?>
   <input type="hidden" name="ItemId" value="<?php echo $c->Get("ResourceId"); ?>">
   <input type="hidden" name="Action" value="m_edit_custom_data">
   <input type="hidden" name="UserEditStatus" VALUE="0">
 </FORM>
 
 
 <FORM method="POST" NAME="save_edit" ID="save_edit">
   <tr <?php int_table_color(); ?>>
     <td colspan="3">
    </td>
   </tr>
 </FORM>
 <!-- CODE FOR VIEW MENU -->
 <form ID="viewmenu" method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>" name="viewmenu">
 <input type="hidden" name="fieldname" value="">
 <input type="hidden" name="varvalue" value="">
 <input type="hidden" name="varvalue2" value="">
 <input type="hidden" name="Action" value="">
 </form>
 
 <?php int_footer(); ?>

Property changes on: trunk/admin/users/adduser_custom.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: trunk/admin/config/edit_customfields.php
===================================================================
--- trunk/admin/config/edit_customfields.php	(revision 517)
+++ trunk/admin/config/edit_customfields.php	(revision 518)
@@ -1,210 +1,212 @@
 <?php 
 ##############################################################
 ##In-portal													##
 ##############################################################
 ##					      In-portal							##
 ##					Intechnic Corporation					##
 ##			   All Rights Reserved, 1998-2002				##
 ##															##	
 ##	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		##
 ##	 privileges along maximum prosecution allowed by law.	##
 ##############################################################
 if(!strlen($pathtoroot))
 {
   $path=dirname(realpath(__FILE__));
   if(strlen($path))
   {
     /* determine the OS type for path parsing */
     $pos = strpos($path,":");
     if ($pos === false)
     {
       $gOS_TYPE="unix";
       $pathchar = "/";
     }
     else
     {
       $gOS_TYPE="win";
       $pathchar="\\";
     }
     $p = $path.$pathchar;
     /*Start looking for the root flag file */
     while(!strlen($pathtoroot) && strlen($p))
     {
       $sub = substr($p,strlen($pathchar)*-1);
       if($sub==$pathchar)
       {
         $filename = $p."root.flg";
       }
       else
         $filename = $p.$pathchar."root.flg";
       if(file_exists($filename))
       {
         $pathtoroot = $p;
       }
       else
       {
         $parent = realpath($p.$pathchar."..".$pathchar);
 	if($parent!=$p)
 	{
 	  $p = $parent;
 	}
 	else
 	  $p = "";
       }
     }
     if(!strlen($pathtoroot))
       $pathtoroot = ".".$pathchar;
   }
   else
   {
     $pathtoroot = ".".$pathchar;
   }
 }
 
 $sub = substr($pathtoroot,strlen($pathchar)*-1);
 if($sub!=$pathchar)
 {
   $pathtoroot = $pathtoroot.$pathchar;
 }
 //echo $pathtoroot;
 
 require_once($pathtoroot."kernel/startup.php");
 
 if (!admin_login())
 {            
     if(!headers_sent())
       setcookie("sid"," ",time()-3600);
     $objSession->Logout();
     header("Location: ".$adminURL."/login.php");
     die();
 	//require_once($pathtoroot."admin/login.php");
 }
 
 //admin only util
 $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
 $admin = $objConfig->Get("AdminDirectory");
 if(!strlen($admin))
     $admin = "admin";
 $localURL=$rootURL."kernel/";
 $adminURL=$rootURL.$admin;
 $imagesURL = $adminURL."/images"; 
 //$pathtolocal = $pathtoroot."in-news/";
 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");
 require_once($pathtoroot.$admin."/listview/listview.php");
 
 $FieldType = $_GET["DataType"];
 $section = $_GET["section"];
 
 $m = GetModuleArray();
 foreach($m as $key=>$value)
 {
     $path = $pathtoroot. $value."admin/include/parser.php";
     if(file_exists($path))
     {    
       include_once($path);
     }
 }
 unset($objEditItems);
 
 $objCustomFields = new clsCustomFieldList($FieldType);  
 
 $envar = "section=$section&DataType=$FieldType&env=".BuildEnv();
 
 $formaction = $_SERVER["PHP_SELF"]."?".$envar;
 
 $sec = $objSections->GetSection($section);
 
 $objListToolBar = new clsToolBar();
 
 $objListToolBar->Set("section",$section);
 $objListToolBar->Set("load_menu_func","");
 $objListToolBar->Set("CheckClass","FieldChecks");
 $objListToolBar->Set("CheckForm","configform");
   
 $listImages = array();
                     //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick
 
 $objListToolBar->Add("new_field", "la_ToolTip_New_CustomField",$adminURL."/config/addcustomfield.php?$envar&new=1","swap('new_field','toolbar/tool_forum_new_custom_f2.gif');",
                     "swap('new_field', 'toolbar/tool_forum_new_custom.gif');","",$imagesURL."/toolbar/tool_forum_new_custom.gif");
 
 $objListToolBar->Add("field_edit","la_ToolTip_Edit","#", "if (FieldChecks.itemChecked()) swap('field_edit','toolbar/tool_edit_f2.gif');",
                     "if (FieldChecks.itemChecked()) swap('field_edit', 'toolbar/tool_edit.gif');","if (FieldChecks.itemChecked()) FieldChecks.check_submit('addcustomfield', '');",
                     "tool_edit.gif",TRUE,TRUE);
 $listImages[] = "FieldChecks.addImage('field_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); ";
 
 $objListToolBar->Add("field_del","la_ToolTip_Delete","#", "if (FieldChecks.itemChecked()) swap('field_del','toolbar/tool_delete_f2.gif');",
                     "if (FieldChecks.itemChecked()) swap('field_del', 'toolbar/tool_delete.gif');","if (FieldChecks.itemChecked()) FieldChecks.check_submit('edit_customfields', 'm_customfield_delete');",
                     "tool_delete.gif", FALSE, TRUE);
 $listImages[] = "FieldChecks.addImage('field_del','$imagesURL/toolbar/tool_delete.gif','$imagesURL/toolbar/tool_delete_f3.gif',1); ";
 
 $objListToolBar->AddToInitScript($listImages);
 
 //$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_CustomFields");
 
 $where = "Type = ".$FieldType;
 $order = trim($objConfig->Get("CustomConfig_LV_Sortfield")." ".$objConfig->Get("CustomConfig_LV_Sortorder"));
 
 $objCustomFields->Query_CustomField($where,$order);
 
 $objListView = new clsListView($objListToolBar,$objCustomFields);
 $objListView->IdField = "CustomFieldId";
 
 $order = $objConfig->Get("CustomConfig_LV_Sortfield");
 $objListView->ColumnHeaders->Add("FieldName",admin_language("la_ColHeader_FieldName"),1,0,$order,"width=\"30%\"","CustomConfig_LV_Sortfield","CustomConfig_LV_Sortorder","FieldName");
 $objListView->ColumnHeaders->Add("FieldLabel",admin_language("la_ColHeader_FieldLabel"),1,0,$order,"width=\"30%\"","CustomConfig_LV_Sortfield","CustomConfig_LV_Sortorder","FieldLabel");
 $objListView->ColumnHeaders->SetSort($objConfig->Get("CustomConfig_LV_Sortfield"), $objConfig->Get("CustomConfig_LV_Sortorder"));
 
 $objListView->PrintToolBar = FALSE;
 $objListView->checkboxes = TRUE;
 
 $objListView->CurrentPageVar = "Page_CustomData";
 $objListView->PerPageVar = "Perpage_CustomData";
 $objListView->CheckboxName = "itemlist[]"; 
 $objListView->extra_env = "section=$section&DataType=$FieldType";
 
 for($i=0;$i<count($objCustomFields->Items);$i++)
 {   
   $objListView->RowIcons[] = $imagesURL."/itemicons/icon16_custom.gif";
+  $field =& $objCustomFields->GetItemRefByIndex($i);
+  $field->Set('FieldLabel', admin_language($field->Get('Prompt')) );
 }
 
 
 $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0);
 
 $objListToolBar->AddToInitScript("fwLoadMenus();");
 $h = "\n\n<SCRIPT Language=\"JavaScript1.2\">\n".$objListView->GetViewMenu($imagesURL)."\n</SCRIPT>\n";
 
 int_header($objListToolBar,NULL,$title, NULL, $h);
 ?>
 <form name="configform" ID="configform" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar;?>" method=POST>
 <table cellSpacing="0" cellPadding="2" width="100%" class="tableborder">
 <tbody>
 <?php
   $objListView->PageLinks = $objListView->PrintPageLinks(); /* call this before we slice! */
   $objListView->SliceItems();
   print $objListView->PrintList();
   
 ?>
     <input TYPE="hidden" NAME="DataType" VALUE="<?php echo $FieldType; ?>">
     <input type="hidden" NAME="section" VALUE="<?php echo $section; ?>">
     <input type="hidden" name="Action" value="m_config_custom">
 </FORM>
 <!-- CODE FOR VIEW MENU -->
 <form ID="viewmenu" method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>" name="viewmenu">
 <input type="hidden" name="fieldname" value="">
 <input type="hidden" name="varvalue" value="">
 <input type="hidden" name="varvalue2" value="">
 <input type="hidden" name="Action" value="">
 </form>
 
 <script src="<?php echo $adminURL; ?>/listview/listview.js"></script>
 <script>
 initSelectiorContainers();
 <?php echo $objListToolBar->Get("CheckClass").".setImages();"; ?>
 </script>
 <?php int_footer(); ?>

Property changes on: trunk/admin/config/edit_customfields.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property