X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_abbreviation.cpp;h=b87e352d27b678ddc338a50a15f1ef52644112cc;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=dbda047b5a557b24c42a7de33409680866de530f;hpb=715eba3932edef74b3983792be524192bb0fa102;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index dbda047b5..b87e352d2 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.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.
@@ -17,27 +17,27 @@
 
 class ModuleAbbreviation : public Module
 {
-
  public:
-	
-	ModuleAbbreviation(InspIRCd* Me)
-		: Module(Me)
+	void init()
+	{
+		ServerInstance->Modules->Attach(I_OnPreCommand, this);
+	}
+
+	void Prioritize()
 	{
-		Me->Modules->Attach(I_OnPreCommand, this);
-		/* Must do this first */
-		Me->Modules->SetPriority(this, I_OnPreCommand, PRIO_FIRST);
+		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("Provides the ability to abbreviate commands a-la BBC BASIC keywords.",VF_VENDOR);
 	}
 
-	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
 		/* Command is already validated, has a length of 0, or last character is not a . */
 		if (validated || command.empty() || *command.rbegin() != '.')
-			return 0;
+			return MOD_RES_PASSTHRU;
 
 		/* Whack the . off the end */
 		command.erase(command.end() - 1);
@@ -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 MOD_RES_DENY;
+				}
+
 				if (!foundmatch)
 				{
 					/* Found the command */
@@ -68,7 +74,7 @@ class ModuleAbbreviation : public Module
 		if (!matchlist.empty())
 		{
 			user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
-			return true;
+			return MOD_RES_DENY;
 		}
 
 		if (foundcommand.empty())
@@ -81,7 +87,7 @@ class ModuleAbbreviation : public Module
 			command = foundcommand;
 		}
 
-		return false;
+		return MOD_RES_PASSTHRU;
 	}
 };