From 86dbfbd2484df4b15c406ff0fce0a6f3375ac633 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Fri, 19 Oct 2007 05:45:56 +0000
Subject: [PATCH] added amb1015 - sm_who now shows admin names

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401613
---
 plugins/admin-flatfile/admin-simple.sp |  2 +-
 plugins/basecommands/who.sp            | 47 +++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/plugins/admin-flatfile/admin-simple.sp b/plugins/admin-flatfile/admin-simple.sp
index a9d08332..58b94858 100644
--- a/plugins/admin-flatfile/admin-simple.sp
+++ b/plugins/admin-flatfile/admin-simple.sp
@@ -105,7 +105,7 @@ ReadAdminLine(const String:line[])
 	}
 	
 	/* Create the admin */
-	new AdminId:admin = CreateAdmin(auth);
+	new AdminId:admin = CreateAdmin();
 	
 	/* Read flags */
 	new String:flags[64];	
diff --git a/plugins/basecommands/who.sp b/plugins/basecommands/who.sp
index bcdbc0dc..cef6313c 100644
--- a/plugins/basecommands/who.sp
+++ b/plugins/basecommands/who.sp
@@ -6,16 +6,39 @@ PerformWho(client, target, ReplySource:reply)
 	if (flags == 0)
 	{
 		strcopy(flagstring, sizeof(flagstring), "none");
-	} else if (flags & ADMFLAG_ROOT) {
+	}
+	else if (flags & ADMFLAG_ROOT)
+	{
 		strcopy(flagstring, sizeof(flagstring), "root");
-	} else {
+	}
+	else
+	{
 		FlagsToString(flagstring, sizeof(flagstring), flags);
 	}
-
-	if (reply == SM_REPLY_TO_CHAT)
-		PrintToChat(client, "[SM] %t: %s", "Access", flagstring);
+	
+	decl String:name[MAX_NAME_LENGTH];
+	GetClientName(client, name, sizeof(name));
+	
+	new bool:show_name = false;
+	new String:admin_name[MAX_NAME_LENGTH];
+	new AdminId:id = GetUserAdmin(client);
+	if (id != INVALID_ADMIN_ID && GetAdminUsername(id, admin_name, sizeof(admin_name)))
+	{
+		show_name = true;
+	}
+	
+	new ReplySource:old_reply = SetCmdReplySource(reply);
+	
+	if (show_name)
+	{
+		ReplyToCommand(client, "[SM] %t", "Admin logged in as", name, admin_name, flagstring);
+	}
 	else
-		PrintToConsole(client, "[SM] %t: %s", "Access", flagstring);
+	{
+		ReplyToCommand(client, "[SM] %t", "Admin logged in anon", name, flagstring);
+	}
+	
+	SetCmdReplySource(old_reply);
 }
 
 DisplayWhoMenu(client)
@@ -118,9 +141,13 @@ public Action:Command_Who(client, args)
 			if (flags == 0)
 			{
 				strcopy(flagstring, sizeof(flagstring), "none");
-			} else if (flags & ADMFLAG_ROOT) {
+			}
+			else if (flags & ADMFLAG_ROOT)
+			{
 				strcopy(flagstring, sizeof(flagstring), "root");
-			} else {
+			}
+			else
+			{
 				FlagsToString(flagstring, sizeof(flagstring), flags);
 			}
 			decl String:name[65];
@@ -146,7 +173,9 @@ public Action:Command_Who(client, args)
 	{
 		ReplyToCommand(client, "[SM] %t", "No matching client");
 		return Plugin_Handled;
-	} else if (numClients > 1) {
+	}
+	else if (numClients > 1)
+	{
 		ReplyToCommand(client, "[SM] %t", "More than one client matches", arg);
 		return Plugin_Handled;
 	}