X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=1d7941b573a8539f14c65a438f4f929b6104f473;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=e816e79f485a107d84e3ba1e9a97597efea1f19e;hpb=ecc55199cf2bad355d6c902fac7076d002c3199e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index e816e79f4..1d7941b57 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,8 @@
 class CommandUninvite : public Command
 {
  public:
-	CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
+	CommandUninvite(Module* Creator) : Command(Creator,"UNINVITE", 2)
 	{
-		this->source = "m_uninvite.so";
 		syntax = "<nick> <channel>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
@@ -48,9 +47,9 @@ class CommandUninvite : public Command
 
 		if (IS_LOCAL(user))
 		{
-			if (c->GetStatus(user) < STATUS_HOP)
+			if (c->GetPrefixValue(user) < HALFOP_VALUE)
 			{
-				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-");
+				user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetPrefixValue(u) == HALFOP_VALUE ? "" : "half-");
 				return CMD_FAILURE;
 			}
 		}
@@ -71,24 +70,26 @@ class CommandUninvite : public Command
 		u->RemoveInvite(xname);
 		user->WriteNumeric(494, "%s %s %s :Uninvited", user->nick.c_str(), c->name.c_str(), u->nick.c_str());
 		u->WriteNumeric(493, "%s :You were uninvited from %s by %s", u->nick.c_str(), c->name.c_str(), user->nick.c_str());
-		c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
+		c->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :*** %s uninvited %s.", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
 
 		return CMD_SUCCESS;
 	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		return ROUTE_BROADCAST;
+	}
 };
 
 class ModuleUninvite : public Module
 {
-	CommandUninvite *mycommand;
+	CommandUninvite cmd;
 
  public:
 
-	ModuleUninvite(InspIRCd* Me) : Module(Me)
+	ModuleUninvite() : cmd(this)
 	{
-
-		mycommand = new CommandUninvite(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleUninvite()
@@ -97,7 +98,7 @@ class ModuleUninvite : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+		return Version("Provides the UNINVITE command which lets users un-invite other users from channels (!)", VF_VENDOR | VF_COMMON, API_VERSION);
 	}
 };