Fix previous module mismatch message; "remote" is misleading when sent as an ERROR

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

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index dbda047b5a557b24c42a7de33409680866de530f..f29ad1b58475a96f3650a0828fb321487cb58c70 100644 (file)
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.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
@@ -19,18 +19,18 @@ class ModuleAbbreviation : public Module
 {
 
  public:
-       
+
        ModuleAbbreviation(InspIRCd* Me)
                : Module(Me)
        {
                Me->Modules->Attach(I_OnPreCommand, this);
                /* Must do this first */
-               Me->Modules->SetPriority(this, I_OnPreCommand, PRIO_FIRST);
+               Me->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
        virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
@@ -53,6 +53,12 @@ class ModuleAbbreviation : public Module
 
                        if (command == n->first.substr(0, clen))
                        {
+                               if (matchlist.length() > 450)
+                               {
+                                       user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
+                                       return true;
+                               }
+
                                if (!foundmatch)
                                {
                                        /* Found the command */