X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_gecosban.cpp;h=2bc519b86f87a6589cbd0848313d1531a8dbc219;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;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..2bc519b86 100644
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,23 +15,23 @@
 
 /* $ModDesc: Implements extban +b r: - realname (gecos) bans */
 
-class ModuleNickBan : public Module
+class ModuleGecosBan : public Module
 {
  private:
  public:
-	ModuleNickBan(InspIRCd* Me) : Module(Me)
+	ModuleGecosBan(InspIRCd* Me) : Module(Me)
 	{
 		Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleNickBan()
+	virtual ~ModuleGecosBan()
 	{
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
 	virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key)
@@ -44,8 +44,7 @@ class ModuleNickBan : public Module
 
 		if (c->IsExtBanned(user->fullname, 'r'))
 		{
-			// XXX: send a numeric here
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot join " + c->name + ", as you match a ban");
+			user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  c->name.c_str());
 			return 1;
 		}
 
@@ -54,13 +53,10 @@ class ModuleNickBan : public Module
 
 	virtual 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)