X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banredirect.cpp;h=421d8ade64707d506da989a290fcad872c4c26d8;hb=9539fa9d7bcb19100bd5b7f67d6f792e48fff909;hp=ae81c1733e6a12ec9d7540c67d595426cabf93da;hpb=ded1f34b9828508762b05c80687ababb10a75dd8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index ae81c1733..421d8ade6 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -1,21 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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"
 #include "u_listmode.h"
 
 /* $ModDesc: Allows an extended ban (+b) syntax redirecting banned users to another channel */
-/* $ModDep: ../../include/u_listmode.h */
 
 /* Originally written by Om, January 2009
  */
@@ -121,7 +131,7 @@ class BanRedirect : public ModeWatcher
 
 			if(mask[CHAN].length())
 			{
-				if (IS_LOCAL(source))
+				if (adding && IS_LOCAL(source))
 				{
 					if (!ServerInstance->IsChannel(mask[CHAN].c_str(),  ServerInstance->Config->Limits.ChanMax))
 					{
@@ -135,7 +145,7 @@ class BanRedirect : public ModeWatcher
 						source->WriteNumeric(690, "%s :Target channel %s must exist to be set as a redirect.",source->nick.c_str(),mask[CHAN].c_str());
 						return false;
 					}
-					else if (c->GetPrefixValue(source) < OP_VALUE)
+					else if (adding && c->GetPrefixValue(source) < OP_VALUE)
 					{
 						source->WriteNumeric(690, "%s :You must be opped on %s to set it as a redirect.",source->nick.c_str(), mask[CHAN].c_str());
 						return false;
@@ -203,14 +213,17 @@ class ModuleBanRedirect : public Module
 {
 	BanRedirect re;
 	bool nofollow;
-	Module* ExceptionModule;
 
  public:
 	ModuleBanRedirect()
 	: re(this)
 	{
 		nofollow = false;
+	}
 
+
+	void init()
+	{
 		if(!ServerInstance->Modes->AddModeWatcher(&re))
 			throw ModuleException("Could not add mode watcher");
 
@@ -263,7 +276,6 @@ class ModuleBanRedirect : public Module
 
 	virtual void OnRehash(User* user)
 	{
-		ExceptionModule = ServerInstance->Modules->Find("m_banexception.so");
 	}
 
 	virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
@@ -332,6 +344,9 @@ class ModuleBanRedirect : public Module
 
 	virtual ~ModuleBanRedirect()
 	{
+		/* XXX is this the best place to do this? */
+		if (!ServerInstance->Modes->DelModeWatcher(&re))
+			ServerInstance->Logs->Log("m_banredirect.so", DEBUG, "Failed to delete modewatcher!");
 	}
 
 	virtual Version GetVersion()