X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_gecosban.cpp;h=0f3c75f246f4f5352fb168808d2d917cba77f5e5;hb=f5c631ef8641db6455bed23c02e5a39f63f7d6d0;hp=49ca17fe0cc72a94cd40a14636df65433e1c3f60;hpb=f2360a777d223b786767ff6f26473a6b3f4b19e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 49ca17fe0..0f3c75f24 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.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.
@@ -15,52 +15,38 @@
 
 /* $ModDesc: Implements extban +b r: - realname (gecos) bans */
 
-class ModuleNickBan : public Module
+class ModuleGecosBan : public Module
 {
- private:
  public:
-	ModuleNickBan(InspIRCd* Me) : Module(Me)
+	ModuleGecosBan()
 	{
-		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
+		Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleNickBan()
+	~ModuleGecosBan()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("Extban 'r' - realname (gecos) 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->fullname, 'r'))
+		if (mask[0] == 'r' && mask[1] == ':')
 		{
-			// XXX: send a numeric here
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot join " + c->name + ", as you match a ban");
-			return 1;
+			if (InspIRCd::Match(user->fullname, mask.substr(2)))
+				return MOD_RES_DENY;
 		}
-
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::string &output)
 	{
-		if (output.find(" EXTBAN=:") == std::string::npos)
-			output.append(" EXTBAN=:r");
-		else
-			output.insert(output.find(" EXTBAN=:") + 9, "r");
+		ServerInstance->AddExtBanChar('r');
 	}
 };
 
-
-MODULE_INIT(ModuleNickBan)
-
+MODULE_INIT(ModuleGecosBan)