Merge branch 'insp3' into master.

3 files changed, 31 insertions, 11 deletions

diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index fa838f54f..63c4c7f2e 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -110,7 +110,10 @@ class CommandTagMsg : public Command
 		// If the source isn't allowed to mass message users then reject
 		// the attempt to mass-message users.
 		if (!source->HasPrivPermission("users/mass-message"))
+		{
+			source->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
 			return CMD_FAILURE;
+		}
 
 		// Extract the server glob match from the target parameter.
 		std::string servername(parameters[0], 1);
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index c7b64bdd0..a8a89545e 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -138,7 +138,7 @@ class ModuleOverride
 		{
 			// If the kicker's status is less than the target's,			or	the kicker's status is less than or equal to voice
 			if ((memb->chan->GetPrefixValue(source) < memb->getRank()) || (memb->chan->GetPrefixValue(source) <= VOICE_VALUE) ||
-			    (memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE))
+				(memb->chan->GetPrefixValue(source) == HALFOP_VALUE && memb->getRank() == HALFOP_VALUE))
 			{
 				ServerInstance->SNO.WriteGlobalSno('v',source->nick+" used oper override to kick "+memb->user->nick+" on "+memb->chan->name+" ("+reason+")");
 				return MOD_RES_ALLOW;
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index b34854549..b67a1b95d 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -71,6 +71,8 @@ class CommandTban : public Command
 	}
 
  public:
+	bool sendnotice;
+
 	CommandTban(Module* Creator)
 		: Command(Creator,"TBAN", 3)
 		, banmode(Creator, "ban")
@@ -131,13 +133,18 @@ class CommandTban : public Command
 		T.chan = channel;
 		TimedBanList.push_back(T);
 
-		const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.",
+		if (sendnotice)
+		{
+			const std::string message = InspIRCd::Format("Timed ban %s added by %s on %s lasting for %s.",
 			mask.c_str(), user->nick.c_str(), channel->name.c_str(), InspIRCd::DurationString(duration).c_str());
-		// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
-		PrefixMode* mh = ServerInstance->Modes.FindPrefixMode('h');
-		char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
 
-		channel->WriteRemoteNotice(message, pfxchar);
+			// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
+			PrefixMode* mh = ServerInstance->Modes.FindPrefixMode('h');
+			char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
+
+			channel->WriteRemoteNotice(message, pfxchar);
+		}
+
 		return CMD_SUCCESS;
 	}
 
@@ -205,6 +212,12 @@ class ModuleTimedBans : public Module
 	{
 	}
 
+	void ReadConfig(ConfigStatus& status) override
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("timedbans");
+		cmd.sendnotice = tag->getBool("sendnotice", true);
+	}
+
 	void OnBackgroundTimer(time_t curtime) override
 	{
 		timedbans expired;
@@ -224,13 +237,17 @@ class ModuleTimedBans : public Module
 			const std::string mask = i->mask;
 			Channel* cr = i->chan;
 
-			const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.",
+			if (cmd.sendnotice)
+			{
+				const std::string message = InspIRCd::Format("Timed ban %s set by %s on %s has expired.",
 				mask.c_str(), i->setter.c_str(), cr->name.c_str());
-			// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
-			PrefixMode* mh = ServerInstance->Modes.FindPrefixMode('h');
-			char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
 
-			cr->WriteRemoteNotice(message, pfxchar);
+				// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
+				PrefixMode* mh = ServerInstance->Modes.FindPrefixMode('h');
+				char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
+
+				cr->WriteRemoteNotice(message, pfxchar);
+			}
 
 			Modes::ChangeList setban;
 			setban.push_remove(ServerInstance->Modes.FindMode('b', MODETYPE_CHANNEL), mask);