Fix dccallow to work with files with spaces in their names

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

diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index cdb5c40dd3a1e10c1df27903f61217ad964a9592..6eec486ea8a1a4cab6149d6e4651f5f3115b3859 100644 (file)
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | 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) 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 */
@@ -19,43 +26,52 @@ class ModuleBadChannelExtban : public Module
 {
  private:
  public:
-       ModuleBadChannelExtban(InspIRCd* Me) : Module(Me)
+       void init()
        {
-               Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual ~ModuleBadChannelExtban()
+       ~ModuleBadChannelExtban()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR,API_VERSION);
+               return Version("Extban 'j' - channel status/join ban", VF_OPTCOMMON|VF_VENDOR);
        }
 
-       virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
+       ModResult OnCheckBan(User *user, Channel *c, const std::string& mask)
        {
-               if (!IS_LOCAL(user))
-                       return 0;
-
-               if (!c)
-                       return 0;
-
-
-               for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+               if ((mask.length() > 2) && (mask[0] == 'j') && (mask[1] == ':'))
                {
-                       if (c->IsExtBanned(i->first->name, 'j'))
+                       std::string rm = mask.substr(2);
+                       char status = 0;
+                       ModeHandler* mh = ServerInstance->Modes->FindPrefix(rm[0]);
+                       if (mh)
+                       {
+                               rm = mask.substr(3);
+                               status = mh->GetModeChar();
+                       }
+                       for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                        {
-                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
-                               return 1;
+                               if (InspIRCd::Match((**i).name, rm))
+                               {
+                                       if (status)
+                                       {
+                                               Membership* memb = (**i).GetUser(user);
+                                               if (memb && memb->hasMode(status))
+                                                       return MOD_RES_DENY;
+                                       }
+                                       else
+                                               return MOD_RES_DENY;
+                               }
                        }
                }
-
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                ServerInstance->AddExtBanChar('j');
        }