X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=7b9d7416bc1933ff3aafec6c72a8136e69d68c61;hb=58f4306bb6e1f91076fccf30a3b43a40b3d1915a;hp=8d8d46c479a374a5a185221cdfd4355c6b6bba12;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 8d8d46c47..7b9d7416b 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,135 +2,104 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 /* $ModDesc: Provides the UNINVITE command which lets users un-invite other users from channels (!) */
 
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include "message.h"
 #include "inspircd.h"
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
-	 
-class cmd_uninvite : public command_t
+/** Handle /UNINVITE
+ */
+class CommandUninvite : public Command
 {
  public:
-	cmd_uninvite () : command_t("UNINVITE", 0, 2)
+	CommandUninvite (InspIRCd* Instance) : Command(Instance,"UNINVITE", 0, 2)
 	{
 		this->source = "m_uninvite.so";
 		syntax = "<nick> <channel>";
+		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		userrec* u = ServerInstance->FindNick(parameters[0]);
-		chanrec* c = ServerInstance->FindChan(parameters[1]);
-			 
+		User* u = ServerInstance->FindNick(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[1]);
+
 		if ((!c) || (!u))
-		{	
+		{
 			if (!c)
 			{
-				user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
+				user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[1].c_str());
 			}
 			else
 			{
-				user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+				user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str());
 			}
-				
-			return; 
-		}	
 
-		if (c->modes[CM_INVITEONLY])
+			return CMD_FAILURE;
+		}
+
+		if (IS_LOCAL(user))
 		{
-			if (cstatus(user,c) < STATUS_HOP)
+			if (c->GetStatus(user) < STATUS_HOP)
 			{
-				user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-				return;
+				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-");
+				return CMD_FAILURE;
 			}
 		}
 
-		irc::string xname(c->name);
+		irc::string xname(c->name.c_str());
 
 		if (!u->IsInvited(xname))
 		{
-			user->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
-			return;
+			user->WriteNumeric(491, "%s %s %s :Is not invited to channel %s", user->nick.c_str(), u->nick.c_str(), c->name.c_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
 		if (!c->HasUser(user))
 		{
-			user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
-			return;
+			user->WriteNumeric(492, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str());
+			return CMD_FAILURE;
 		}
 
 		u->RemoveInvite(xname);
-		user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
-		u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
-		c->WriteChannelWithServ(Srv->GetServerName().c_str(), "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+		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());
+
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleUninvite : public Module
 {
-	cmd_uninvite *mycommand;
+	CommandUninvite *mycommand;
 
  public:
 
-	ModuleUninvite(Server* Me) : Module::Module(Me)
-	{
-		Srv = Me;
-		mycommand = new cmd_uninvite();
-		Srv->AddCommand(mycommand);
-	}
-	
-	virtual ~ModuleUninvite()
-	{
-	}
-	
-	virtual Version GetVersion()
+	ModuleUninvite(InspIRCd* Me) : Module(Me)
 	{
-		/* Must be static, because we dont want to desync invite lists */
-		return Version(1, 0, 0, 0, VF_VENDOR|VF_STATIC);
-	}
-};
 
+		mycommand = new CommandUninvite(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-	ModuleUninviteFactory()
-	{
 	}
-	
-	~ModuleUninviteFactory()
+
+	virtual ~ModuleUninvite()
 	{
 	}
-	
-	virtual Module * CreateModule(Server* Me)
+
+	virtual Version GetVersion()
 	{
-		return new ModuleUninvite(Me);
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
-	
 };
 
+MODULE_INIT(ModuleUninvite)
 
-extern "C" void * init_module( void )
-{
-	return new ModuleUninviteFactory;
-}