diff options
| author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-06 21:25:38 +0000 |
|---|---|---|
| committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-01-06 21:25:38 +0000 |
| commit | 38cc4dda4df259bac5a3602be6861cf22e4171e9 (patch) | |
| tree | 24ce737873b9da3a8bc82c13c86b4e7bdacd9682 | |
| parent | 413074b77152edce980daa0e1dfecc42e15ada33 (diff) | |
Hopefully correct implementation of OnRawMode.. can someone pls check this for me tomorrow.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8654 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | include/modules.h | 2 | ||||
| -rw-r--r-- | src/mode.cpp | 15 | ||||
| -rw-r--r-- | src/modules.cpp | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/include/modules.h b/include/modules.h index eab968e7a..fb291e17a 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1095,7 +1095,7 @@ class CoreExport Module : public Extensible * @param pcnt The parameter count for the mode (0 or 1) * @return 1 to deny the mode, 0 to allow */ - virtual int OnRawMode(User* user, Channel* chan, char mode, const std::string ¶m, bool adding, int pcnt); + virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt); /** Called whenever a user joins a channel, to determine if key checks should go ahead or not. * This method will always be called for each join, wether or not the channel is actually +k, and diff --git a/src/mode.cpp b/src/mode.cpp index 3406393cf..e3929e392 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -306,6 +306,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser { unsigned char mletter = *mode; + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, *mode, "", true, 0)); + if (MOD_RESULT == ACR_DENY) + continue; + if (*mode == '+') { mode++; @@ -501,6 +506,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser continue; } + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1)); + if (MOD_RESULT == ACR_DENY) + return; + bool had_parameter = !parameter.empty(); for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) @@ -523,6 +533,11 @@ void ModeParser::Process(const char** parameters, int pcnt, User *user, bool ser } else { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0)); + if (MOD_RESULT == ACR_DENY) + return; + /* Fix by brain: mode watchers not being called for parameterless modes */ for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) { diff --git a/src/modules.cpp b/src/modules.cpp index 36f0eb2e5..2233c985d 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -140,7 +140,7 @@ bool Module::OnCheckReady(User*) { return true; } int Module::OnUserRegister(User*) { return 0; } int Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; } void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { } -int Module::OnRawMode(User*, Channel*, char, const std::string &, bool, int) { return 0; } +int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return 0; } int Module::OnCheckInvite(User*, Channel*) { return 0; } int Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; } int Module::OnCheckLimit(User*, Channel*) { return 0; } |