Add option to allow +q to +q users, +a to +a users.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10738 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 38 insertions, 20 deletions

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index a1107b6ce..a88f5de38 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -31,9 +31,10 @@ class FounderProtectBase
  protected:
 	bool& remove_own_privs;
 	bool& remove_other_privs;
+	bool& add_other_privs;
  public:
-	FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) :
-		MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others)
+	FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others, bool &add_others) :
+		MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others), add_other_privs(add_others)
 	{
 	}
 
@@ -126,6 +127,12 @@ class FounderProtectBase
 		return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item));
 	}
 
+	bool CanAddOthers(User* u1, User* u2, Channel* c)
+	{
+		std::string item = extend+std::string(c->name);
+		return (add_other_privs && u1->GetExt(item));
+	}
+
 	ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string &parameter)
 	{
 		std::string item = extend+std::string(channel->name);
@@ -157,9 +164,9 @@ class FounderProtectBase
 class ChanFounder : public ModeHandler, public FounderProtectBase
 {
  public:
-	ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
+	ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
 		: ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
-		  FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { }
+		  FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others, priv_others) { }
 
 	unsigned int GetPrefixRank()
 	{
@@ -203,13 +210,17 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
 		{
 			return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
 		}
-		else
+
+		// If they have it, allow them to give it.
+		if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
 		{
-			// whoops, someones being naughty!
-			source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str());
-			parameter.clear();
-			return MODEACTION_DENY;
+			return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
 		}
+
+		// whoops, someones being naughty!
+		source->WriteNumeric(468, "%s %s :You are not permitted to set additional founders", source->nick.c_str(), channel->name.c_str());
+		parameter.clear();
+		return MODEACTION_DENY;
 	}
 
 	void DisplayList(User* user, Channel* channel)
@@ -223,9 +234,9 @@ class ChanFounder : public ModeHandler, public FounderProtectBase
 class ChanProtect : public ModeHandler, public FounderProtectBase
 {
  public:
-	ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others)
+	ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others, bool &priv_others)
 		: ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0),
-		  FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { }
+		  FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others, priv_others) { }
 
 	unsigned int GetPrefixRank()
 	{
@@ -255,10 +266,11 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
 
 		std::string founder = "cm_founder_"+std::string(channel->name);
 
-		if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
+		if (!adding && FounderProtectBase::CanRemoveOthers(source, theuser, channel))
 		{
 			return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
 		}
+
 		// source has +q, is a server, or ulined, we'll let them +-a the user.
 		if (source == ServerInstance->FakeClient ||
 			((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) ||
@@ -270,12 +282,16 @@ class ChanProtect : public ModeHandler, public FounderProtectBase
 		{
 			return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
 		}
-		else
+
+		// If they have it, allow them to give it.
+		if (adding && FounderProtectBase::CanAddOthers(source, theuser, channel))
 		{
-			// bzzzt, wrong answer!
-			source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
-			return MODEACTION_DENY;
+			return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter);
 		}
+		
+		// bzzzt, wrong answer!
+		source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str());
+		return MODEACTION_DENY;
 	}
 
 	virtual void DisplayList(User* user, Channel* channel)
@@ -293,6 +309,7 @@ class ModuleChanProtect : public Module
 	char APrefix;
 	bool DeprivSelf;
 	bool DeprivOthers;
+	bool PrivOthers;
 	bool booting;
 	ChanProtect* cp;
 	ChanFounder* cf;
@@ -308,8 +325,8 @@ class ModuleChanProtect : public Module
 
 		/* Initialise module variables */
 
-		cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
-		cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
+		cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers, PrivOthers);
+		cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers, PrivOthers);
 
 		if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf))
 		{
@@ -362,8 +379,9 @@ class ModuleChanProtect : public Module
 		if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf)
 			throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another.");
 
-		DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
-		DeprivOthers = Conf.ReadFlag("options","deprotectothers",0);
+		DeprivSelf = Conf.ReadFlag("options","deprotectself", "yes", 0);
+		DeprivOthers = Conf.ReadFlag("options","deprotectothers", "yes", 0);
+		DeprivOthers = Conf.ReadFlag("options","setprivsonothers", "yes", 0);
 	}
 
 	virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)