Added a parameter to OnRehash for the rehash parameter

[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 035658f8e8c2cc41e3fca391c119c35e3f85e708..0938dacb0a3d1451d8ad36e473e09641fb129fb7 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -14,14 +14,17 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides channel modes +a and +q */
 
-char dummyvalue[] = "on";
+char fakevalue[] = "on";
 
 class ModuleChanProtect : public Module
 {
@@ -83,7 +86,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;
@@ -104,7 +107,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));
                                }
@@ -138,12 +146,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;
@@ -152,12 +160,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;
@@ -166,12 +174,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;
@@ -180,12 +188,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;
@@ -219,7 +227,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;
                                        }
                                }
@@ -262,7 +270,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;
                                        }
                                }
@@ -292,7 +300,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)))
                                {
@@ -304,7 +312,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)))
                                 {
@@ -334,7 +342,7 @@ class ModuleChanProtect : public Module
                // 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)))
                        {