X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channelban.cpp;h=51a8105abd011811fce4e9eaec7b97116405e51d;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=8f70f7d20917cbcf5f0216fa59e21dad9c83b3c7;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 8f70f7d20..51a8105ab 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -1,41 +1,44 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 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: Implements extban +b j: - matching channel bans */
 
 class ModuleBadChannelExtban : public Module
 {
- private:
  public:
-	ModuleBadChannelExtban() 	{
-		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	~ModuleBadChannelExtban()
+	void init()
 	{
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion()
 	{
-		return Version("Extban 'j' - channel status/join ban", VF_COMMON|VF_VENDOR);
+		return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
 	}
 
 	ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
 	{
-		if (mask[0] == 'j' && mask[1] == ':')
+		if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':'))
 		{
 			std::string rm = mask.substr(2);
 			char status = 0;
@@ -51,8 +54,8 @@ class ModuleBadChannelExtban : public Module
 				{
 					if (status)
 					{
-						Membership* memb = c->GetUser(user);
-						if (memb->hasMode(status))
+						Membership* memb = (**i).GetUser(user);
+						if (memb && memb->hasMode(status))
 							return MOD_RES_DENY;
 					}
 					else
@@ -63,12 +66,10 @@ class ModuleBadChannelExtban : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		ServerInstance->AddExtBanChar('j');
+		tokens["EXTBAN"].push_back('j');
 	}
 };
 
-
 MODULE_INIT(ModuleBadChannelExtban)
-