X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_serverban.cpp;h=1a3030c0be0a4355f28a7d25e7d9437ecbc71065;hb=9ebd9cba72056c5b36696e166826afb981f25ebb;hp=3b3bcc320916ae4c07720a999e4e42a29ad9fec3;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index 3b3bcc320..1a3030c0b 100644
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,39 +19,31 @@ class ModuleServerBan : public Module
 {
  private:
  public:
-	ModuleServerBan(InspIRCd* Me) : Module(Me)
-	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+	ModuleServerBan() 	{
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleServerBan()
+	~ModuleServerBan()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Extban 's' - server 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;
-
-		if (c->IsExtBanned(user->server, 's'))
+		if (mask[0] == 's' && mask[1] == ':')
 		{
-			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(user->server, mask.substr(2)))
+				return MOD_RES_DENY;
 		}
-
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
 		ServerInstance->AddExtBanChar('s');
 	}