X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_serverban.cpp;h=241ac1ce3236a5cb04805035b310f65fa9f1f794;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=ca3b51e5035b007ebb1a219d60f42ca5f75de619;hpb=b6de960d973dc8a22c1bf5b0cbcf0a20461faa13;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_serverban.cpp b/src/modules/m_serverban.cpp
index ca3b51e50..241ac1ce3 100644
--- a/src/modules/m_serverban.cpp
+++ b/src/modules/m_serverban.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,7 +21,7 @@ class ModuleServerBan : public Module
  public:
 	ModuleServerBan(InspIRCd* Me) : Module(Me)
 	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
@@ -34,21 +34,9 @@ class ModuleServerBan : public Module
 		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
+	virtual int OnCheckBan(User *user, Channel *c)
 	{
-		if (!IS_LOCAL(user))
-			return 0;
-
-		if (!c)
-			return 0;
-
-		if (c->IsExtBanned(user->server, 's'))
-		{
-			user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
-			return 1;
-		}
-
-		return 0;
+		return c->GetExtBanStatus(user->server, 's');
 	}
 
 	virtual void On005Numeric(std::string &output)