Release v2.0.21

[user/henk/code/inspircd.git] / src / commands / cmd_userhost.cpp

diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index d6b34456f29f2d993c2a326ad1df004ff22ab869..7e1efd6375de04c8c041c588f32580e03c91f6ee 100644 (file)
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -1,32 +1,59 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_userhost.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /USERHOST. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandUserhost : public Command
 {
-       return new CommandUserhost(Instance);
-}
+ public:
+       /** Constructor for userhost.
+        */
+       CommandUserhost ( Module* parent) : Command(parent,"USERHOST", 1) {
+               syntax = "<nick> [<nick> ...]";
+       }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+};
 
-CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       std::string retbuf = std::string("302 ") + user->nick + " :";
+       std::string retbuf = "302 " + user->nick + " :";
+
+       unsigned int max = parameters.size();
+       if (max > 5)
+               max = 5;
 
-       
-       for (int i = 0; i < pcnt; i++)
+       bool has_privs = user->HasPrivPermission("users/auspex");
+       for (unsigned int i = 0; i < max; i++)
        {
-               User *u = ServerInstance->FindNick(parameters[i]);
+               User *u = ServerInstance->FindNickOnly(parameters[i]);
 
                if ((u) && (u->registered == REG_ALL))
                {
@@ -34,16 +61,22 @@ CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user
 
                        if (IS_OPER(u))
                        {
-                               retbuf = retbuf + "*=+";
+                               // XXX: +H hidden opers must not be shown as opers
+                               ModeHandler* mh = ServerInstance->Modes->FindMode('H', MODETYPE_USER);
+                               if ((u == user) || (has_privs) || (!mh) || (!u->IsModeSet('H')) || (mh->name != "hideoper"))
+                                       retbuf += '*';
                        }
+
+                       retbuf = retbuf + "=";
+
+                       if (IS_AWAY(u))
+                               retbuf += "-";
                        else
-                       {
-                               retbuf = retbuf + "=+";
-                       }
+                               retbuf += "+";
 
                        retbuf = retbuf + u->ident + "@";
 
-                       if (IS_OPER(user))
+                       if (has_privs)
                        {
                                retbuf = retbuf + u->host;
                        }
@@ -60,3 +93,5 @@ CmdResult CommandUserhost::Handle (const char** parameters, int pcnt, User *user
 
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandUserhost)