m_timedbans Notice user when trying to set a ban that's already set

[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 637c4fd6fbfd46216a909cdf9fe86662e36e22f6..9502c91b19d99f852b8290952b3ba429e7a5a5a1 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -30,19 +30,37 @@ 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 = std::string("340 ") + user->nick + " :";
+               std::string retbuf = "340 " + user->nick + " :";
                int nicks = 0;
+               bool checked_privs = false;
+               bool has_privs = false;
 
                for (int i = 0; i < (int)parameters.size(); i++)
                {
-                       User *u = ServerInstance->FindNick(parameters[i]);
+                       User *u = ServerInstance->FindNickOnly(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
+                               // 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 + (IS_OPER(u) ? "*" : "") + "=";
                                if (IS_AWAY(u))
                                        retbuf += "-";
@@ -56,7 +74,6 @@ class CommandUserip : public Command
                if (nicks != 0)
                        user->WriteServ(retbuf);
 
-               /* Dont send to the network */
                return CMD_SUCCESS;
        }
 };
@@ -68,15 +85,18 @@ class ModuleUserIP : public Module
        ModuleUserIP()
                : cmd(this)
        {
-               ServerInstance->AddCommand(&cmd);
-               Implementation eventlist[] = { I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
+       void init()
+       {
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
 
        virtual void On005Numeric(std::string &output)
        {
-               output = output + std::string(" USERIP");
+               output = output + " USERIP";
        }
 
        virtual ~ModuleUserIP()