X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=bd212331138986ea701d9a695c0e8108848488ed;hb=6b43da7511ca875b64e58b84f72dd89485c0e7fd;hp=6f6cbaa7d70271efb02b6af133a773414e8e4031;hpb=6b9a97e494e0dc5bccd13733a4a7067e9bbeae2e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 6f6cbaa7d..bd2123311 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -43,6 +43,8 @@ extern std::vector<ircd_module*> factory;
 
 void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 {
+	int MOD_RESULT = 0;
+
 	if (pcnt == 2)
 	{
 		userrec* u = Find(parameters[0]);
@@ -70,20 +72,23 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 				return;
 			}
 		}
-		if (has_channel(u,c))
+
+		if (c->HasUser(u))
 	 	{
 	 		WriteServ(user->fd,"443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
 	 		return;
 		}
-		if ((IS_LOCAL(user)) && (!has_channel(user,c)))
+
+		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
 	 	{
 			WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
 	  		return;
 		}
 
-		int MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
-		if (MOD_RESULT == 1) {
+
+		if (MOD_RESULT == 1)
+		{
 			return;
 		}
 
@@ -105,5 +110,3 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 		WriteServ(user->fd,"347 %s :End of INVITE list",user->nick);
 	}
 }
-
-