Add configuration option <options:operspywhois> to set if opers see invisble and private channels in /whois, also clean up the code for whois a bit, removing more uneccessary casts.

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

1 files changed, 31 insertions, 31 deletions

diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 328d7c67e..a405ed4bf 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -523,36 +523,37 @@ void ServerConfig::Read(bool bail, userrec* user)
 
 	/* These tags can occur ONCE or not at all */
 	static InitialConfig Values[] = {
-		{"options",	"softlimit",		&this->SoftLimit,		DT_INTEGER, ValidateSoftLimit},
-		{"options",	"somaxconn",		&this->MaxConn,			DT_INTEGER, ValidateMaxConn},
-		{"server",	"name",			&this->ServerName,		DT_CHARPTR, ValidateServerName},
-		{"server",	"description",		&this->ServerDesc,		DT_CHARPTR, NoValidation},
-		{"server",	"network",		&this->Network,			DT_CHARPTR, NoValidation},
-		{"admin",	"name",			&this->AdminName,		DT_CHARPTR, NoValidation},
-		{"admin",	"email",		&this->AdminEmail,		DT_CHARPTR, NoValidation},
-		{"admin",	"nick",			&this->AdminNick,		DT_CHARPTR, NoValidation},
-		{"files",	"motd",			&this->motd,			DT_CHARPTR, ValidateMotd},
-		{"files",	"rules",		&this->rules,			DT_CHARPTR, ValidateRules},
-		{"power",	"diepass",		&this->diepass,			DT_CHARPTR, NoValidation},	
-		{"power",	"pauseval",		&this->DieDelay,		DT_INTEGER, NoValidation},
-		{"power",	"restartpass",		&this->restartpass,		DT_CHARPTR, NoValidation},
-		{"options",	"prefixquit",		&this->PrefixQuit,		DT_CHARPTR, NoValidation},
-		{"die",		"value",		&this->DieValue,		DT_CHARPTR, NoValidation},
-		{"options",	"loglevel",		&debug,				DT_CHARPTR, ValidateLogLevel},
-		{"options",	"netbuffersize",	&this->NetBufferSize,		DT_INTEGER, ValidateNetBufferSize},
-		{"options",	"maxwho",		&this->MaxWhoResults,		DT_INTEGER, ValidateMaxWho},
-		{"options",	"allowhalfop",		&this->AllowHalfop,		DT_BOOLEAN, NoValidation},
-		{"dns",		"server",		&this->DNSServer,		DT_CHARPTR, ValidateDnsServer},
-		{"dns",		"timeout",		&this->dns_timeout,		DT_INTEGER, ValidateDnsTimeout},
-		{"options",	"moduledir",		&this->ModPath,			DT_CHARPTR, ValidateModPath},
-		{"disabled",	"commands",		&this->DisabledCommands,	DT_CHARPTR, NoValidation},
-		{"options",	"operonlystats",	&this->OperOnlyStats,		DT_CHARPTR, NoValidation},
-		{"options",	"customversion",	&this->CustomVersion,		DT_CHARPTR, NoValidation},
-		{"options",	"hidesplits",		&this->HideSplits,		DT_BOOLEAN, NoValidation},
-		{"options",	"hidebans",		&this->HideBans,		DT_BOOLEAN, NoValidation},
-		{"options",	"hidewhois",		&this->HideWhoisServer,		DT_CHARPTR, NoValidation},
-		{"options",	"tempdir",		&this->TempDir,			DT_CHARPTR, ValidateTempDir},
-		{"pid",		"file",			&this->PID,			DT_CHARPTR, NoValidation},
+		{"options",		"softlimit",		&this->SoftLimit,		DT_INTEGER, ValidateSoftLimit},
+		{"options",		"somaxconn",		&this->MaxConn,			DT_INTEGER, ValidateMaxConn},
+		{"server",		"name",				&this->ServerName,		DT_CHARPTR, ValidateServerName},
+		{"server",		"description",		&this->ServerDesc,		DT_CHARPTR, NoValidation},
+		{"server",		"network",			&this->Network,			DT_CHARPTR, NoValidation},
+		{"admin",		"name",				&this->AdminName,		DT_CHARPTR, NoValidation},
+		{"admin",		"email",			&this->AdminEmail,		DT_CHARPTR, NoValidation},
+		{"admin",		"nick",				&this->AdminNick,		DT_CHARPTR, NoValidation},
+		{"files",		"motd",				&this->motd,			DT_CHARPTR, ValidateMotd},
+		{"files",		"rules",			&this->rules,			DT_CHARPTR, ValidateRules},
+		{"power",		"diepass",			&this->diepass,			DT_CHARPTR, NoValidation},	
+		{"power",		"pauseval",			&this->DieDelay,		DT_INTEGER, NoValidation},
+		{"power",		"restartpass",		&this->restartpass,		DT_CHARPTR, NoValidation},
+		{"options",		"prefixquit",		&this->PrefixQuit,		DT_CHARPTR, NoValidation},
+		{"die",			"value",			&this->DieValue,		DT_CHARPTR, NoValidation},
+		{"options",		"loglevel",			&debug,					DT_CHARPTR, ValidateLogLevel},
+		{"options",		"netbuffersize",	&this->NetBufferSize,	DT_INTEGER, ValidateNetBufferSize},
+		{"options",		"maxwho",			&this->MaxWhoResults,	DT_INTEGER, ValidateMaxWho},
+		{"options",		"allowhalfop",		&this->AllowHalfop,		DT_BOOLEAN, NoValidation},
+		{"dns",			"server",			&this->DNSServer,		DT_CHARPTR, ValidateDnsServer},
+		{"dns",			"timeout",			&this->dns_timeout,		DT_INTEGER, ValidateDnsTimeout},
+		{"options",		"moduledir",		&this->ModPath,			DT_CHARPTR, ValidateModPath},
+		{"disabled",	"commands",		&this->DisabledCommands,DT_CHARPTR, NoValidation},
+		{"options",		"operonlystats",	&this->OperOnlyStats,	DT_CHARPTR, NoValidation},
+		{"options",		"customversion",	&this->CustomVersion,	DT_CHARPTR, NoValidation},
+		{"options",		"hidesplits",		&this->HideSplits,		DT_BOOLEAN, NoValidation},
+		{"options",		"hidebans",			&this->HideBans,		DT_BOOLEAN, NoValidation},
+		{"options",		"hidewhois",		&this->HideWhoisServer,	DT_CHARPTR, NoValidation},
+		{"options",		"operspywhois",		&this->OperSpyWhois,	DT_BOOLEAN, NoValidation},
+		{"options",		"tempdir",			&this->TempDir,			DT_CHARPTR, ValidateTempDir},
+		{"pid",			"file",				&this->PID,				DT_CHARPTR, NoValidation},
 		{NULL}
 	};
 
@@ -1677,4 +1678,3 @@ int BindPorts(bool bail)
 
 	return BoundPortCount;
 }
-