cmode(), cflags(), cstatus() -> chanrec::GetStatusChar(), chanrec::GetStatusFlags...

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 34a44b62f41a8785f3c9787b17fc56dff810816d..33cc6bb5ef2287904f4d6c30d70179557e953fe2 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -14,83 +14,75 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
 #include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "message.h"
 #include "commands.h"
-#include "inspstring.h"
 #include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_invite.h"
+#include "message.h"
+#include "commands/cmd_invite.h"
 
-extern ServerConfig* Config;
+extern InspIRCd* ServerInstance;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
-void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 {
+       int MOD_RESULT = 0;
+
        if (pcnt == 2)
        {
-               userrec* u = Find(parameters[0]);
-               chanrec* c = FindChan(parameters[1]);
+               userrec* u = ServerInstance->FindNick(parameters[0]);
+               chanrec* c = ServerInstance->FindChan(parameters[1]);
 
                if ((!c) || (!u))
                {
                        if (!c)
                        {
-                               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
+                               user->WriteServ("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]);
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
 
                        return;
                }
 
-               if (c->binarymodes & CM_INVITEONLY)
+               if ((c->modes[CM_INVITEONLY]) && (IS_LOCAL(user)))
                {
-                       if (cstatus(user,c) < STATUS_HOP)
+                       if (c->GetStatus(user) < 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);
+                               user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
                                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);
+                       user->WriteServ("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);
+                       user->WriteServ("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;
                }
 
                irc::string xname(c->name);
                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);
+               u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name);
+               user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name);
                FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
        }
        else
@@ -100,10 +92,8 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
                InvitedList* il = user->GetInviteList();
                for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
                {
-                       WriteServ(user->fd,"346 %s :%s",user->nick,i->channel.c_str());
+                       user->WriteServ("346 %s :%s",user->nick,i->channel.c_str());
                }
-               WriteServ(user->fd,"347 %s :End of INVITE list",user->nick);
+               user->WriteServ("347 %s :End of INVITE list",user->nick);
        }
 }
-
-