Index: trunk/admin/users/user_select.php
===================================================================
diff -u -r781 -r789
--- trunk/admin/users/user_select.php (.../user_select.php) (revision 781)
+++ trunk/admin/users/user_select.php (.../user_select.php) (revision 789)
@@ -138,7 +138,12 @@
//$objListToolBar->AddToInitScript($listImages);
+// order-by related stuff
$order = $objConfig->Get("UserSelect_SortOrder");
+$field = $objConfig->Get("UserSelect_SortField");
+if(!strlen($field)) $field = "Login";
+$OrderBy = 'ORDER BY '.$field.' '.$order;
+
$SearchWords = $objSession->GetVariable("UserSelectSearchWord");
if(strlen($SearchWords))
@@ -176,16 +181,13 @@
{
// we have users in group requested
$catlist = implode(",",$inlist);
- $field = $objConfig->Get("UserSelect_SortField");
- if(!strlen($field))
- $field = "Login";
- $orderby = $field." ".$order;
+
$sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ";
- $sql .= "u.PortalUserId NOT IN (".$catlist.")";
-
+ $sql .= "u.PortalUserId NOT IN (".$catlist.") $OrderBy";
+ //echo 'sql1: '.$sql.'
';
$objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
}
@@ -196,8 +198,8 @@
$sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
- $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1";
-
+ $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1 $OrderBy";
+ //echo 'sql2: '.$sql.'
';
$objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
@@ -212,8 +214,8 @@
$sql = "SELECT u.*,g.Name as GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') as DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup as ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
- $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1 $where";
-
+ $sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1 $where $OrderBy";
+ //echo 'sql3: '.$sql.'
';
$objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = QueryCount($sql);
}
@@ -242,7 +244,7 @@
$objListView->ColumnHeaders->Add("FirstName",admin_language("la_prompt_First_Name"),1,0,$order,"width=\"15%\"","UserSelect_SortField","UserSelect_SortOrder","FirstName");
$objListView->ColumnHeaders->Add("Email",admin_language("la_prompt_Email"),1,0,$order,"width=\"20%\"","UserSelect_SortField","UserSelect_SortOrder","Email");
$objListView->ColumnHeaders->Add("GroupName",admin_language("la_prompt_PrimaryGroup"),1,0,$order,"width=\"20%\"","UserSelect_SortField","UserSelect_SortOrder","GroupName");
-$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"","UserSelect_SortField","UserSelect_SortOrder","DateCreated");
+$objListView->ColumnHeaders->Add("DateCreated",admin_language("la_prompt_CreatedOn"),1,0,$order,"width=\"15%\"","UserSelect_SortField","UserSelect_SortOrder","CreatedOn");
$objListView->ColumnHeaders->SetSort($objConfig->Get("UserSelect_SortField"),$order);