X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_abbreviation.cpp;h=f0086ddcbc2c5736639f226626010239387fe9f4;hb=e071bd88391e00e4d3b0104ada985e08a9eb3210;hp=fd6309e836244034bb265ab28208deec2af85ee6;hpb=a914ae91957f617af0a21bcdb024a16361ae3398;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index fd6309e83..f0086ddcb 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.
@@ -12,38 +12,81 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides the ability to abbreviate commands. */
+/* $ModDesc: Provides the ability to abbreviate commands a-la BBC BASIC keywords. */
 
 class ModuleAbbreviation : public Module
 {
 
  public:
-	
-	ModuleAbbreviation(InspIRCd* Me)
-		: Module(Me)
-	{
-		Me->Modules->Attach(I_OnPreCommand, this);
+
+	ModuleAbbreviation()
+			{
+		ServerInstance->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);
 
-		ServerInstance->Logs->Log("m_abbreviation", DEBUG, "Abbreviated command: %s", command.c_str());
+		/* Look for any command that starts with the same characters, if it does, replace the command string with it */
+		size_t clen = command.length();
+		std::string foundcommand, matchlist;
+		bool foundmatch = false;
+		for (Commandtable::iterator n = ServerInstance->Parser->cmdlist.begin(); n != ServerInstance->Parser->cmdlist.end(); ++n)
+		{
+			if (n->first.length() < clen)
+				continue;
+
+			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 */
+					foundcommand = n->first;
+					foundmatch = true;
+				}
+				else
+					matchlist.append(" ").append(n->first);
+			}
+		}
+
+		/* Ambiguous command, list the matches */
+		if (!matchlist.empty())
+		{
+			user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
+			return MOD_RES_DENY;
+		}
+
+		if (foundcommand.empty())
+		{
+			/* No match, we have to put the . back again so that the invalid command numeric looks correct. */
+			command += '.';
+		}
+		else
+		{
+			command = foundcommand;
+		}
+
+		return MOD_RES_PASSTHRU;
 	}
 };