From 45689d251a9934134e4762f5b24fa3c28e893980 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 29 Dec 2017 23:53:44 +0000 Subject: Don't hardcode mode characters which are sent in 005 tokens. --- src/modules/m_banexception.cpp | 2 +- src/modules/m_callerid.cpp | 2 +- src/modules/m_inviteexception.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 4bfd19373..3905cdf6a 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -53,7 +53,7 @@ class ModuleBanException : public Module void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - tokens["EXCEPTS"] = "e"; + tokens["EXCEPTS"] = ConvToStr(be.GetModeChar()); } ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 137ab6b93..2f6199382 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -371,7 +371,7 @@ public: void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - tokens["CALLERID"] = "g"; + tokens["CALLERID"] = ConvToStr(myumode.GetModeChar()); } ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 6229e1fa2..1317e6e57 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -53,7 +53,7 @@ public: void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - tokens["INVEX"] = "I"; + tokens["INVEX"] = ConvToStr(ie.GetModeChar()); } ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE -- cgit v1.2.3