FindNick, FindChan, ChanModes, UserList, CountInvisible, PurgeEmptyChannels, GetClass...

[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 853bb86e505c44d5027d46560e457ffef4eae095..580fcc636ede72ca089541037b7225c9c796ae5b 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -16,7 +16,7 @@
 #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;
@@ -26,20 +26,20 @@ ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL,
 {
 }
 
-std::pair<bool,std::string> ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+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 (cstatus(x, channel) == STATUS_OP)
+               {
+                       return std::make_pair(true, x->nick);
+               }
+               else
+               {
+                       return std::make_pair(false, parameter);
+               }
+       }
        return std::make_pair(false, parameter);
 }
 
@@ -81,7 +81,7 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                        {
                                if ((status < STATUS_OP) && (!is_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 "";
                                }
                        }
@@ -101,15 +101,18 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                if (IS_LOCAL(user))
                {
                        int MOD_RESULT = 0;
+                       log(DEBUG,"Call OnAccessCheck for AC_DEOP");
                        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
+                       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)))
                                {
-                                       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 "";
                                }
                        }