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 3759e909f9855463ee8d5762511ffc2206fdac33..fb187048b3f6a2030af6a96bf45ceebde33a212b 100644 (file)
--- 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 dea6a7a7d9bee3df3554988c0df8d5535fcc682a..945780a54f4600aeee3d11a7c81ee367383cec08 100644 (file)
--- 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 8b94caf08b4c0376e5ee054716dcbb7ef8d0e012..66e58a479bca670b4cc32e2d3cf1a8fa8611803b 100644 (file)
--- 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 "";