Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 bb804676b8c7ed2f7fa101698297cbb1c8eb6902..abfb6f580ac80eacc2303f47ed6eb59a81ec54af 100644 (file)
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -21,19 +21,20 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Only opers may create new channels if this module is loaded */
 
 class ModuleRestrictChans : public Module
 {
-       Server* Srv;
+       
 
        std::map<irc::string,int> allowchans;
 
        void ReadConfig()
        {
-               ConfigReader* MyConf = new ConfigReader();
+               ConfigReader* MyConf = new ConfigReader(ServerInstance);
                allowchans.clear();
                for (int i = 0; i < MyConf->Enumerate("allowchannel"); i++)
                {
@@ -46,10 +47,10 @@ class ModuleRestrictChans : public Module
        }
 
  public:
-       ModuleRestrictChans(Server* Me)
+       ModuleRestrictChans(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
                ReadConfig();
        }
 
@@ -63,7 +64,7 @@ class ModuleRestrictChans : public Module
                List[I_OnUserPreJoin] = List[I_OnRehash] = 1;
        }
        
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                irc::string x = cname;
                // user is not an oper and its not in the allow list
@@ -85,7 +86,7 @@ class ModuleRestrictChans : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -101,7 +102,7 @@ class ModuleRestrictChansFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleRestrictChans(Me);
        }