From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sat, 2 Feb 2008 22:58:56 +0000 (+0000)
Subject: Back out the AllowDevoiceSelf stuff, it wasn't going to work anyway. Accidental commit.
X-Git-Tag: v2.0.23~3961
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=27fbecdaa75d262e92703a578c508c0aeccd06a4;p=user%2Fhenk%2Fcode%2Finspircd.git

Back out the AllowDevoiceSelf stuff, it wasn't going to work anyway. Accidental commit.

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

diff --git a/include/configreader.h b/include/configreader.h
index 3759e909f..fb187048b 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -429,10 +429,6 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	bool AllowHalfop;
 
-	/** If this value is true, users are allowed to devoice themselves.
-	 */
-	bool AllowDevoiceSelf;
-
 	/** If this is set to true, then mode lists (e.g
 	 * MODE #chan b) are hidden from unprivileged
 	 * users.
diff --git a/src/configreader.cpp b/src/configreader.cpp
index dea6a7a7d..945780a54 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -830,7 +830,6 @@ void ServerConfig::Read(bool bail, User* user, int pass)
 		{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
 		{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
 		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
-		{"options",	"allowdevoiceself",	"0",			new ValueContainerBool (&this->AllowDevoiceSelf),		DT_BOOLEAN,  NoValidation},
 		{"dns",		"server",	"",			new ValueContainerChar (this->DNSServer),		DT_IPADDRESS,DNSServerValidator},
 		{"dns",		"timeout",	"5",			new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER,  NoValidation},
 		{"options",	"moduledir",	MOD_PATH,		new ValueContainerChar (this->ModPath),			DT_CHARPTR,  NoValidation},
diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp
index 8b94caf08..66e58a479 100644
--- a/src/modes/cmode_v.cpp
+++ b/src/modes/cmode_v.cpp
@@ -136,9 +136,7 @@ std::string ModeChannelVoice::DelVoice(User *user,const char *dest,Channel *chan
 				return "";
 			if (MOD_RESULT == ACR_DEFAULT)
 			{
-				if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)) ||
-					user == d && ServerInstance->Config->AllowDevoiceSelf
-				)
+				if ((status < STATUS_HOP) && (!ServerInstance->ULine(user->server)))
 				{
 					user->WriteServ("482 %s %s :You are not a channel (half)operator",user->nick, chan->name);
 					return "";