]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_chanprotect.cpp
New 'Implements' system
[user/henk/code/inspircd.git] / src / modules / m_chanprotect.cpp
index 66457b928d6c97faeaaf66e1f80fd35d83f8acf5..25ff6b12aa72d2ce1317f49933a020e86e7949ac 100644 (file)
@@ -14,6 +14,8 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
@@ -22,7 +24,7 @@
 
 /* $ModDesc: Provides channel modes +a and +q */
 
-char dummyvalue[] = "on";
+char fakevalue[] = "on";
 
 class ModuleChanProtect : public Module
 {
@@ -32,13 +34,14 @@ class ModuleChanProtect : public Module
        
  public:
  
-       ModuleChanProtect()
+       ModuleChanProtect(Server* Me)
+               : Module::Module(Me)
        {
        
                // here we initialise our module. Use new to create new instances of the required
                // classes.
                
-               Srv = new Server;
+               Srv = Me;
                Conf = new ConfigReader;
                
                // set up our modes. We're using listmodes and not normal extmodes here.
@@ -84,7 +87,7 @@ class ModuleChanProtect : public Module
                user->Shrink("cm_protect_"+std::string(channel->name));
        }
 
-       virtual void OnRehash()
+       virtual void OnRehash(std::string parameter)
        {
                // on a rehash we delete our classes for good measure and create them again.
                delete Conf;
@@ -105,7 +108,12 @@ class ModuleChanProtect : public Module
                                // this way is best as it adds data thats accessible to other modules
                                // (so long as you document your code properly) without breaking anything
                                // because its encapsulated neatly in a map.
-                               if (user->Extend("cm_founder_"+std::string(channel->name),dummyvalue))
+
+                               // Change requested by katsklaw... when the first in is set to get founder,
+                               // to make it clearer that +q has been given, send that one user the +q notice
+                               // so that their client's syncronization and their sanity are left intact.
+                               WriteServ(user->fd,"MODE %s +q %s",channel->name,user->nick);
+                               if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue))
                                {
                                        Srv->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name));
                                }
@@ -139,12 +147,12 @@ class ModuleChanProtect : public Module
                        case AC_DEOP:
                                if (dest->GetExt("cm_founder_"+std::string(channel->name)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're a channel founder");
+                                       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))))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as the're protected (+a)");
+                                       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;
                                }
                        break;
@@ -153,12 +161,12 @@ class ModuleChanProtect : public Module
                        case AC_KICK:
                                if (dest->GetExt("cm_founder_"+std::string(channel->name)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're a channel founder");
+                                       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))))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as the're protected (+a)");
+                                       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;
                                }
                        break;
@@ -167,12 +175,12 @@ class ModuleChanProtect : public Module
                        case AC_DEHALFOP:
                                if (dest->GetExt("cm_founder_"+std::string(channel->name)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're a channel founder");
+                                       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))))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as the're protected (+a)");
+                                       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;
                                }
                        break;
@@ -181,12 +189,12 @@ class ModuleChanProtect : public Module
                        case AC_DEVOICE:
                                if (dest->GetExt("cm_founder_"+std::string(channel->name)))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're a channel founder");
+                                       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))))
                                {
-                                       Srv->SendServ(source->fd,"484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as the're protected (+a)");
+                                       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;
                                }
                        break;
@@ -220,7 +228,7 @@ class ModuleChanProtect : public Module
                                {
                                        if (!theuser->GetExt("cm_founder_"+std::string(chan->name)))
                                        {
-                                               theuser->Extend("cm_founder_"+std::string(chan->name),dummyvalue);
+                                               theuser->Extend("cm_founder_"+std::string(chan->name),fakevalue);
                                                return 1;
                                        }
                                }
@@ -263,7 +271,7 @@ class ModuleChanProtect : public Module
                                {
                                        if (!theuser->GetExt("cm_protect_"+std::string(chan->name)))
                                        {
-                                               theuser->Extend("cm_protect_"+std::string(chan->name),dummyvalue);
+                                               theuser->Extend("cm_protect_"+std::string(chan->name),fakevalue);
                                                return 1;
                                        }
                                }
@@ -293,7 +301,7 @@ class ModuleChanProtect : public Module
                if (mode == 'q')
                {
                        chanuserlist cl = Srv->GetUsers(channel);
-                       for (int i = 0; i < cl.size(); i++)
+                       for (unsigned int i = 0; i < cl.size(); i++)
                        {
                                if (cl[i]->GetExt("cm_founder_"+std::string(channel->name)))
                                {
@@ -305,7 +313,7 @@ class ModuleChanProtect : public Module
                 if (mode == 'a')
                 {
                         chanuserlist cl = Srv->GetUsers(channel);
-                        for (int i = 0; i < cl.size(); i++)
+                        for (unsigned int i = 0; i < cl.size(); i++)
                         {
                                 if (cl[i]->GetExt("cm_protect_"+std::string(channel->name)))
                                 {
@@ -320,7 +328,6 @@ class ModuleChanProtect : public Module
        virtual ~ModuleChanProtect()
        {
                delete Conf;
-               delete Srv;
        }
        
        virtual Version GetVersion()
@@ -328,25 +335,24 @@ class ModuleChanProtect : public Module
                return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
        
-       virtual string_list OnChannelSync(chanrec* chan)
+       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
        {
                // this is called when the server is linking into a net and wants to sync channel data.
                // we should send our mode changes for the channel here to ensure that other servers
                // know whos +q/+a on the channel.
                chanuserlist cl = Srv->GetUsers(chan);
                string_list commands;
-               for (int i = 0; i < cl.size(); i++)
+               for (unsigned int i = 0; i < cl.size(); i++)
                {
                        if (cl[i]->GetExt("cm_founder_"+std::string(chan->name)))
                        {
-                               commands.push_back("M "+std::string(chan->name)+" +q "+std::string(cl[i]->nick));
+                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(cl[i]->nick));
                        }
                        if (cl[i]->GetExt("cm_protect_"+std::string(chan->name)))
                        {
-                               commands.push_back("M "+std::string(chan->name)+" +a "+std::string(cl[i]->nick));
+                               proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(cl[i]->nick));
                        }
                }
-               return commands;
        }
 
 };
@@ -363,9 +369,9 @@ class ModuleChanProtectFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleChanProtect;
+               return new ModuleChanProtect(Me);
        }
        
 };