/who tidyup - needs QA'ing

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6641 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/commands/cmd_who.h b/include/commands/cmd_who.h
index 299b70cdde1f2b653f353e21aef1a1376f404def..c4c381b553c21c133e50ac920f03c9872eaaf243 100644 (file)
--- a/include/commands/cmd_who.h
+++ b/include/commands/cmd_who.h
@@ -3,13 +3,13 @@
  *       +------------------------------------+
  *
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *                    E-mail:
+ *             <brain@chatspike.net>
+ *             <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -27,9 +27,15 @@
 class cmd_who : public command_t
 {
        bool CanView(chanrec* chan, userrec* user);
+       bool opt_viewopersonly;
+       bool opt_showrealhost;
+       bool opt_unlimit;
+       bool opt_realname;
+       bool opt_mode;
  public:
-        cmd_who (InspIRCd* Instance) : command_t(Instance,"WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohur]"; }
-        CmdResult Handle(const char** parameters, int pcnt, userrec *user);
+       cmd_who (InspIRCd* Instance) : command_t(Instance,"WHO",0,1) { syntax = "<server>|<nickname>|<channel>|<realname>|<host>|0 [ohur]"; }
+       void SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults);
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user);
 };
 
 #endif

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index e6d6287ffba1843789862c9522d2449a884e9398..c4c37e52876d260c0ac32c3af203fbdf8b85695e 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -6,7 +6,7 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -91,6 +91,35 @@ bool cmd_who::CanView(chanrec* chan, userrec* user)
        return false;
 }
 
+void cmd_who::SendWhoLine(userrec* user, const std::string &initial, chanrec* ch, userrec* u, std::vector<std::string> &whoresults)
+{
+       std::string lcn = getlastchanname(u);
+       chanrec* chlast = ServerInstance->FindChan(lcn);
+
+       std::string wholine =   initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
+                               ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : u->server) +
+                               " " + u->nick + " ";
+
+       /* away? */
+       if (u->awaymsg)
+       {
+               wholine.append("G");
+       }
+       else
+       {
+               wholine.append("H");
+       }
+
+       /* oper? */
+       if (u->oper)
+       {
+               wholine.append("*");
+       }
+
+       wholine = wholine + (ch ? ch->GetPrefixChar(u) : (chlast ? chlast->GetPrefixChar(u) : "")) + " :0 " + u->fullname;
+       whoresults.push_back(wholine);
+}
+
 CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 {
        /*
@@ -101,11 +130,11 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
         */
 
        /* WHO options */
-       bool opt_viewopersonly = false;
-       bool opt_showrealhost = false;
-       bool opt_unlimit = false;
-       bool opt_realname = false;
-       bool opt_mode = false;
+       opt_viewopersonly = false;
+       opt_showrealhost = false;
+       opt_unlimit = false;
+       opt_realname = false;
+       opt_mode = false;
 
        chanrec *ch = NULL;
        std::vector<std::string> whoresults;
@@ -165,31 +194,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                        if (opt_viewopersonly && !*(i->second)->oper)
                                continue;
 
-                       /* XXX - code duplication; this could be more efficient -- w00t */
-                       std::string wholine = initial;
-
-                       wholine = wholine + ch->name + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
-                                       ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : i->second->server) +
-                                       " " + i->second->nick + " ";
-
-                       /* away? */
-                       if (*(i->second)->awaymsg)
-                       {
-                               wholine.append("G");
-                       }
-                       else
-                       {
-                               wholine.append("H");
-                       }
-
-                       /* oper? */
-                       if (*(i->second)->oper)
-                       {
-                               wholine.append("*");
-                       }
-
-                       wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
-                       whoresults.push_back(wholine);
+                       SendWhoLine(user, initial, ch, i->second, whoresults);
                }
        }
        else
@@ -205,32 +210,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 
                                if (whomatch(oper, matchtext, opt_realname, opt_showrealhost, opt_mode))
                                {
-                                       std::string wholine = initial;
-       
-                                       wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " + 
-                                                       ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : oper->server) +
-                                                       " " + oper->nick + " ";
-
-                                       ch = ServerInstance->FindChan(getlastchanname(oper));
-
-                                       /* away? */
-                                       if (*oper->awaymsg)
-                                       {
-                                               wholine.append("G");
-                                       }
-                                       else
-                                       {
-                                               wholine.append("H");
-                                       }
-       
-                                       /* oper? */
-                                       if (*oper->oper)
-                                       {
-                                               wholine.append("*");
-                                       }
-       
-                                       wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
-                                       whoresults.push_back(wholine);
+                                       SendWhoLine(user, initial, NULL, oper, whoresults);
                                }
                        }
                }
@@ -240,32 +220,7 @@ CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                        {
                                if (whomatch(i->second, matchtext, opt_realname, opt_showrealhost, opt_mode))
                                {
-                                       std::string wholine = initial;
-       
-                                       wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
-                                               ((*ServerInstance->Config->HideWhoisServer && !*user->oper) ? ServerInstance->Config->HideWhoisServer : i->second->server) +
-                                               " " + i->second->nick + " ";
-       
-                                       ch = ServerInstance->FindChan(getlastchanname(i->second));
-
-                                       /* away? */
-                                       if (*(i->second)->awaymsg)
-                                       {
-                                               wholine.append("G");
-                                       }
-                                       else
-                                       {
-                                               wholine.append("H");
-                                       }
-
-                                       /* oper? */
-                                       if (*(i->second)->oper)
-                                       {
-                                               wholine.append("*");
-                                       }
-
-                                       wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
-                                       whoresults.push_back(wholine);
+                                       SendWhoLine(user, initial, NULL, i->second, whoresults);
                                }
                        }
                }