Index: trunk/admin/users/addgroup_users.php
===================================================================
diff -u -r2853 -r4476
--- trunk/admin/users/addgroup_users.php	(.../addgroup_users.php)	(revision 2853)
+++ trunk/admin/users/addgroup_users.php	(.../addgroup_users.php)	(revision 4476)
@@ -154,7 +154,7 @@
 $GroupUsers = $c->GetUserList(true);
 if($GroupUsers)
 {
-  $list = implode(",",$GroupUsers);
+  $list = implode(",", $GroupUsers);
   $where = "u.PortalUserId IN ($list) ";
 }
 else
@@ -166,16 +166,26 @@
 $SearchWords = $objSession->GetVariable("UserGroupSearchWord");
 if(strlen($SearchWords))
 {
-    $where .= $objUsers->AdminSearchWhereClause($SearchWords);
+    $where .= ' AND '.$objUsers->AdminSearchWhereClause($SearchWords);
 }
 
+$orderBy = trim($objConfig->Get($SortFieldVar)." ".$order);
+
+if ($orderBy) {
+	$orderBy = ' ORDER BY '.$orderBy;
+}
+
 $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";
 
-if(strlen($where))
-    $sql .= " AND ".$where;
+if($where) {
+    $sql .= ' AND '.$where;
+}
+
+$sql .= $orderBy;
+
 //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Userlist"),$objConfig->Get("Perpage_User"));
 $objListView = new clsListView($objListToolBar);
 $objListView->CurrentPageVar = "Page_Userlist";
@@ -185,7 +195,7 @@
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
 
 $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
-$itemcount = $list?TableCount(GetTablePrefix()."PortalUser","PortalUserId IN ($list)",0):0;
+$itemcount = $list ? TableCount(GetTablePrefix().'PortalUser', 'PortalUserId IN ('.$list.')', 0) : 0;
   
 $objListView->SetListItems($objUsers);
 $objListView->IdField = "ResourceId";