From 38cc4dda4df259bac5a3602be6861cf22e4171e9 Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 6 Jan 2008 21:25:38 +0000 Subject: 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 --- src/mode.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/mode.cpp') 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++) { -- cgit v1.3.1-10-gc9f91