Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

[user/henk/code/inspircd.git] / src / modes / cmode_o.cpp

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index a24cc2af9ca95f81bcde738d735ed14da1d204ba..85eb08c381a1ced66a9a593e14a96992d36b7024 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,51 +1,40 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "hash_map.h"
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "helperfuncs.h"
-#include "message.h"
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_o.h"
 
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
+{
+}
 
-ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, false)
+unsigned int ModeChannelOp::GetPrefixRank()
 {
+       return OP_VALUE;
 }
 
 ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
 {
-        userrec* x = Find(parameter);
-        if (x)
-        {
-                if (cstatus(x, channel) == STATUS_OP)
-                {
-                        return std::make_pair(true, x->nick);
-                }
-                else
-                {
-                        return std::make_pair(false, parameter);
-                }
-        }
+       userrec* x = ServerInstance->FindNick(parameter);
+       if (x)
+       {
+               if (channel->GetStatusFlags(x) & UCMODE_OP)
+               {
+                       return std::make_pair(true, x->nick);
+               }
+               else
+               {
+                       return std::make_pair(false, parameter);
+               }
+       }
        return std::make_pair(false, parameter);
 }
 
 ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 {
-       int status = cstatus(source, channel);
+       int status = channel->GetStatus(source);
 
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
@@ -66,7 +55,7 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
 
 std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -79,43 +68,46 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
                                {
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
+                                       user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        return "";
                                }
                        }
                }
 
-               return ModeParser::Grant(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
        }
        return "";
 }
 
 std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
                if (IS_LOCAL(user))
                {
                        int MOD_RESULT = 0;
+                       ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
                        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
+                       ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
+
                        if (MOD_RESULT == ACR_DENY)
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
                                {
-                                       WriteServ(user->fd,"482 %s %s :You are not a channel operator",user->nick, chan->name);
+                                       user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
                                        return "";
                                }
                        }
                }
 
-               return ModeParser::Revoke(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
        }
        return "";
 }