Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_userip.cpp

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index c60b2d18ddc4fa2a98dcd64971e198197b43db11..670e9a9d7a7c9a6f25634c5dd3f8f3fa6b22dd2e 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -30,21 +30,39 @@ class CommandUserip : public Command
  public:
        CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
        {
-               flags_needed = 'o'; syntax = "<nick>{,<nick>}";
+               syntax = "<nick>{,<nick>}";
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                std::string retbuf = "340 " + user->nick + " :";
                int nicks = 0;
+               bool checked_privs = false;
+               bool has_privs;
 
                for (int i = 0; i < (int)parameters.size(); i++)
                {
                        User *u = ServerInstance->FindNick(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
-                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
-                               if (IS_AWAY(u))
+                               // Anyone may query their own IP
+                               if (u != user)
+                               {
+                                       if (!checked_privs)
+                                       {
+                                               // Do not trigger the insufficient priviliges message more than once
+                                               checked_privs = true;
+                                               has_privs = user->HasPrivPermission("users/auspex");
+                                               if (!has_privs)
+                                                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                                       }
+
+                                       if (!has_privs)
+                                               continue;
+                               }
+
+                               retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
+                               if (u->IsAway())
                                        retbuf += "-";
                                else
                                        retbuf += "+";
@@ -56,7 +74,6 @@ class CommandUserip : public Command
                if (nicks != 0)
                        user->WriteServ(retbuf);
 
-               /* Dont send to the network */
                return CMD_SUCCESS;
        }
 };
@@ -70,28 +87,22 @@ class ModuleUserIP : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Modules->AddService(cmd);
                Implementation eventlist[] = { I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output = output + " USERIP";
+               tokens["USERIP"];
        }
 
-       virtual ~ModuleUserIP()
-       {
-       }
-
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for USERIP command",VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleUserIP)
-