summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2017-12-29 23:53:44 +0000
committerPeter Powell <petpow@saberuk.com>2017-12-29 23:53:44 +0000
commit45689d251a9934134e4762f5b24fa3c28e893980 (patch)
tree77b303cfd34fd57801b8058d0fa21ae766251354
parent592dd0e818aa58a31e620ec21f4860a0f992ed9c (diff)
Don't hardcode mode characters which are sent in 005 tokens.
-rw-r--r--src/modules/m_banexception.cpp2
-rw-r--r--src/modules/m_callerid.cpp2
-rw-r--r--src/modules/m_inviteexception.cpp2
3 files changed, 3 insertions, 3 deletions
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<std::string, std::string>& 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<std::string, std::string>& 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<std::string, std::string>& tokens) CXX11_OVERRIDE
{
- tokens["INVEX"] = "I";
+ tokens["INVEX"] = ConvToStr(ie.GetModeChar());
}
ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE