X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_regonlycreate.cpp;h=0ffe5e085010f43a62bdc846d4d2334e11c1f553;hb=3323226c38c959392e61f406ec62f9d5f24fce15;hp=61f94c0bd1b81f26bc4cf9ea2bcdb10d8d84c0c2;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 61f94c0bd..0ffe5e085 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -21,28 +21,27 @@
 
 
 #include "inspircd.h"
-#include "account.h"
-
-/* $ModDesc: Prevents users whose nicks are not registered from creating new channels */
+#include "modules/account.h"
 
 class ModuleRegOnlyCreate : public Module
 {
+	UserModeReference regusermode;
+
  public:
-	void init()
+	ModuleRegOnlyCreate()
+		: regusermode(this, "u_registered")
 	{
-		Implementation eventlist[] = { I_OnUserPreJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
 			return MOD_RES_PASSTHRU;
 
-		if (IS_OPER(user))
+		if (user->IsOper())
 			return MOD_RES_PASSTHRU;
 
-		if (user->IsModeSet('r'))
+		if (user->IsModeSet(regusermode))
 			return MOD_RES_PASSTHRU;
 
 		const AccountExtItem* ext = GetAccountExtItem();
@@ -50,15 +49,11 @@ class ModuleRegOnlyCreate : public Module
 			return MOD_RES_PASSTHRU;
 
 		// 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);
+		user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must have a registered nickname to create a new channel", cname.c_str());
 		return MOD_RES_DENY;
 	}
 
-	~ModuleRegOnlyCreate()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Prevents users whose nicks are not registered from creating new channels", VF_VENDOR);
 	}