Allow non-opers to use /MKPASSWD

[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 587ba24c1254c36f6d895d37d0b077ce922550ee..2bda65effea1d1a4c5d4d4009b1871e924f7e1f3 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -54,11 +54,14 @@ class ModuleRestrictChans : public Module
        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->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname);
                                return 1;
@@ -73,7 +76,7 @@ class ModuleRestrictChans : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 };