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 020e097ffca126d58467c0f793612542acc9f042..61e423aefee33de298b5eaafab8418eaceebebfb 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -69,11 +69,20 @@ 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.c_str(), chan->name.c_str(), chan->name.c_str());
+                                       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;
        }
 
@@ -85,7 +94,7 @@ class ModuleOperChans : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+               return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
        }
 };