Remove InspIRCd* parameters and fields

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

diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index ecee93388387c0e997e18608583a936af35f1fa1..d5472c154650f035dc6239e2c70f6dad9a6a2cf8 100644 (file)
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 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,8 +19,12 @@
 #include "modules.h"
 #include "modes/cmode_h.h"
 
-ModeChannelHalfOp::ModeChannelHalfOp(InspIRCd* Instance) : ModeHandler(Instance, 'h', 1, 1, true, MODETYPE_CHANNEL, false, '%')
+ModeChannelHalfOp::ModeChannelHalfOp() : ModeHandler(NULL, 'h', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
+       list = true;
+       prefix = '%';
+       levelrequired = OP_VALUE;
+       m_paramtype = TR_NICK;
 }
 
 unsigned int ModeChannelHalfOp::GetPrefixRank()
@@ -28,135 +32,51 @@ unsigned int ModeChannelHalfOp::GetPrefixRank()
        return HALFOP_VALUE;
 }
 
-ModePair ModeChannelHalfOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelHalfOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-       userrec* x = ServerInstance->FindNick(parameter);
+       User* x = ServerInstance->FindNick(parameter);
        if (x)
        {
-               if (channel->GetStatusFlags(x) & UCMODE_HOP)
+               Membership* memb = channel->GetUser(x);
+               if (memb && memb->hasMode('h'))
                {
                        return std::make_pair(true, x->nick);
                }
                else
                {
-                       return std::make_pair(false, parameter);
+                       return std::make_pair(false, x->nick);
                }
        }
        return std::make_pair(false, parameter);
 }
 
-void ModeChannelHalfOp::RemoveMode(chanrec* channel)
+void ModeChannelHalfOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-       CUList* list = channel->GetHalfoppedUsers();
-       CUList copy;
-       char moderemove[MAXBUF];
-       userrec* n = new userrec(ServerInstance);
-       n->SetFd(FD_MAGIC_NUMBER);
+       const UserMembList* clist = channel->GetUsers();
 
-       for (CUList::iterator i = list->begin(); i != list->end(); i++)
+       for (UserMembCIter i = clist->begin(); i != clist->end(); i++)
        {
-               userrec* n = i->first;
-               copy.insert(std::make_pair(n,n->nick));
-       }
-       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, n);
+               if (stack)
+               {
+                       stack->Push(this->GetModeChar(), i->first->nick);
+               }
+               else
+               {
+                       std::vector<std::string> parameters;
+                       parameters.push_back(channel->name);
+                       parameters.push_back("-h");
+                       parameters.push_back(i->first->nick);
+                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+               }
        }
-       delete n;
-}
 
-void ModeChannelHalfOp::RemoveMode(userrec* user)
-{
 }
 
-ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+void ModeChannelHalfOp::RemoveMode(User*, irc::modestacker* stack)
 {
-       /* If halfops are not enabled in the conf, we don't execute
-        * anything in this class at all.
-        */
-       if (!ServerInstance->Config->AllowHalfop)
-       {
-               parameter = "";
-               return MODEACTION_DENY;
-       }
-
-       int status = channel->GetStatus(source);
-
-       /* Call the correct method depending on wether we're adding or removing the mode */
-       if (adding)
-       {
-               parameter = this->AddHalfOp(source, parameter.c_str(), channel, status);
-       }
-       else
-       {
-               parameter = this->DelHalfOp(source, parameter.c_str(), channel, status);
-       }
-       /* 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.
-        */
-       if (parameter.length())
-               return MODEACTION_ALLOW;
-       else
-               return MODEACTION_DENY;
 }
 
-std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec *chan,int status)
+ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-       if (d)
-       {
-               if (IS_LOCAL(user))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_HALFOP));
-
-                       if (MOD_RESULT == ACR_DENY)
-                               return "";
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
-                               {
-                                       user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
-                                       return "";
-                               }
-                       }
-               }
-
-               return ServerInstance->Modes->Grant(d,chan,UCMODE_HOP);
-       }
-       return "";
+       return MODEACTION_ALLOW;
 }
-
-std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec *chan,int status)
-{
-       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
-
-       if (d)
-       {
-               if (IS_LOCAL(user))
-               {
-                       int MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEHALFOP));
-
-                       if (MOD_RESULT == ACR_DENY)
-                               return "";
-                       if (MOD_RESULT == ACR_DEFAULT)
-                       {
-                               if ((user != d) && ((status < STATUS_OP) && (!ServerInstance->ULine(user->server))))
-                               {
-                                       user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
-                                       return "";
-                               }
-                       }
-               }
-
-               return ServerInstance->Modes->Revoke(d,chan,UCMODE_HOP);
-       }
-       return "";
-}
-