X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=04396739340c2dda7e680d48b06ae45e781ecafe;hb=0e5fb98a6b82af738f6d5c3093d9597d470be3a6;hp=5ea84c04aa8b925c382b48a12db83d0a70ac300e;hpb=538a89420955d55cc21d421fe1e961500591479d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 5ea84c04a..043967393 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for USERIP command */
-
 /** Handle /USERIP
  */
 class CommandUserip : public Command
@@ -30,7 +28,7 @@ class CommandUserip : public Command
  public:
 	CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
 	{
-		syntax = "<nick>{,<nick>}";
+		syntax = "<nick> [<nick> ...]";
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -42,7 +40,7 @@ class CommandUserip : public Command
 
 		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
@@ -54,15 +52,15 @@ class CommandUserip : public Command
 						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());
+							user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - You do not have the required operator privileges");
 					}
 
 					if (!has_privs)
 						continue;
 				}
 
-				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
-				if (IS_AWAY(u))
+				retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
+				if (u->IsAway())
 					retbuf += "-";
 				else
 					retbuf += "+";
@@ -87,28 +85,15 @@ class ModuleUserIP : public Module
 	{
 	}
 
-	void init()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		tokens["USERIP"];
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		output = output + " USERIP";
-	}
-
-	virtual ~ModuleUserIP()
-	{
-	}
-
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for USERIP command",VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleUserIP)
-