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

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index 852764db1..f0086ddcb 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,24 +20,23 @@ 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, PRIORITY_FIRST);
+		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",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);
@@ -56,7 +55,7 @@ class ModuleAbbreviation : public Module
 				if (matchlist.length() > 450)
 				{
 					user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
-					return true;
+					return MOD_RES_DENY;
 				}
 
 				if (!foundmatch)
@@ -74,7 +73,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())
@@ -87,7 +86,7 @@ class ModuleAbbreviation : public Module
 			command = foundcommand;
 		}
 
-		return false;
+		return MOD_RES_PASSTHRU;
 	}
 };