]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
Allocate id properly
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index 39f0d2aae6819dc8f298e13d837933cbf526f979..208dc8362990d72062318b100cf4fc85ec342386 100644 (file)
 
 /* $ModDesc: Provides channel modes +a and +q */
 
-const char fakevalue* = "on";
+const char* fakevalue = "on";
 
 class ChanFounder : public ModeHandler
 {
+       Server* Srv;
+       char* dummyptr;
+
  public:
-       ChanFounder() : ModeHandler('q', 1, 1, true, MODETYPE_CHANNEL, false) { }
+       ChanFounder(Server* s) : ModeHandler('q', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -46,14 +49,17 @@ class ChanFounder : public ModeHandler
                        return MODEACTION_DENY;
                }
 
+               std::string protect = "cm_protect_"+std::string(channel->name);
+               std::string founder = "cm_founder_"+std::string(channel->name);
+
                 // source is a server, or ulined, we'll let them +-q the user.
                if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server))
                {
                        if (adding)
                        {
-                               if (!theuser->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (!theuser->GetExt(founder,dummyptr))
                                {
-                                       theuser->Extend("cm_founder_"+std::string(channel->name),fakevalue);
+                                       theuser->Extend(founder,fakevalue);
                                        // Tidy the nickname (make case match etc)
                                        parameter = theuser->nick;
                                        return MODEACTION_ALLOW;
@@ -61,9 +67,9 @@ class ChanFounder : public ModeHandler
                        }
                        else
                        {
-                               if (theuser->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (theuser->GetExt(founder, dummyptr))
                                {
-                                       theuser->Shrink("cm_founder_"+std::string(channel->name));
+                                       theuser->Shrink(founder);
                                        // Tidy the nickname (make case match etc)
                                        parameter = theuser->nick;
                                        return MODEACTION_ALLOW;
@@ -83,9 +89,10 @@ class ChanFounder : public ModeHandler
        void DisplayList(userrec* user, chanrec* channel)
        {
                chanuserlist cl = Srv->GetUsers(channel);
+               std::string founder = "cm_founder_"+std::string(channel->name);
                for (unsigned int i = 0; i < cl.size(); i++)
                {
-                       if (cl[i]->GetExt("cm_founder_"+std::string(channel->name)))
+                       if (cl[i]->GetExt(founder, dummyptr))
                        {
                                WriteServ(user->fd,"386 %s %s %s",user->nick, channel->name,cl[i]->nick);
                        }
@@ -97,8 +104,10 @@ class ChanFounder : public ModeHandler
 
 class ChanProtect : public ModeHandler
 {
+       Server* Srv;
+       char* dummyptr;
  public:
-       ChanProtect() : ModeHandler('a', 1, 1, true, MODETYPE_CHANNEL, false) { }
+       ChanProtect(Server* s) : ModeHandler('a', 1, 1, true, MODETYPE_CHANNEL, false), Srv(s) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -112,20 +121,23 @@ class ChanProtect : public ModeHandler
                }
 
                // given user isnt even on the channel, eat the mode change
-               if (!chan->HasUser(theuser))
+               if (!channel->HasUser(theuser))
                {
                        parameter = "";
                        return MODEACTION_DENY;
                }
 
+               std::string protect = "cm_protect_"+std::string(channel->name);
+               std::string founder = "cm_founder_"+std::string(channel->name);
+
                // source has +q, is a server, or ulined, we'll let them +-a the user.
-               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (source->GetExt("cm_founder_"+std::string(channel->name))))
+               if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)))
                {
                        if (adding)
                        {
-                               if (!theuser->GetExt("cm_protect_"+std::string(channel->name)))
+                               if (!theuser->GetExt(protect,dummyptr))
                                {
-                                       theuser->Extend("cm_protect_"+std::string(channel->name),fakevalue);
+                                       theuser->Extend(protect,fakevalue);
                                        // Tidy the nickname (make case match etc)
                                        parameter = theuser->nick;
                                        return MODEACTION_ALLOW;
@@ -133,9 +145,9 @@ class ChanProtect : public ModeHandler
                        }
                        else
                        {
-                               if (theuser->GetExt("cm_protect_"+std::string(channel->name)))
+                               if (theuser->GetExt(protect,dummyptr))
                                {
-                                       theuser->Shrink("cm_protect_"+std::string(channel->name));
+                                       theuser->Shrink(protect);
                                        // Tidy the nickname (make case match etc)
                                        parameter = theuser->nick;
                                        return MODEACTION_ALLOW;
@@ -146,7 +158,7 @@ class ChanProtect : public ModeHandler
                else
                {
                        // bzzzt, wrong answer!
-                       WriteServ(user->fd,"482 %s %s :You are not a channel founder",user->nick, chan->name);
+                       WriteServ(source->fd,"482 %s %s :You are not a channel founder",source->nick, channel->name);
                        return MODEACTION_DENY;
                }
        }
@@ -154,9 +166,10 @@ class ChanProtect : public ModeHandler
        virtual void DisplayList(userrec* user, chanrec* channel)
        {
                chanuserlist cl = Srv->GetUsers(channel);
+               std::string protect = "cm_protect_"+std::string(channel->name);
                for (unsigned int i = 0; i < cl.size(); i++)
                {
-                       if (cl[i]->GetExt("cm_protect_"+std::string(channel->name)))
+                       if (cl[i]->GetExt(protect,dummyptr))
                        {
                                WriteServ(user->fd,"388 %s %s %s",user->nick, channel->name,cl[i]->nick);
                        }
@@ -170,29 +183,29 @@ class ModuleChanProtect : public Module
 {
        Server *Srv;
        bool FirstInGetsFounder;
-       ConfigReader *Conf;
+       ChanProtect* cp;
+       ChanFounder* cf;
+       char* dummyptr;
        
  public:
  
-       ModuleChanProtect(Server* Me)
-       : Module::Module(Me), Srv(Me)
+       ModuleChanProtect(Server* Me) : Module::Module(Me), Srv(Me)
        {       
                /* Initialise module variables */
-               Conf = new ConfigReader;
+
+               cp = new ChanProtect(Me);
+               cf = new ChanFounder(Me);
                
-               // set up our modes. We're using listmodes and not normal extmodes here.
-               // listmodes only need one parameter as everything else is assumed by the
-               // nature of the mode thats being created.
-               Srv->AddExtendedListMode('a');
-               Srv->AddExtendedListMode('q');
+               Srv->AddMode(cp, 'a');
+               Srv->AddMode(cf, 'q');
                
-               // read our config options (main config file)
-               FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
+               /* Load config stuff */
+               OnRehash("");
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnExtendedMode] = List[I_OnSendList] = List[I_OnSyncChannel] = 1;
+               List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
        }
        
        virtual void On005Numeric(std::string &output)
@@ -216,11 +229,14 @@ class ModuleChanProtect : public Module
 
        virtual void OnRehash(const std::string &parameter)
        {
-               // on a rehash we delete our classes for good measure and create them again.
-               DELETE(Conf);
-               Conf = new ConfigReader;
-               // re-read our config options on a rehash
-               FirstInGetsFounder = Conf->ReadFlag("options","noservices",0);
+               /* Create a configreader class and read our flag,
+                * in old versions this was heap-allocated and the
+                * object was kept between rehashes...now we just
+                * stack-allocate it locally.
+                */
+               ConfigReader Conf;
+               
+               FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
        }
        
        virtual void OnUserJoin(userrec* user, chanrec* channel)
@@ -268,16 +284,19 @@ class ModuleChanProtect : public Module
                        return ACR_ALLOW;
                }
 
+               std::string founder = "cm_founder_"+std::string(channel->name);
+               std::string protect = "cm_protect_"+std::string(channel->name);
+
                switch (access_type)
                {
                        // a user has been deopped. Do we let them? hmmm...
                        case AC_DEOP:
-                               if (dest->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder,dummyptr))
                                {
                                        Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
                                        Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -286,12 +305,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("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder,dummyptr))
                                {
                                        Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
                                        Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -300,12 +319,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("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder,dummyptr))
                                {
                                        Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
                                        Srv->SendServ(source->fd,"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;
@@ -314,12 +333,12 @@ class ModuleChanProtect : public Module
 
                        // same with devoice.
                        case AC_DEVOICE:
-                               if (dest->GetExt("cm_founder_"+std::string(channel->name)))
+                               if (dest->GetExt(founder,dummyptr))
                                {
                                        Srv->SendServ(source->fd,"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("cm_protect_"+std::string(channel->name))) && (!source->GetExt("cm_protect_"+std::string(channel->name))))
+                               if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
                                {
                                        Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)");
                                        return ACR_DENY;
@@ -331,130 +350,10 @@ class ModuleChanProtect : public Module
                return ACR_DEFAULT;
        }
        
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // not out mode, bail
-               if ((modechar == 'q') && (type == MT_CHANNEL))
-               {
-                       // set up parameters
-                       chanrec* chan = (chanrec*)target;
-                       userrec* theuser = Srv->FindNick(params[0]);
-               
-                       // cant find the user given as the parameter, eat the mode change.
-                       if (!theuser)
-                               return -1;
-                       
-                       // given user isnt even on the channel, eat the mode change
-                       if (!chan->HasUser(theuser))
-                               return -1;
-                       
-                       // source is a server, or ulined, we'll let them +-q the user.
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")))
-                       {
-                               if (mode_on)
-                               {
-                                       if (!theuser->GetExt("cm_founder_"+std::string(chan->name)))
-                                       {
-                                               theuser->Extend("cm_founder_"+std::string(chan->name),fakevalue);
-                                               return 1;
-                                       }
-                               }
-                               else
-                               {
-                                       if (theuser->GetExt("cm_founder_"+std::string(chan->name)))
-                                       {
-                                               theuser->Shrink("cm_founder_"+std::string(chan->name));
-                                               return 1;
-                                       }
-                               }       
-
-                               return -1;
-                       }
-                       else
-                       {
-                               // whoops, someones being naughty!
-                               WriteServ(user->fd,"468 %s %s :Only servers may set channel mode +q",user->nick, chan->name);
-                               return -1;
-                       }
-               }
-               if ((modechar == 'a') && (type == MT_CHANNEL))
-               {
-                       // set up parameters
-                       chanrec* chan = (chanrec*)target;
-                       userrec* theuser = Srv->FindNick(params[0]);
-               
-                       // cant find the user given as the parameter, eat the mode change.
-                       if (!theuser)
-                               return -1;
-                       
-                       // given user isnt even on the channel, eat the mode change
-                       if (!chan->HasUser(theuser))
-                               return -1;
-
-                       // source has +q, is a server, or ulined, we'll let them +-a the user.
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (user->GetExt("cm_founder_"+std::string(chan->name))))
-                       {
-                               if (mode_on)
-                               {
-                                       if (!theuser->GetExt("cm_protect_"+std::string(chan->name)))
-                                       {
-                                               theuser->Extend("cm_protect_"+std::string(chan->name),fakevalue);
-                                               return 1;
-                                       }
-                               }
-                               else
-                               {
-                                       if (theuser->GetExt("cm_protect_"+std::string(chan->name)))
-                                       {
-                                               theuser->Shrink("cm_protect_"+std::string(chan->name));
-                                               return 1;
-                                       }
-                               }       
-
-                               return -1;
-                       }
-                       else
-                       {
-                               // bzzzt, wrong answer!
-                               WriteServ(user->fd,"482 %s %s :You are not a channel founder",user->nick, chan->name);
-                               return -1;
-                       }
-               }
-               return 0;
-       }
-
-       virtual void OnSendList(userrec* user, chanrec* channel, char mode)
-       {
-               if (mode == 'q')
-               {
-                       chanuserlist cl = Srv->GetUsers(channel);
-                       for (unsigned int i = 0; i < cl.size(); i++)
-                       {
-                               if (cl[i]->GetExt("cm_founder_"+std::string(channel->name)))
-                               {
-                                       WriteServ(user->fd,"386 %s %s %s",user->nick, channel->name,cl[i]->nick);
-                               }
-                       }
-                       WriteServ(user->fd,"387 %s %s :End of channel founder list",user->nick, channel->name);
-               }
-               if (mode == 'a')
-               {
-                       chanuserlist cl = Srv->GetUsers(channel);
-                       for (unsigned int i = 0; i < cl.size(); i++)
-                       {
-                               if (cl[i]->GetExt("cm_protect_"+std::string(channel->name)))
-                               {
-                                       WriteServ(user->fd,"388 %s %s %s",user->nick, channel->name,cl[i]->nick);
-                               }
-                       }
-                       WriteServ(user->fd,"389 %s %s :End of channel protected user list",user->nick, channel->name);
-               }
-
-       }
-       
        virtual ~ModuleChanProtect()
        {
-               DELETE(Conf);
+               DELETE(cp);
+               DELETE(cf);
        }
        
        virtual Version GetVersion()
@@ -469,13 +368,15 @@ class ModuleChanProtect : public Module
                // know whos +q/+a on the channel.
                chanuserlist cl = Srv->GetUsers(chan);
                string_list commands;
+               std::string founder = "cm_founder_"+std::string(chan->name);
+               std::string protect = "cm_protect_"+std::string(chan->name);
                for (unsigned int i = 0; i < cl.size(); i++)
                {
-                       if (cl[i]->GetExt("cm_founder_"+std::string(chan->name)))
+                       if (cl[i]->GetExt(founder,dummyptr))
                        {
                                proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(cl[i]->nick));
                        }
-                       if (cl[i]->GetExt("cm_protect_"+std::string(chan->name)))
+                       if (cl[i]->GetExt(protect,dummyptr))
                        {
                                proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(cl[i]->nick));
                        }