From fe7f92f59148e2cc793d41ee6b0f43aa212b58cf Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 30 Dec 2003 02:28:26 +0000
Subject: [PATCH] merging 5.5.4 bugfixes

---
 lib/WebGUI/Operation/Group.pm      | 5 +++--
 lib/WebGUI/Operation/Statistics.pm | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 1c6a204a3..d5815534c 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -447,14 +447,15 @@ sub www_manageUsersInGroupSecondary {
         return WebGUI::Privilege::adminOnly() unless _hasSecondaryPrivilege($session{form}{gid});
         my ($output, $sth, %hash);
         tie %hash, 'Tie::CPHash';
-        $output = '<h1>'.WebGUI::International::get(88).'</h1>';
+	my $group = WebGUI::Group->new($session{form}{gid});
+        $output = '<h1>'.WebGUI::International::get(88).' '.$group->name.'</h1>';
 	my $f = WebGUI::HTMLForm->new;
 	$f->hidden("gid",$session{form}{gid});
 	$f->hidden("op","addUsersToGroupSecondarySave");
 	my $existingUsers = WebGUI::Grouping::getUsersInGroup($session{form}{gid});
 	push(@{$existingUsers},"1");
 	push(@{$existingUsers},"3");
-	my $users = WebGUI::SQL->buildHashRef("select userId,username from users where status='Active' and userId not in (".join(",",@{$existingUsers}).")");
+	my $users = WebGUI::SQL->buildHashRef("select userId,username from users where status='Active' and userId not in (".join(",",@{$existingUsers}).") order by username");
 	$f->selectList(
 		-name=>"users",
 		-label=>WebGUI::International::get(976),
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 20923cb28..43d4c014b 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -184,7 +184,7 @@ sub www_viewStatistics {
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(427).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = WebGUI::SQL->quickArray("select count(*) from template where templateId>1000");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(792).':</td><td class="tableData">'.$data.'</td></tr>';
-	($data) = WebGUI::SQL->quickArray("select count(*) from collateral where collateralId>1000");
+	($data) = WebGUI::SQL->quickArray("select count(*) from collateral");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(793).':</td><td class="tableData">'.$data.'</td></tr>';
 	($data) = WebGUI::SQL->quickArray("select count(*) from userSession");
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(146).':</td><td class="tableData">'.$data.'</td></tr>';