ModResult conversion: Change return type of all module functions

[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 dac4198ff4466a6624060d54cea8bb139ede643c..908eb698c04f9df60c27a26354b9450f474bfdf0 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,7 +19,7 @@
 #include "modules.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, NULL, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@', '@', TR_NICK)
 {
 }
 
@@ -46,13 +46,12 @@ ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::strin
 }
 
 
-void ModeChannelOp::RemoveMode(Channel* channel)
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-       CUList* list = channel->GetOppedUsers();
+       CUList* clist = channel->GetOppedUsers();
        CUList copy;
-       char moderemove[MAXBUF];
 
-       for (CUList::iterator i = list->begin(); i != list->end(); i++)
+       for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
        {
                User* n = i->first;
                copy.insert(std::make_pair(n,n->nick));
@@ -60,13 +59,17 @@ void ModeChannelOp::RemoveMode(Channel* channel)
 
        for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
        {
-               sprintf(moderemove,"-%c",this->GetModeChar());
-               const char* parameters[] = { channel->name, moderemove, i->first->nick };
-               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+               if (stack)
+                       stack->Push(this->GetModeChar(), i->first->nick);
+               else
+               {
+                       std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-o"); parameters.push_back(i->first->nick);
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+               }
        }
 }
 
-void ModeChannelOp::RemoveMode(User*)
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
@@ -102,16 +105,16 @@ std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int s
        {
                if (IS_LOCAL(user))
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
+                       ModResult MOD_RESULT;
+                       FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_OP));
 
-                       if (MOD_RESULT == ACR_DENY)
+                       if (MOD_RESULT == MOD_RES_DENY)
                                return "";
-                       if (MOD_RESULT == ACR_DEFAULT)
+                       if (MOD_RESULT == MOD_RES_PASSTHRU)
                        {
                                if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
                                {
-                                       user->WriteServ("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.c_str(), chan->name.c_str());
                                        return "";
                                }
                        }
@@ -130,16 +133,16 @@ std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int s
        {
                if (IS_LOCAL(user))
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
+                       ModResult MOD_RESULT;
+                       FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, MOD_RESULT, (user,d,chan,AC_DEOP));
 
-                       if (MOD_RESULT == ACR_DENY)
+                       if (MOD_RESULT == MOD_RES_DENY)
                                return "";
-                       if (MOD_RESULT == ACR_DEFAULT)
+                       if (MOD_RESULT == MOD_RES_PASSTHRU)
                        {
                                if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
                                {
-                                       user->WriteServ("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.c_str(), chan->name.c_str());
                                        return "";
                                }
                        }