From 5076d9d3c4d9cdf9a9124a60e3311d111297d301 Mon Sep 17 00:00:00 2001
From: B00mX0r <b00mx0r@aureus.pw>
Date: Sun, 26 Nov 2017 21:46:10 -0800
Subject: Add optional oper override umode +O.

---
 src/modules/m_override.cpp | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index cb36b3f51..7155e7e76 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -27,10 +27,23 @@
 #include "inspircd.h"
 #include "modules/invite.h"
 
+class Override : public SimpleUserModeHandler
+{
+ public:
+	Override(Module* Creator) : SimpleUserModeHandler(Creator, "override", 'O')
+	{
+		oper = true;
+		if (!ServerInstance->Config->ConfValue("override")->getBool("enableumode"))
+			DisableAutoRegister();
+	}
+};
+
 class ModuleOverride : public Module
 {
 	bool RequireKey;
 	bool NoisyOverride;
+	bool UmodeEnabled;
+	Override ou;
 	ChanModeReference topiclock;
 	ChanModeReference inviteonly;
 	ChanModeReference key;
@@ -65,7 +78,9 @@ class ModuleOverride : public Module
 
  public:
 	ModuleOverride()
-		: topiclock(this, "topiclock")
+		: UmodeEnabled(false)
+		, ou(this)
+		, topiclock(this, "topiclock")
 		, inviteonly(this, "inviteonly")
 		, key(this, "key")
 		, limit(this, "limit")
@@ -76,6 +91,7 @@ class ModuleOverride : public Module
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->SNO->EnableSnomask('v', "OVERRIDE");
+		UmodeEnabled = ServerInstance->Config->ConfValue("override")->getBool("enableumode");
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -93,8 +109,11 @@ class ModuleOverride : public Module
 
 	bool CanOverride(User* source, const char* token)
 	{
-		std::string tokenlist = source->oper->getConfig("override");
+		// If we require oper override umode (+O) but it is not set
+		if (UmodeEnabled && !source->IsModeSet(ou))
+			return false;
 
+		std::string tokenlist = source->oper->getConfig("override");
 		// its defined or * is set, return its value as a boolean for if the token is set
 		return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find("*", 0) != std::string::npos));
 	}
-- 
cgit v1.2.3