X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=ab748663c9c713487d7551e0ef1be7f0236ba17d;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=88d8f47079c1016b01df2a64e3c398502cdb9f7b;hpb=0201e28fc3deb7db1b3b3069e0b1ee516c61f7ff;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 88d8f4707..ab748663c 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -2,33 +2,25 @@
  *       | 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-2007 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 "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "configreader.h"
-#include "inspircd.h"
-
 
-
-	 
+/** Handle /UNINVITE
+ */	 
 class cmd_uninvite : public command_t
 {
  public:
@@ -38,7 +30,7 @@ class cmd_uninvite : public command_t
 		syntax = "<nick> <channel>";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
 	{
 		userrec* u = ServerInstance->FindNick(parameters[0]);
 		chanrec* c = ServerInstance->FindChan(parameters[1]);
@@ -54,7 +46,7 @@ class cmd_uninvite : public command_t
 				user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 			}
 				
-			return; 
+			return CMD_FAILURE;
 		}	
 
 		if (c->modes[CM_INVITEONLY])
@@ -62,7 +54,7 @@ class cmd_uninvite : public command_t
 			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;
+				return CMD_FAILURE;
 			}
 		}
 
@@ -71,18 +63,20 @@ 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;
+			return CMD_FAILURE;
 		}
 		if (!c->HasUser(user))
 		{
 			user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
-			return;
+			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(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -92,7 +86,7 @@ class ModuleUninvite : public Module
 
  public:
 
-	ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
+	ModuleUninvite(InspIRCd* Me) : Module(Me)
 	{
 		
 		mycommand = new cmd_uninvite(ServerInstance);
@@ -105,31 +99,9 @@ class ModuleUninvite : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
 	}
 };
 
+MODULE_INIT(ModuleUninvite)
 
-class ModuleUninviteFactory : public ModuleFactory
-{
- public:
-	ModuleUninviteFactory()
-	{
-	}
-	
-	~ModuleUninviteFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUninvite(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUninviteFactory;
-}