- Cleaned up RPL_WHOISADMIN hack

--- Diese und die folgenden Zeilen werden ignoriert --

M    include/numeric.h
M    src/numeric.c
M    modules/m_whois.c


git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2726 82007160-df01-0410-b94d-b575c5fd34c7

3 files changed, 6 insertions, 7 deletions

diff --git a/include/numeric.h b/include/numeric.h
index a80ea91..84a7e78 100644
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -117,8 +117,6 @@ extern const char *form_str(unsigned int);
 #define RPL_UNAWAY           305
 #define RPL_NOWAWAY          306
 #define RPL_WHOISREGNICK     307
-#define RPL_WHOISADMIN	     308
-
 #define RPL_WHOISUSER        311
 #define RPL_WHOISSERVER      312
 #define RPL_WHOISOPERATOR    313
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 9f62a58..a7716fe 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -132,9 +132,10 @@ whois_person(struct Client *source_p, struct Client *target_p)
 
   if (HasUMode(target_p, UMODE_OPER))
     if (!HasUMode(target_p, UMODE_HIDDEN) || HasUMode(source_p, UMODE_OPER))
-      sendto_one(source_p, form_str(HasUMode(target_p, UMODE_ADMIN) ? RPL_WHOISADMIN :
-                 RPL_WHOISOPERATOR),
-                 me.name, source_p->name, target_p->name);
+      sendto_one(source_p, form_str(RPL_WHOISOPERATOR), me.name,
+                 source_p->name, target_p->name,
+                 HasUMode(target_p, UMODE_ADMIN) ? "is a Server Administrator" :
+                                                   "is an IRC Operator");
 
   if (HasUMode(target_p, UMODE_WEBIRC))
     sendto_one(source_p, form_str(RPL_WHOISTEXT),
diff --git a/src/numeric.c b/src/numeric.c
index 2fe88eb..882e6c0 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -339,12 +339,12 @@ static const char *const replies[] = {
 /* 305 RPL_UNAWAY */ ":%s 305 %s :You are no longer marked as being away",
 /* 306 RPL_NOWAWAY */ ":%s 306 %s :You have been marked as being away",
 /* 307 RPL_WHOISREGNICK */ ":%s 307 %s %s :has identified for this nick",
-/* 308 RPL_WHOISADMIN */ ":%s 313 %s %s :is a Server Administrator",
+/* 308 */ NULL,
 /* 309 */ NULL,
 /* 310 */ NULL,
 /* 311 RPL_WHOISUSER */ ":%s 311 %s %s %s %s * :%s",
 /* 312 RPL_WHOISSERVER */ ":%s 312 %s %s %s :%s",
-/* 313 RPL_WHOISOPERATOR */ ":%s 313 %s %s :is an IRC Operator",
+/* 313 RPL_WHOISOPERATOR */ ":%s 313 %s %s :%s",
 /* 314 RPL_WHOWASUSER */ ":%s 314 %s %s %s %s * :%s",
 /* 315 RPL_ENDOFWHO */ ":%s 315 %s %s :End of /WHO list.",
 /* 316 */ NULL,