X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_userip.cpp;h=1b2ce9b1382e4f7580b005f572375331cd8da932;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=670e9a9d7a7c9a6f25634c5dd3f8f3fa6b22dd2e;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 670e9a9d7..1b2ce9b13 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)
@@ -38,11 +36,11 @@ class CommandUserip : public Command
 		std::string retbuf = "340 " + user->nick + " :";
 		int nicks = 0;
 		bool checked_privs = false;
-		bool has_privs;
+		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
@@ -54,7 +52,7 @@ 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)
@@ -87,13 +85,6 @@ class ModuleUserIP : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
 		tokens["USERIP"];