More cleanup

[user/henk/code/inspircd.git] / src / cmd_invite.cpp

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index a91c5ba4c1d6ae3adde0a131f80bcc0604cae73a..bd212331138986ea701d9a695c0e8108848488ed 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -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]);
@@ -56,16 +58,13 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               if (c->binarymodes & CM_INVITEONLY)
-                               {
-                                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-                               }
+                               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
 
                        return;
                }
 
-               if (c->binarymodes & CM_INVITEONLY)
+               if ((c->binarymodes & CM_INVITEONLY) && (IS_LOCAL(user)))
                {
                        if (cstatus(user,c) < STATUS_HOP)
                        {
@@ -73,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 (!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;
                }
 
@@ -108,5 +110,3 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
                WriteServ(user->fd,"347 %s :End of INVITE list",user->nick);
        }
 }
-
-