X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_botmode.cpp;h=4a4ea68d09558ac44ebdb4d56f3024b0361c3ffa;hb=fd1d19d6345943ecdb5ce4ef947f9b3c5c8bca86;hp=025e9cf3b741b909343e0d394360d9607340fa5a;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 025e9cf3b..4a4ea68d0 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -1,65 +1,62 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * 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 "inspircd.h"
 
-/* $ModDesc: Provides support for unreal-style umode +B */
+#include "inspircd.h"
 
 /** Handles user mode +B
  */
 class BotMode : public SimpleUserModeHandler
 {
  public:
-	BotMode(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'B') { }
+	BotMode(Module* Creator) : SimpleUserModeHandler(Creator, "bot", 'B') { }
 };
 
 class ModuleBotMode : public Module
 {
-
-	BotMode* bm;
+	BotMode bm;
  public:
-	ModuleBotMode(InspIRCd* Me)
-		: Module(Me)
+	ModuleBotMode()
+		: bm(this)
 	{
-
-		bm = new BotMode(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(bm))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnWhois };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-
-	virtual ~ModuleBotMode()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(bm);
-		delete bm;
+		ServerInstance->Modules->AddService(bm);
+		Implementation eventlist[] = { I_OnWhois };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides user mode +B to mark the user as a bot",VF_VENDOR);
 	}
 
-	virtual void OnWhois(User* src, User* dst)
+	void OnWhois(User* src, User* dst) CXX11_OVERRIDE
 	{
-		if (dst->IsModeSet('B'))
+		if (dst->IsModeSet(bm))
 		{
-			ServerInstance->SendWhoisLine(src, dst, 335, std::string(src->nick)+" "+std::string(dst->nick)+" :is a bot on "+ServerInstance->Config->Network);
+			ServerInstance->SendWhoisLine(src, dst, 335, src->nick+" "+dst->nick+" :is a bot on "+ServerInstance->Config->Network);
 		}
 	}
-
 };
 
-
 MODULE_INIT(ModuleBotMode)