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 b8f7f2415d269a6e1c3b003dda34bcfe40ddf6fc..50aa0aa874438cffdb9a5f1a886ecd721713aabe 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -56,32 +56,25 @@ class ModuleOperChans : public Module
                oc = new OperChans(ServerInstance);
                if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreJoin };
-               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 (!IS_OPER(user))
-               {
-                       if (chan)
-                       {
-                               if (chan->IsModeSet('O'))
-                               {
-                                       user->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
-                                       return 1;
-                               }
-                       }
-               }
-               else
+               if (chan && chan->IsModeSet('O') && !IS_OPER(user))
                {
-                       if (chan && chan->IsExtBanned(user->oper, 'O'))
-                       {
-                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
-                               return 1;
-                       }
+                       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');
 
                return 0;
        }