Make SQL readable, also hide saved-searches as every user has it.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 30 insertions, 4 deletions

diff --git a/custom_extraperms.cgi b/custom_extraperms.cgi
index 174f50ffe..01ffcbe76 100755
--- a/custom_extraperms.cgi
+++ b/custom_extraperms.cgi
@@ -21,8 +21,34 @@ $user->in_group('admin')
   || $user->in_group('gentoo-dev')
   || ThrowUserError('auth_failure', {action => 'access', object => 'administrative_pages'});
 
-my $sql_archtesters = "SELECT profiles.login_name FROM profiles JOIN user_group_map ON user_id=profiles.userid JOIN groups ON groups.id=group_id WHERE user_id IN (SELECT user_id FROM user_group_map WHERE group_id=31) AND group_id != 7 AND profiles.login_name NOT LIKE '%\@gentoo.org' GROUP BY login_name ORDER BY login_name;";
-my $sql_otherperm = "SELECT profiles.login_name,groups.name AS group_name FROM profiles JOIN user_group_map ON user_id=profiles.userid JOIN groups ON groups.id=group_id WHERE user_id NOT IN (SELECT user_id FROM user_group_map WHERE group_id=31) AND group_id != 7 AND profiles.login_name NOT LIKE '%\@gentoo.org' GROUP BY login_name ORDER BY login_name;";
+my $sql_archtesters = "
+SELECT 
+profiles.login_name 
+FROM 
+	profiles 
+	JOIN user_group_map ON user_id=profiles.userid 
+	JOIN groups ON groups.id=group_id 
+WHERE 
+	user_id IN (SELECT user_id FROM user_group_map WHERE group_id=31) 
+	AND group_id != 7 
+	AND profiles.login_name NOT LIKE '%\@gentoo.org' 
+GROUP BY login_name 
+ORDER BY login_name;";
+my $sql_otherperm = "
+SELECT 
+	profiles.login_name,
+	groups.name AS group_name 
+FROM 
+	profiles 
+	JOIN user_group_map ON user_id=profiles.userid 
+	JOIN groups ON groups.id=group_id 
+WHERE 
+	user_id NOT IN (SELECT user_id FROM user_group_map WHERE group_id=31) 
+	AND group_id != 7 
+	AND profiles.login_name NOT LIKE '%\@gentoo.org' 
+	AND groups.name != 'saved-searches'
+GROUP BY login_name 
+ORDER BY login_name;";
 
 my $users;
 $users = $dbh->selectall_arrayref(
@@ -31,7 +57,7 @@ $users = $dbh->selectall_arrayref(
 	@bindValues
 );
 
-printf "<h3>Arch Testers</h3>\n";
+printf "<h3>Arch Testers that are not \@gentoo.org</h3>\n";
 foreach my $row (@$users) {
 	printf "<a href='%scustom_userhistory.cgi?matchstr=%s'>%s</a><br />\n", correct_urlbase(), $row->{'login_name'}, $row->{'login_name'};
 }
@@ -41,7 +67,7 @@ $users = $dbh->selectall_arrayref(
     { Slice => {} },
 	@bindValues
 );
-printf "<h3>Other Groups</h3>\n";
+printf "<h3>Users with Other Groups</h3>\n";
 foreach my $row (@$users) {
 	printf "<a href='%scustom_userhistory.cgi?matchstr=%s'>%s</a>: %s<br />\n", correct_urlbase(), $row->{'login_name'}, $row->{'login_name'}, $row->{'group_name'};
 }