X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=044907b69310838cd9c1f6d01b3364c991268e64;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=c8a632b7e3c7508db641c2b2ad9826e05abcb8c5;hpb=ba7b1db56072ad803744839f038afc0098287787;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index c8a632b7e..044907b69 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -22,64 +22,68 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "message.h"
 
-Server *Srv;
+#include "configreader.h"
+#include "inspircd.h"
+
+
+
 	 
 class cmd_uninvite : public command_t
 {
  public:
-	cmd_uninvite () : command_t("UNINVITE", 0, 2)
+ cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
 	{
 		this->source = "m_uninvite.so";
+		syntax = "<nick> <channel>";
 	}
 
-	void Handle (char **parameters, int pcnt, userrec *user)
+	void Handle (const char** parameters, int pcnt, userrec *user)
 	{
-                userrec* u = Find(parameters[0]);
-                chanrec* c = FindChan(parameters[1]);
-                         
-                if ((!c) || (!u))
-                {        
-                        if (!c)
-                        {
-                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
-                        }
-                        else
-                        {
-                                WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-                        }
-                                
-                        return; 
-                }        
-
-                if (c->binarymodes & CM_INVITEONLY)
-                {
-                        if (cstatus(user,c) < STATUS_HOP)
-                        {
-                                WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-                                return;
-                        }
-                }
+		userrec* u = ServerInstance->FindNick(parameters[0]);
+		chanrec* c = ServerInstance->FindChan(parameters[1]);
+			 
+		if ((!c) || (!u))
+		{	
+			if (!c)
+			{
+				user->WriteServ("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]);
+			}
+				
+			return; 
+		}	
+
+		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;
+			}
+		}
 
 		irc::string xname(c->name);
 
-                if (!u->IsInvited(xname))
-                {
-                        WriteServ(user->fd,"491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
-                        return;
-                }
-                if (has_channel(user,c))
-                {
-                        WriteServ(user->fd,"492 %s %s :You're not on that channel!",user->nick, c->name);
-                        return;
-                }
-
-                u->RemoveInvite(xname);
-                WriteServ(user->fd,"NOTICE %s :*** Uninvited %s from %s",user->nick,u->nick,c->name);
-                WriteChannel(c,user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
-        }
+		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;
+		}
+		if (!c->HasUser(user))
+		{
+			user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
+			return;
+		}
+
+		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);
+	}
 };
 
 class ModuleUninvite : public Module
@@ -88,11 +92,11 @@ class ModuleUninvite : public Module
 
  public:
 
-	ModuleUninvite(Server* Me) : Module::Module(Me)
+	ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
-		mycommand = new cmd_uninvite();
-		Srv->AddCommand(mycommand);
+		
+		mycommand = new cmd_uninvite(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
 	}
 	
 	virtual ~ModuleUninvite()
@@ -118,7 +122,7 @@ class ModuleUninviteFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleUninvite(Me);
 	}