Make FJOIN send UUID

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

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 94e2efdb8b7f58bb67c1c645a08bfc150c1c02f5..4a01faa7c68559e24c283dafb1dd96bf968fa33e 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -2,26 +2,21 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "helperfuncs.h"
+#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -29,79 +24,57 @@ class ModuleDenyChannels : public Module
 {
  private:
 
-       Server *Srv;
+       
        ConfigReader *Conf;
 
  public:
-       ModuleDenyChannels(Server* Me)
-               : Module::Module(Me)
+       ModuleDenyChannels(InspIRCd* Me) : Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               
+               Conf = new ConfigReader(ServerInstance);
        }
        
+       virtual void OnRehash(userrec* user, const std::string &param)
+       {
+               DELETE(Conf);
+               Conf = new ConfigReader(ServerInstance);
+       }
+
        virtual ~ModuleDenyChannels()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserPreJoin] = 1;
+               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)
+       {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {
-                       irc::string cn = Conf->ReadValue("badchan","name",j).c_str();
-                       irc::string thischan = cname;
-                       if (thischan == cn)
+                       if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
                        {
-                               if ((Conf->ReadFlag("badchan","allowopers",j)) && (strchr(user->modes,'o')))
+                               if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
                                {
                                        return 0;
                                }
                                else
                                {
                                        std::string reason = Conf->ReadValue("badchan","reason",j);
-                                       WriteServ(user->fd,"926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
+                                       user->WriteServ("926 %s %s :Channel %s is forbidden: %s",user->nick,cname,cname,reason.c_str());
                                        return 1;
                                }
                        }
                }
                return 0;
-        }
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleDenyChannelsFactory : public ModuleFactory
-{
- public:
-       ModuleDenyChannelsFactory()
-       {
-       }
-       
-       ~ModuleDenyChannelsFactory()
-       {
        }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleDenyChannels(Me);
-       }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDenyChannelsFactory;
-}
-
+MODULE_INIT(ModuleDenyChannels)