summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-10 21:40:24 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2009-04-10 21:40:24 +0000
commit9660e71deb37d57298114a3e843e9a20fad5e1df (patch)
treee221b470984950ce7999738acdfa8d1f513eecb5
parent52149814e30b4471588f9dba9b2661b0283bd57f (diff)
Move +O check out of OnCheckBan to change error message and avoid triggering restrictbanned
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11300 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/modules/m_operchans.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index d9b451567..a0f30e730 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -60,15 +60,22 @@ class ModuleOperChans : public Module
ServerInstance->Modules->Attach(eventlist, this, 1);
}
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+ {
+ if (chan->IsModeSet('O') && !IS_OPER(user))
+ {
+ user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join %s (+O is set)",
+ user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
+ return 1;
+ }
+ return 0;
+ }
virtual int OnCheckBan(User* user, Channel* chan)
{
if (IS_OPER(user))
return chan->GetExtBanStatus(user->oper, 'O');
- if (chan->IsModeSet('O'))
- return -1;
-
return 0;
}