From 6b43da7511ca875b64e58b84f72dd89485c0e7fd Mon Sep 17 00:00:00 2001 From: w00t Date: Thu, 9 Mar 2006 00:29:20 +0000 Subject: More cleanup git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3571 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_invite.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/cmd_invite.cpp') diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp index 07559a082..bd2123311 100644 --- a/src/cmd_invite.cpp +++ b/src/cmd_invite.cpp @@ -43,6 +43,8 @@ extern std::vector 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 (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)) && (!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); } } - - -- cgit v1.3.1-10-gc9f91