Index: trunk/admin/users/adduser_groups.php
===================================================================
diff -u -r1566 -r2082
--- trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 1566)
+++ trunk/admin/users/adduser_groups.php	(.../adduser_groups.php)	(revision 2082)
@@ -167,6 +167,12 @@
                      "OpenGroupSelector('$envar&source=adduser_groups&UserId=".$c->Get("PortalUserId")."&destform=group&destfield=grouplist');",
                      "tool_usertogroup.gif");
 
+$objListToolBar->Add("group_edit","Edit","#", "if (GroupChecks.itemChecked()) swap('group_edit','toolbar/tool_edit_f2.gif');",
+                    "if (GroupChecks.itemChecked()) swap('group_edit', 'toolbar/tool_edit.gif');","if (GroupChecks.itemChecked()) GroupChecks.check_submit('user_editgroup', '');",
+                    "tool_edit.gif",TRUE,TRUE);
+$listImages[] = "GroupChecks.addImage('group_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); ";
+
+
 $objListToolBar->Add("user_del","la_ToolTip_DeleteFromGroup","#", "if (GroupChecks.itemChecked()) swap('user_del','toolbar/tool_delete_f2.gif');",
                     "if (GroupChecks.itemChecked()) swap('user_del', 'toolbar/tool_delete.gif');","if (GroupChecks.itemChecked()) GroupChecks.check_submit('adduser_groups', 'm_user_removegroup');",
                     "tool_delete.gif",FALSE,TRUE);
@@ -242,9 +248,11 @@
 
 /* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/  
 $orderBy = trim($objConfig->Get($SortFieldVar)." ".$order);
+
+$phrase_never = language('la_NeverExpires');
 if(strlen($orderBy))
     $orderBy = " ORDER BY ".$orderBy;
-$sql = "SELECT g.GroupId as GroupId, g.name as GroupName, count(u.PortalUserId) as UserCount FROM ".GetTablePrefix()."PortalGroup as g ";
+$sql = "SELECT g.GroupId as GroupId, g.name as GroupName, count(u.PortalUserId) as UserCount, IF(MembershipExpires IS NOT NULL, DATE_FORMAT( FROM_UNIXTIME(MembershipExpires) ,'%m/%d/%y %h:%i:%s %p'), '".$phrase_never."') AS MembershipExpires FROM ".GetTablePrefix()."PortalGroup as g ";
 $sql .="INNER JOIN ".$objSession->GetEditTable("UserGroup")." as u ON g.GroupId=u.GroupId WHERE u.PortalUserId=".$c->Get("PortalUserId")." $where GROUP BY g.name".$orderBy;
 
 if($objSession->HasSystemPermission("DEBUG.LIST"))
@@ -257,7 +265,8 @@
 $objListView->IdField = "GroupId";
 
 $objListView->ColumnHeaders->Add("GroupName", admin_language("la_prompt_GroupName"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"GroupName");
-$objListView->ColumnHeaders->Add("UserCount",admin_language("la_prompt_UserCount"),1,0,$order,"width=\"50%\"",$SortFieldVar,$SortOrderVar,"UserCount");
+$objListView->ColumnHeaders->Add("UserCount",admin_language("la_prompt_UserCount"),1,0,$order,"width=\"10%\"",$SortFieldVar,$SortOrderVar,"UserCount");
+$objListView->ColumnHeaders->Add("MembershipExpires",admin_language("la_prompt_MembershipExpires"),1,0,$order,"width=\"40%\"",$SortFieldVar,$SortOrderVar,"MembershipExpires");
 $objListView->ColumnHeaders->SetSort($objConfig->Get("UserGroup_SortField"),$order);
 
 $objListView->PrintToolBar = FALSE;