Remove InspIRCd* parameters and fields

[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 e75e551b2be1d2b2aecd77dc5bec777beef5314d..8160a38a648afc46d893d7679d412b0bd621dcad 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,124 +1,80 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "hash_map.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
+#include "configreader.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() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelOp::ModeChannelOp() : ModeHandler(NULL, 'o', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+       list = true;
+       prefix = '@';
+       levelrequired = OP_VALUE;
+       m_paramtype = TR_NICK;
 }
 
-ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+unsigned int ModeChannelOp::GetPrefixRank()
 {
-        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);
-                }
-        }
-       return std::make_pair(false, parameter);
+       return OP_VALUE;
 }
 
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-       int status = cstatus(source, channel);
-
-       /* Call the correct method depending on wether we're adding or removing the mode */
-       if (adding)
-       {
-               parameter = this->AddOp(source, parameter.c_str(), channel, status);
-       }
-       else
+       User* x = ServerInstance->FindNick(parameter);
+       if (x)
        {
-               parameter = this->DelOp(source, parameter.c_str(), channel, status);
+               Membership* memb = channel->GetUser(x);
+               if (memb && memb->hasMode('o'))
+               {
+                       return std::make_pair(true, x->nick);
+               }
+               else
+               {
+                       return std::make_pair(false, parameter);
+               }
        }
-       /* If the method above 'ate' the parameter by reducing it to an empty string, then
-        * it won't matter wether we return ALLOW or DENY here, as an empty string overrides
-        * the return value and is always MODEACTION_DENY if the mode is supposed to have
-        * a parameter.
-        */
-       return MODEACTION_ALLOW;
+       return std::make_pair(false, parameter);
 }
 
-std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
+
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       const UserMembList* clist = channel->GetUsers();
 
-       if (d)
+       for (UserMembCIter i = clist->begin(); i != clist->end(); i++)
        {
-               if (IS_LOCAL(user))
+               if (stack)
+                       stack->Push(this->GetModeChar(), i->first->nick);
+               else
                {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_OP));
-
-                       if (MOD_RESULT == ACR_DENY)
-                               return "";
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
-                               {
-                                       WriteServ(user->fd,"482 %s %s :You're not a channel operator",user->nick, chan->name);
-                                       return "";
-                               }
-                       }
+                       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);
                }
-
-               return ModeParser::Grant(d,chan,UCMODE_OP);
        }
-       return "";
 }
 
-std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
-
-       if (d)
-       {
-               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);
-                                       return "";
-                               }
-                       }
-               }
+}
 
-               return ModeParser::Revoke(d,chan,UCMODE_OP);
-       }
-       return "";
+ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
+{
+       return MODEACTION_ALLOW;
 }