Match on nick change option for RLine, document m_rline & this option.

[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 6aa7c5d3b221d77958c25483b6342a4dd03e7cfe..0cc4fe8d7b971efbfafc1f470fee920f56ffa0be 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -28,7 +28,6 @@ class FounderProtectBase
        std::string type;
        int list;
        int end;
-       char* dummyptr;
  protected:
        bool& remove_own_privs;
        bool& remove_other_privs;
@@ -50,7 +49,7 @@ class FounderProtectBase
                        else
                        {
                                std::string item = extend+std::string(channel->name);
-                               if (x->GetExt(item,dummyptr))
+                               if (x->GetExt(item))
                                {
                                        return std::make_pair(true, x->nick);
                                }
@@ -63,7 +62,7 @@ class FounderProtectBase
                return std::make_pair(false, parameter);
        }
 
-       void RemoveMode(Channel* channel, char mc)
+       void RemoveMode(Channel* channel, char mc, irc::modestacker* stack)
        {
                CUList* cl = channel->GetUsers();
                std::string item = extend + std::string(channel->name);
@@ -74,12 +73,18 @@ class FounderProtectBase
 
                for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
                {
-                       if (i->first->GetExt(item, dummyptr))
+                       if (i->first->GetExt(item))
                        {
-                               modestack.Push(mc, i->first->nick);
+                               if (stack)
+                                       stack->Push(mc, i->first->nick);
+                               else
+                                       modestack.Push(mc, i->first->nick);
                        }
                }
 
+               if (stack)
+                       return;
+
                while (modestack.GetStackedLine(stackresult))
                {
                        for (size_t j = 0; j < stackresult.size(); j++)
@@ -96,7 +101,7 @@ class FounderProtectBase
                std::string item = extend+std::string(channel->name);
                for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i)
                {
-                       if (i->first->GetExt(item, dummyptr))
+                       if (i->first->GetExt(item))
                        {
                                user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick);
                        }
@@ -118,7 +123,7 @@ class FounderProtectBase
        bool CanRemoveOthers(User* u1, User* u2, Channel* c)
        {
                std::string item = extend+std::string(c->name);
-               return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr));
+               return (u1->GetExt(item) && u2->GetExt(item));
        }
 
        ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string &parameter)
@@ -127,16 +132,16 @@ class FounderProtectBase
 
                if (adding)
                {
-                       if (!theuser->GetExt(item, dummyptr))
+                       if (!theuser->GetExt(item))
                        {
-                               theuser->Extend(item, "on");
+                               theuser->Extend(item);
                                parameter = theuser->nick;
                                return MODEACTION_ALLOW;
                        }
                }
                else
                {
-                       if (theuser->GetExt(item, dummyptr))
+                       if (theuser->GetExt(item))
                        {
                                theuser->Shrink(item);
                                parameter = theuser->nick;
@@ -151,7 +156,6 @@ class FounderProtectBase
  */
 class ChanFounder : public ModeHandler, public FounderProtectBase
 {
-       char* dummyptr;
  public:
        ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
                : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
@@ -167,12 +171,12 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
                return FounderProtectBase::ModeSet(source, dest, channel, parameter);
        }
 
-       void RemoveMode(Channel* channel)
+       void RemoveMode(Channel* channel, irc::modestacker* stack)
        {
-               FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+               FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack);
        }
 
-       void RemoveMode(User* user)
+       void RemoveMode(User* user, irc::modestacker* stack)
        {
        }
 
@@ -218,7 +222,6 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
  */
 class ChanProtect : public ModeHandler, public FounderProtectBase
 {
-       char* dummyptr;
  public:
        ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
                : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
@@ -234,12 +237,12 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
                return FounderProtectBase::ModeSet(source, dest, channel, parameter);
        }
 
-       void RemoveMode(Channel* channel)
+       void RemoveMode(Channel* channel, irc::modestacker* stack)
        {
-               FounderProtectBase::RemoveMode(channel, this->GetModeChar());
+               FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack);
        }
 
-       void RemoveMode(User* user)
+       void RemoveMode(User* user, irc::modestacker* stack)
        {
        }
 
@@ -262,7 +265,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
                        (ServerInstance->ULine(source->nick)) ||
                        (ServerInstance->ULine(source->server)) ||
                        (!*source->server) ||
-                       (source->GetExt(founder,dummyptr)) ||
+                       (source->GetExt(founder)) ||
                        (!IS_LOCAL(source)))
                {
                        return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
@@ -293,7 +296,6 @@ class ModuleChanProtect : public Module
        bool booting;
        ChanProtect* cp;
        ChanFounder* cf;
-       char* dummyptr;
        
  public:
  
@@ -432,12 +434,12 @@ class ModuleChanProtect : public Module
                {
                        // a user has been deopped. Do we let them? hmmm...
                        case AC_DEOP:
-                               if (dest->GetExt(founder,dummyptr))
+                               if (dest->GetExt(founder))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -446,12 +448,12 @@ class ModuleChanProtect : public Module
 
                        // a user is being kicked. do we chop off the end of the army boot?
                        case AC_KICK:
-                               if (dest->GetExt(founder,dummyptr))
+                               if (dest->GetExt(founder))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -460,12 +462,12 @@ class ModuleChanProtect : public Module
 
                        // a user is being dehalfopped. Yes, we do disallow -h of a +ha user
                        case AC_DEHALFOP:
-                               if (dest->GetExt(founder,dummyptr))
+                               if (dest->GetExt(founder))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -474,12 +476,12 @@ class ModuleChanProtect : public Module
 
                        // same with devoice.
                        case AC_DEVOICE:
-                               if (dest->GetExt(founder,dummyptr))
+                               if (dest->GetExt(founder))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder");
                                        return ACR_DENY;
                                }
-                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
+                               if ((dest->GetExt(protect)) && (!source->GetExt(protect)))
                                {
                                        source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;