X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_regonlycreate.cpp;h=6b6e059dfa6c038135ccb0e13d89aa273d36110b;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=9874936d82c9fe203c2bf2c470fb865e4c6437dc;hpb=4367b8658681d25be247aeff600d9b9c3614d9ee;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regonlycreate.cpp b/src/modules/m_regonlycreate.cpp
index 9874936d8..6b6e059df 100644
--- a/src/modules/m_regonlycreate.cpp
+++ b/src/modules/m_regonlycreate.cpp
@@ -1,85 +1,68 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#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 */
+#include "inspircd.h"
+#include "modules/account.h"
 
 class ModuleRegOnlyCreate : public Module
 {
+	UserModeReference regusermode;
+
  public:
-	ModuleRegOnlyCreate(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleRegOnlyCreate()
+		: regusermode(this, "u_registered")
 	{
 	}
 
-	void Implements(char* List)
+	void init() CXX11_OVERRIDE
 	{
-		List[I_OnUserPreJoin] = 1;
+		Implementation eventlist[] = { I_OnUserPreJoin };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
-			return 0;
-
-		if (IS_OPER(user))
-			return 0;
+			return MOD_RES_PASSTHRU;
 
-		if ((!user->IsModeSet('r')) && (!user->GetExt("accountname")))
-		{
-			user->WriteServ("482 %s %s :You must have a registered nickname to create a new channel", user->nick, cname);
-			return 1;
-		}
+		if (user->IsOper())
+			return MOD_RES_PASSTHRU;
 
-		return 0;
-	}
-	
-    	virtual ~ModuleRegOnlyCreate()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
-};
+		if (user->IsModeSet(regusermode))
+			return MOD_RES_PASSTHRU;
 
+		const AccountExtItem* ext = GetAccountExtItem();
+		if (ext && ext->get(user))
+			return MOD_RES_PASSTHRU;
 
-class ModuleRegOnlyCreateFactory : public ModuleFactory
-{
- public:
-	ModuleRegOnlyCreateFactory()
-	{
-	}
-	
-	~ModuleRegOnlyCreateFactory()
-	{
+		// 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.c_str());
+		return MOD_RES_DENY;
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleRegOnlyCreate(Me);
+		return Version("Prevents users whose nicks are not registered from creating new channels", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleRegOnlyCreateFactory;
-}
-
+MODULE_INIT(ModuleRegOnlyCreate)