Rip flood/threshold out of config classes also.

[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 d1111fd864584098ff4d1eff7d7919e6d6bc54b6..61e423aefee33de298b5eaafab8418eaceebebfb 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -46,13 +46,13 @@ class OperChans : public ModeHandler
 
 class ModuleOperChans : public Module
 {
-       
+
        OperChans* oc;
  public:
        ModuleOperChans(InspIRCd* Me)
                : Module(Me)
        {
-                               
+
                oc = new OperChans(ServerInstance);
                if (!ServerInstance->Modes->AddMode(oc))
                        throw ModuleException("Could not add new modes!");
@@ -69,23 +69,32 @@ class ModuleOperChans : public Module
                        {
                                if (chan->IsModeSet('O'))
                                {
-                                       user->WriteNumeric(520, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+                                       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->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;
+                       }
+               }
+
                return 0;
        }
-       
+
        virtual ~ModuleOperChans()
        {
                ServerInstance->Modes->DelMode(oc);
                delete oc;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };