summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-08 23:33:24 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-08 23:33:24 +0000
commit938924e3729b5cdba0b87e9c932098fe08e88453 (patch)
tree08d0fd219c81f7a87ae9bcc81a5baa87ca2f92ee
parent33df390bfff01ca58551f24096cdd70034052d98 (diff)
These modules were using deprecated Server::IsOnChannel. They arent any more :)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3563 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_chanprotect.cpp4
-rw-r--r--src/modules/m_override.cpp3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 86f6876ae..a0a0da1e0 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -209,7 +209,7 @@ class ModuleChanProtect : public Module
return -1;
// given user isnt even on the channel, eat the mode change
- if (!Srv->IsOnChannel(theuser,chan))
+ if (!chan->HasUser(theuser))
return -1;
// source is a server, or ulined, we'll let them +-q the user.
@@ -252,7 +252,7 @@ class ModuleChanProtect : public Module
return -1;
// given user isnt even on the channel, eat the mode change
- if (!Srv->IsOnChannel(theuser,chan))
+ if (!chan->HasUser(theuser))
return -1;
// source has +q, is a server, or ulined, we'll let them +-a the user.
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index df6eb0616..d764f553b 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -110,7 +110,8 @@ class ModuleOverride : public Module
{
// Fix by brain - allow the change if they arent on channel - rely on boolean short-circuit
// to not check the other items in the statement if they arent on the channel
- if ((!Srv->IsOnChannel(source,channel)) || ((Srv->ChanMode(source,channel) != "%") && (Srv->ChanMode(source,channel) != "@")))
+ std::string mode = Srv->ChanMode(source,channel);
+ if ((!channel->HasUser(source)) || ((mode != "%") && (mode != "@")))
{
switch (access_type)
{