Missed another

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

diff --git a/src/modules/m_gecosban.cpp b/src/modules/m_gecosban.cpp
index 49ca17fe0cc72a94cd40a14636df65433e1c3f60..c7194aef56ba06c56987d05b5443237646ba0c09 100644 (file)
--- a/src/modules/m_gecosban.cpp
+++ b/src/modules/m_gecosban.cpp
@@ -15,17 +15,17 @@
 
 /* $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()
        {
        }
 
@@ -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)