Decide that it wasn't quite appropriate :(

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 0c1b01ebacdf6be307a4c54be3b8cc5bf0ce1d54..6f6cbaa7d70271efb02b6af133a773414e8e4031 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
@@ -19,15 +19,7 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include <time.h>
 #include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
 #include <vector>
 #include <deque>
 #include "users.h"
@@ -35,32 +27,19 @@ using namespace std;
 #include "globals.h"
 #include "modules.h"
 #include "dynamic.h"
-#include "wildcard.h"
 #include "message.h"
 #include "commands.h"
-#include "mode.h"
-#include "xline.h"
 #include "inspstring.h"
-#include "dnsqueue.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "socketengine.h"
 #include "typedefs.h"
 #include "command_parse.h"
 #include "cmd_invite.h"
 
 extern ServerConfig* Config;
-extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern user_hash clientlist;
-extern chan_hash chanlist;
-extern whowas_hash whowas;
-extern std::vector<userrec*> all_opers;
-extern std::vector<userrec*> local_users;
-extern userrec* fd_ref_table[65536];
 
 void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 {
@@ -77,16 +56,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)
                        {
@@ -99,14 +75,14 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
                        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)) && (!has_channel(user,c)))
                {
                        WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
                        return;
                }
 
                int MOD_RESULT = 0;
-               FOREACH_RESULT(OnUserPreInvite(user,u,c));
+               FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
                if (MOD_RESULT == 1) {
                        return;
                }
@@ -115,7 +91,7 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
                u->InviteTo(xname);
                WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
                WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);
-               FOREACH_MOD OnUserInvite(user,u,c);
+               FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
        }
        else
        {