X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_uninvite.cpp;h=c8332319f39afffc071ce533d5cd222dd84e4b90;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=e9c2078cb9f1199b0b98d8babe78a0f787e84e4a;hpb=e2e581f0d3d5d844dc4b5210f566e5a5571a0570;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index e9c2078cb..c8332319f 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -35,52 +35,52 @@ class cmd_uninvite : public command_t
 		this->source = "m_uninvite.so";
 	}
 
-	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 = 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->modes[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;
+			}
+		}
 
 		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,"494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
+		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 (!c->HasUser(user))
+		{
+			WriteServ(user->fd,"492 %s %s :You're not on that channel!",user->nick, c->name);
+			return;
+		}
+
+		u->RemoveInvite(xname);
+		WriteServ(user->fd,"494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
 		WriteServ(u->fd,"493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
-                WriteChannel(c,user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
-        }
+		WriteChannel(c,user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
+	}
 };
 
 class ModuleUninvite : public Module