Index: branches/RC/admin/users/adduser_items.php
===================================================================
diff -u -N -r8929 -r9871
--- branches/RC/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 8929)
+++ branches/RC/admin/users/adduser_items.php	(.../adduser_items.php)	(revision 9871)
@@ -5,8 +5,8 @@
 ##					      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		##
@@ -83,13 +83,13 @@
 
 if ( isset($en_prev) || isset($en_next) )
 {
-  $url = $RootUrl.$admin."/users/adduser_items.php"; 
+  $url = $RootUrl.$admin."/users/adduser_items.php";
   $StatusField = "UserEditStatus";
   $form = "edituser";
-  MultiEditButtons($objListToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');  
+  MultiEditButtons($objListToolBar,$en_next,$en_prev,$form,$StatusField,$url,$sec->Get("OnClick"),'','la_PrevUser','la_NextUser');
   $objListToolBar->Add("divider");
 }
-  
+
 $listImages = array();
 
 $objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ",
@@ -106,9 +106,9 @@
 $NumItems = 0;
 $Item_AllValue = 1;
 for($i=0;$i<$objItemTypes->NumItems(); $i++)
-{      
-	if($objItemTypes->Items[$i]->Get("PrimaryItem")=="1") {	
-	  $Item_AllValue += pow(2,++$NumItems); 	  
+{
+	if($objItemTypes->Items[$i]->Get("PrimaryItem")=="1") {
+	  $Item_AllValue += pow(2,++$NumItems);
 	}
 }
 
@@ -133,7 +133,7 @@
     </td>
   </tr>
 </table>
-<?php } ?> 
+<?php } ?>
 <?php if ($filter) { ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolbar">
   <tr>
@@ -142,14 +142,14 @@
     </td>
   </tr>
 </table>
-<?php } ?> 
+<?php } ?>
 <form name="edituser" ID="edituser" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar;?>" method=POST>
 <table cellSpacing="0" cellPadding="2" width="100%" class="tableborder">
 <tbody>
 <?php
 
 if( GetVar('lpn') )
-{    
+{
     $objSession->SetVariable("Page_Items",(int)$_GET["lpn"]);
     $page = (int)$_GET["lpn"];
 }
@@ -167,22 +167,24 @@
 $sql_source = $objModules->ExecuteFunction('GetModuleInfo', 'rel_list');
 
 $sql_templates['ItemName'] = 'IFNULL('.$prefix."%s.%s,' ')";
-$sql_templates['TableJoin'] = 'LEFT JOIN '.$prefix."%1\$s ON ".$prefix."%1\$s.ResourceId = ut.ResourceId"; 
+$sql_templates['TableJoin'] = 'LEFT JOIN '.$prefix."%1\$s ON ".$prefix."%1\$s.ResourceId = ut.ResourceId";
 $sql_templates['ItemType'] = "IF(ut.ItemType = %s, '%s', %s)";
 
 $sql = 	"SELECT TRIM(CONCAT(%s)) AS ItemName, %s AS ItemTypeStr, ut.ItemType as ItemType, ".
 		'ut.ResourceId as ItemId FROM '.$table." ut %s ".
 		'WHERE ut.PortalUserId = '.$c->Get("PortalUserId");
-		
 
+
 $sql_parts = Array();
 $sql_parts['ItemType'] = "''";
 foreach($modules as $module)
 {
+	if ($module == 'Core') continue;
+
 	$sql_parts['ItemName'][] = sprintf($sql_templates['ItemName'], $sql_source[$module]['MainTable'], $sql_source[$module]['ItemNameField']);
 	$sql_parts['TableJoin'][] = sprintf($sql_templates['TableJoin'], $sql_source[$module]['MainTable']);
-	$sql_parts['ItemType'] = sprintf(	$sql_templates['ItemType'], 
-										$sql_source[$module]['TargetType'], 
+	$sql_parts['ItemType'] = sprintf(	$sql_templates['ItemType'],
+										$sql_source[$module]['TargetType'],
 										admin_language($sql_source[$module]['ItemNamePhrase']),
 										$sql_parts['ItemType']);
 }
@@ -231,7 +233,7 @@
     $url = "<A TARGET=\"editwin\" HREF=\"".$url."\">$n</A>";
     $item->Set("ItemName",$url);
   }
-} 
+}
 
   $objListView->SetListItems($objItems);
   $objListView->IdField = "ResourceId";
@@ -243,12 +245,12 @@
   $objListView->ColumnHeaders->Add("ItemName",admin_language("la_ColHeader_Item"),1,0,$order,"width=\"20%\"","UserItem_LV_Sortfield","UserItem_LV_Sortorder" ,"ItemName");
   $objListView->ColumnHeaders->Add("ItemTypeStr",admin_language("la_ColHeader_ItemType"),1,0,$order,"width=\"20%\"","UserItem_LV_Sortfield","UserItem_LV_Sortorder","ItemType");
   //$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"20%\"","UserItem_LV_Sortfield","UserItem_LV_Sortorder","DateCreated");
- 
+
   $objListView->ColumnHeaders->SetSort($objConfig->Get("UserItem_LV_Sortfield"), $objConfig->Get("UserItem_LV_Sortorder"));
 
   $objListView->PrintToolBar = FALSE;
   $objListView->checkboxes = FALSE;
-  $objListView->CheckboxName = "";  
+  $objListView->CheckboxName = "";
   $objListView->TotalItemCount = $itemcount;
 
 
@@ -260,15 +262,15 @@
 */
   //$objListView->SliceItems();
   print $objListView->PrintList();
-  
+
 ?>
     <input TYPE="hidden" NAME="ResourceId" VALUE="<?php echo $c->Get("ResourceId"); ?>">
     <input type="hidden" name="Action" value="m_item_image">
 
 </FORM>
 <FORM NAME="save_edit_buttons" ID="save_edit_buttons" method="POST" ACTION="">
-  <tr <?php int_table_color(); ?>> 
-    <td colspan="5"> 
+  <tr <?php int_table_color(); ?>>
+    <td colspan="5">
     <input type=hidden NAME="Action" VALUE="save_user_edit">
     <input type="hidden" name="UserEditStatus" VALUE="0">
  </td>