m_ssl_openssl is sending log messages and calling itself m_ssl_gnutls..

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

diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 873988cc2215528aa27e1187debbe4ff81faaf76..02d7d6a3ab31739f844c2ef93b04e2ca45d8e936 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -17,7 +17,7 @@
 
 class ModuleRestrictChans : public Module
 {
-       
+
 
        std::map<irc::string,int> allowchans;
 
@@ -39,7 +39,7 @@ class ModuleRestrictChans : public Module
        ModuleRestrictChans(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                ReadConfig();
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -50,30 +50,33 @@ class ModuleRestrictChans : public Module
                ReadConfig();
        }
 
-       
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                irc::string x = cname;
-               // user is not an oper and its not in the allow list
-               if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
+               if (!IS_LOCAL(user))
+                       return 0;
+
+               // channel does not yet exist (record is null, about to be created IF we were to allow it)
+               if (!chan)
                {
-                       // channel does not yet exist (record is null, about to be created IF we were to allow it)
-                       if (!chan)
+                       // user is not an oper and its not in the allow list
+                       if ((!IS_OPER(user)) && (allowchans.find(x) == allowchans.end()))
                        {
-                               user->WriteServ("530 %s %s :Only IRC operators may create new channels",user->nick,cname,cname);
+                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
                                return 1;
                        }
                }
                return 0;
        }
-       
+
        virtual ~ModuleRestrictChans()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 };