summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-09-10 15:03:21 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-09-10 15:03:21 +0200
commit6890d6aef73ce11bf8f5f8bd8d36dba824743a96 (patch)
tree28f42295f27578d29283997d567b3613e0b97fb7
parent02158b649035ba9d1e6fb36895d393580972b1e1 (diff)
Remove listmode hiding support from the core
This is now handled by m_hidelist
-rw-r--r--docs/conf/inspircd.conf.example5
-rw-r--r--include/configreader.h6
-rw-r--r--src/configreader.cpp5
-rw-r--r--src/mode.cpp7
4 files changed, 0 insertions, 23 deletions
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
index 254e6a355..d2f70cb22 100644
--- a/docs/conf/inspircd.conf.example
+++ b/docs/conf/inspircd.conf.example
@@ -672,11 +672,6 @@
# higher ranked users. This is the recommended setting.
announceinvites="dynamic"
- # hidemodes: If enabled, then the listmodes given will be hidden
- # from users below halfop. This is not recommended to be set on +b
- # as it may break some functionality in popular clients such as mIRC.
- hidemodes="eI"
-
# hideulines: If this value is set to yes, U-lined servers will
# be hidden from non-opers in /links and /map.
hideulines="no"
diff --git a/include/configreader.h b/include/configreader.h
index f3137ec0a..3d9923536 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -336,12 +336,6 @@ class CoreExport ServerConfig
*/
bool RestrictBannedUsers;
- /** If this is set to true, then mode lists (e.g
- * MODE \#chan b) are hidden from unprivileged
- * users.
- */
- bool HideModeLists[256];
-
/** The number of seconds the DNS subsystem
* will wait before timing out any request.
*/
diff --git a/src/configreader.cpp b/src/configreader.cpp
index a922543a3..af8a15f43 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -457,11 +457,6 @@ void ServerConfig::Fill()
DisabledCModes[*p - 'A'] = 1;
}
- memset(HideModeLists, 0, sizeof(HideModeLists));
- modes = ConfValue("security")->getString("hidemodes");
- for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
- HideModeLists[(unsigned char) *p] = true;
-
std::string v = security->getString("announceinvites");
if (v == "ops")
diff --git a/src/mode.cpp b/src/mode.cpp
index c70f474f7..0d3de3890 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -493,14 +493,7 @@ void ModeParser::ShowListModeList(User* user, Channel* chan, ModeHandler* mh)
if (MOD_RESULT == MOD_RES_DENY)
return;
- unsigned char mletter = mh->GetModeChar();
bool display = true;
- if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE))
- {
- user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You do not have access to view the +%c list",
- chan->name.c_str(), mletter);
- display = false;
- }
// Ask mode watchers whether it's OK to show the list
std::pair<ModeWatchIter, ModeWatchIter> itpair = modewatchermap.equal_range(mh->name);