X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=25ff6b12aa72d2ce1317f49933a020e86e7949ac;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=035658f8e8c2cc41e3fca391c119c35e3f85e708;hpb=ed98005ffd341ac265dada2057a8e313265dbb51;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 035658f8e..25ff6b12a 100644
--- 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
 {
@@ -31,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.
@@ -83,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;
@@ -104,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));
 				}
@@ -138,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;
@@ -152,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;
@@ -166,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;
@@ -180,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;
@@ -219,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;
 					}
 				}
@@ -262,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;
 					}
 				}
@@ -292,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)))
 				{
@@ -304,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)))
                                 {
@@ -319,7 +328,6 @@ class ModuleChanProtect : public Module
 	virtual ~ModuleChanProtect()
 	{
 		delete Conf;
-		delete Srv;
 	}
 	
 	virtual Version GetVersion()
@@ -327,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;
 	}
 
 };
@@ -362,9 +369,9 @@ class ModuleChanProtectFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule()
+	virtual Module * CreateModule(Server* Me)
 	{
-		return new ModuleChanProtect;
+		return new ModuleChanProtect(Me);
 	}
 	
 };