cgiirc: Pass hosts to WEBIRC command on rehash. No fucking wonder this never worked...

[user/henk/code/inspircd.git] / src / modules / m_operchans.cpp

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index d9b4515674139be3c9fb53aa7e4905a36b2f3a09..50aa0aa874438cffdb9a5f1a886ecd721713aabe 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -56,19 +56,26 @@ class ModuleOperChans : public Module
                oc = new OperChans(ServerInstance);
                if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnCheckBan };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnCheckBan, I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       {
+               if (chan && 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;
        }