From 950b9e70437ea1fe3ee5aafe8672fe3cbbe479ec Mon Sep 17 00:00:00 2001
From: danieldg
Date: Mon, 22 Mar 2010 22:30:21 +0000
Subject: Change <security:operspywhois> to a tristate

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12653 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/configreader.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index c93e37e1f..79c70405c 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -21,7 +21,7 @@
 ServerConfig::ServerConfig()
 {
 	WhoWasGroupSize = WhoWasMaxGroups = WhoWasMaxKeep = 0;
-	RawLog = NoUserDns = OperSpyWhois = HideBans = HideSplits = UndernetMsgPrefix = false;
+	RawLog = NoUserDns = HideBans = HideSplits = UndernetMsgPrefix = false;
 	WildcardIPv6 = CycleHosts = InvBypassModes = true;
 	dns_timeout = 5;
 	MaxTargets = 20;
@@ -476,7 +476,6 @@ void ServerConfig::Fill()
 	HideBans = security->getBool("hidebans");
 	HideWhoisServer = security->getString("hidewhois");
 	HideKillsServer = security->getString("hidekills");
-	OperSpyWhois = security->getBool("operspywhois");
 	RestrictBannedUsers = security->getBool("restrictbannedusers", true);
 	GenericOper = security->getBool("genericoper");
 	NoUserDns = ConfValue("performance")->getBool("nouserdns");
@@ -588,6 +587,14 @@ void ServerConfig::Fill()
 	else
 		AnnounceInvites = ServerConfig::INVITE_ANNOUNCE_NONE;
 
+	v = security->getString("operspywhois");
+	if (v == "splitmsg")
+		OperSpyWhois = SPYWHOIS_SPLITMSG;
+	else if (v == "on" || v == "yes")
+		OperSpyWhois = SPYWHOIS_NEWLINE;
+	else
+		OperSpyWhois = SPYWHOIS_NONE;
+
 	Limits.Finalise();
 }
 
-- 
cgit v1.3.1-10-gc9f91