diff options
| -rw-r--r-- | docs/conf/inspircd.conf.example | 5 | ||||
| -rw-r--r-- | include/configreader.h | 5 | ||||
| -rw-r--r-- | src/configreader.cpp | 3 | ||||
| -rw-r--r-- | src/coremods/core_privmsg.cpp | 9 |
4 files changed, 2 insertions, 20 deletions
diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example index de2b5ee68..33f455357 100644 --- a/docs/conf/inspircd.conf.example +++ b/docs/conf/inspircd.conf.example @@ -567,11 +567,6 @@ # triggers anti-takeover mechanisms of some obsolete bots. cyclehostsfromuser="no" - # ircumsgprefix: Use undernet-style message prefixing for NOTICE and - # PRIVMSG. If enabled, it will add users' prefix to the line, if not, - # it will just message the user normally. - ircumsgprefix="no" - # announcets: If set to yes, when the timestamp on a channel changes, all users # in the channel will be sent a NOTICE about it. announcets="yes" diff --git a/include/configreader.h b/include/configreader.h index 9b73dd3c6..fe1e5da9e 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -431,11 +431,6 @@ class CoreExport ServerConfig */ bool CycleHostsFromUser; - /** If set to true, prefixed channel NOTICEs and PRIVMSGs will have the prefix - * added to the outgoing text for undernet style msg prefixing. - */ - bool UndernetMsgPrefix; - /** If set to true, the full nick!user\@host will be shown in the TOPIC command * for who set the topic last. If false, only the nick is shown. */ diff --git a/src/configreader.cpp b/src/configreader.cpp index a81a1b646..092911c74 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -55,7 +55,7 @@ ServerConfig::ServerConfig() , Limits(EmptyTag) , NoSnoticeStack(false) { - RawLog = HideBans = HideSplits = UndernetMsgPrefix = false; + RawLog = HideBans = HideSplits = false; WildcardIPv6 = true; dns_timeout = 5; MaxTargets = 20; @@ -413,7 +413,6 @@ void ServerConfig::Fill() GenericOper = security->getBool("genericoper"); SyntaxHints = options->getBool("syntaxhints"); CycleHostsFromUser = options->getBool("cyclehostsfromuser"); - UndernetMsgPrefix = options->getBool("ircumsgprefix"); FullHostInTopic = options->getBool("hostintopic"); MaxTargets = security->getInt("maxtargets", 20, 1, 31); DefaultModes = options->getString("defaultmodes", "not"); diff --git a/src/coremods/core_privmsg.cpp b/src/coremods/core_privmsg.cpp index 34527027c..d691464c0 100644 --- a/src/coremods/core_privmsg.cpp +++ b/src/coremods/core_privmsg.cpp @@ -169,14 +169,7 @@ CmdResult MessageCommandBase::HandleMessage(const std::vector<std::string>& para if (status) { - if (ServerInstance->Config->UndernetMsgPrefix) - { - chan->WriteAllExcept(user, false, status, except_list, "%s %c%s :%c %s", MessageTypeString[mt], status, chan->name.c_str(), status, text); - } - else - { - chan->WriteAllExcept(user, false, status, except_list, "%s %c%s :%s", MessageTypeString[mt], status, chan->name.c_str(), text); - } + chan->WriteAllExcept(user, false, status, except_list, "%s %c%s :%s", MessageTypeString[mt], status, chan->name.c_str(), text); } else { |