X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_uninvite.cpp;h=9940d46d8818315b28af23d45526710b23492f4d;hb=52671661f8fdca0b61aec8009b4bc7de9bc00166;hp=697e46908d6ffbd7d24d0f87fecd5be9ab3464dc;hpb=d0b4bb3811458aa335857514e4cbb95d5c84f433;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 697e46908..9940d46d8 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,67 +2,57 @@
  *       | 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 "configreader.h"
 #include "inspircd.h"
 
-
-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 char* const* parameters, int pcnt, 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, parameters[1]);
 			}
 			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, parameters[0]);
 			}
 				
-			return; 
+			return CMD_FAILURE;
 		}	
 
 		if (c->modes[CM_INVITEONLY])
 		{
 			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(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick, c->name,
+						ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
+				return CMD_FAILURE;
 			}
 		}
 
@@ -70,33 +60,36 @@ class cmd_uninvite : public command_t
 
 		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,u->nick,c->name,c->name);
+			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->name);
+			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);
+		user->WriteNumeric(494, "%s %s %s :Uninvited",user->nick,c->name,u->nick);
+		u->WriteNumeric(493, "%s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
 		c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleUninvite : public Module
 {
-	cmd_uninvite *mycommand;
+	CommandUninvite *mycommand;
 
  public:
 
-	ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
+	ModuleUninvite(InspIRCd* Me) : Module(Me)
 	{
 		
-		mycommand = new cmd_uninvite();
+		mycommand = new CommandUninvite(ServerInstance);
 		ServerInstance->AddCommand(mycommand);
+
 	}
 	
 	virtual ~ModuleUninvite()
@@ -105,32 +98,9 @@ class ModuleUninvite : public Module
 	
 	virtual Version GetVersion()
 	{
-		/* Must be static, because we dont want to desync invite lists */
-		return Version(1, 0, 0, 0, VF_VENDOR|VF_STATIC);
-	}
-};
-
-
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-	ModuleUninviteFactory()
-	{
-	}
-	
-	~ModuleUninviteFactory()
-	{
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUninvite(Me);
-	}
-	
 };
 
+MODULE_INIT(ModuleUninvite)
 
-extern "C" void * init_module( void )
-{
-	return new ModuleUninviteFactory;
-}