m_mlock Remove unnecessary iteration

[user/henk/code/inspircd.git] / src / modules / m_banredirect.cpp

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 540155b81fc3ff69cdec37ec0c59e2318589d610..421d8ade64707d506da989a290fcad872c4c26d8 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -1,26 +1,36 @@
-/*       +------------------------------------+
- *       | 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
  */
 
-class BanRedirectEntry : public classbase
+class BanRedirectEntry
 {
  public:
        std::string targetchan;
@@ -86,9 +96,13 @@ class BanRedirect : public ModeWatcher
                                                start_pos = curr+1;
                                                break;
                                        case '#':
-                                               mask[current].assign(start_pos, curr);
-                                               current = CHAN;
-                                               start_pos = curr;
+                                               /* bug #921: don't barf when redirecting to ## channels */
+                                               if (current != CHAN)
+                                               {
+                                                       mask[current].assign(start_pos, curr);
+                                                       current = CHAN;
+                                                       start_pos = curr;
+                                               }
                                                break;
                                }
                        }
@@ -117,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))
                                        {
@@ -131,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;
@@ -199,20 +213,23 @@ 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");
 
                OnRehash(NULL);
 
-               Extensible::Register(&re.extItem);
+               ServerInstance->Extensions.Register(&re.extItem);
                Implementation list[] = { I_OnRehash, I_OnUserPreJoin, I_OnChannelDelete };
                ServerInstance->Modules->Attach(list, this, 3);
        }
@@ -259,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)
@@ -308,7 +324,7 @@ class ModuleBanRedirect : public Module
                                                if(destchan && ServerInstance->Modules->Find("m_redirect.so") && destchan->IsModeSet('L') && !destlimit.empty() && (destchan->GetUserCounter() >= atoi(destlimit.c_str())))
                                                {
                                                        user->WriteNumeric(474, "%s %s :Cannot join channel (You are banned)", user->nick.c_str(), chan->name.c_str());
-                                                       return MOD_RES_ALLOW;
+                                                       return MOD_RES_DENY;
                                                }
                                                else
                                                {
@@ -317,7 +333,7 @@ class ModuleBanRedirect : public Module
                                                        nofollow = true;
                                                        Channel::JoinUser(user, redir->targetchan.c_str(), false, "", false, ServerInstance->Time());
                                                        nofollow = false;
-                                                       return MOD_RES_ALLOW;
+                                                       return MOD_RES_DENY;
                                                }
                                        }
                                }
@@ -328,11 +344,14 @@ 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()
        {
-               return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR, API_VERSION);
+               return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
        }
 
        void Prioritize()