Flexible SendQ

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

diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 9874936d82c9fe203c2bf2c470fb865e4c6437dc..3354c11323f06f68b653a14a6f9ca77cc8c8d377 100644 (file)
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Prevents users who's nicks are not registered from creating new channels */
@@ -21,65 +18,39 @@
 class ModuleRegOnlyCreate : public Module
 {
  public:
-       ModuleRegOnlyCreate(InspIRCd* Me)
-               : Module::Module(Me)
-       {
+       ModuleRegOnlyCreate()
+                       {
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreJoin] = 1;
-       }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (IS_OPER(user))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
-               if ((!user->IsModeSet('r')) && (!user->GetExt("accountname")))
+               if (user->GetExtList().find("accountname") == user->GetExtList().end() && !user->IsModeSet('r'))
                {
-                       user->WriteServ("482 %s %s :You must have a registered nickname to create a new channel", user->nick, cname);
-                       return 1;
+                       // XXX. there may be a better numeric for this..
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have a registered nickname to create a new channel", user->nick.c_str(), cname);
+                       return MOD_RES_DENY;
                }
 
-               return 0;
-       }
-       
-       virtual ~ModuleRegOnlyCreate()
-       {
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-       }
-};
-
 
-class ModuleRegOnlyCreateFactory : public ModuleFactory
-{
- public:
-       ModuleRegOnlyCreateFactory()
+       virtual ~ModuleRegOnlyCreate()
        {
        }
-       
-       ~ModuleRegOnlyCreateFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       virtual Version GetVersion()
        {
-               return new ModuleRegOnlyCreate(Me);
+               return Version("Prevents users who's nicks are not registered from creating new channels", VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRegOnlyCreateFactory;
-}
-
+MODULE_INIT(ModuleRegOnlyCreate)