-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
* This program is free but copyrighted software; see
- *the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-using namespace std;
-
#include "users.h"
#include "channels.h"
#include "modules.h"
#include "inspircd.h"
+#include "wildcard.h"
#include <vector>
/* $ModDesc: Provides aliases of commands. */
bool uline;
/** Requires oper? */
bool operonly;
+ /* is case sensitive params */
+ bool case_sensitive;
+ /** Format that must be matched for use */
+ std::string format;
};
class ModuleAlias : public Module
{
private:
+ /** We cant use a map, there may be multiple aliases with the same name */
std::vector<Alias> Aliases;
+ std::map<std::string, int> AliasMap;
std::vector<std::string> pars;
virtual void ReadAliases()
ConfigReader MyConf(ServerInstance);
Aliases.clear();
-
+ AliasMap.clear();
for (int i = 0; i < MyConf.Enumerate("alias"); i++)
{
Alias a;
std::string txt;
txt = MyConf.ReadValue("alias", "text", i);
a.text = txt.c_str();
- a.replace_with = MyConf.ReadValue("alias", "replace", i);
+ a.replace_with = MyConf.ReadValue("alias", "replace", i, true);
a.requires = MyConf.ReadValue("alias", "requires", i);
a.uline = MyConf.ReadFlag("alias", "uline", i);
a.operonly = MyConf.ReadFlag("alias", "operonly", i);
+ a.format = MyConf.ReadValue("alias", "format", i);
+ a.case_sensitive = MyConf.ReadFlag("alias", "matchcase", i);
Aliases.push_back(a);
+ AliasMap[txt] = 1;
}
-
}
public:
virtual Version GetVersion()
{
- return Version(1,0,0,1,VF_VENDOR);
+ return Version(1,1,0,1,VF_VENDOR,API_VERSION);
}
std::string GetVar(std::string varname, const std::string &original_line)
bool everything_after = (varname == "-");
std::string word = "";
- ServerInstance->Log(DEBUG,"Get var %d%s", index , everything_after ? " and all after it" : "");
-
for (int j = 0; j < index; j++)
word = ss.GetToken();
}
}
- ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
return word;
}
virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
{
userrec *u = NULL;
- irc::string c = command.c_str();
- /* If the command is valid, we dont want to know,
- * and if theyre not registered yet, we dont want
- * to know either
+
+ /* If theyre not registered yet, we dont want
+ * to know.
*/
- if ((validated) || (user->registered != REG_ALL))
+ if (user->registered != REG_ALL)
return 0;
-
+
+ /* We dont have any commands looking like this, dont bother with the loop */
+ if (AliasMap.find(command) == AliasMap.end())
+ return 0;
+
+ irc::string c = command.c_str();
+ /* The parameters for the command in their original form, with the command stripped off */
+ std::string compare = original_line.substr(command.length());
+ while (*(compare.c_str()) == ' ')
+ compare.erase(compare.begin());
+
+ std::string safe(original_line);
+
+ /* Escape out any $ symbols in the user provided text */
+
+ SearchAndReplace(safe, "$", "\r");
+
for (unsigned int i = 0; i < Aliases.size(); i++)
{
if (Aliases[i].text == c)
{
+ /* Does it match the pattern? */
+ if (!Aliases[i].format.empty())
+ {
+ if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
+ continue;
+ }
+
if ((Aliases[i].operonly) && (!*user->oper))
return 0;
if (crlf == std::string::npos)
{
- DoCommand(Aliases[i].replace_with, user, original_line);
+ DoCommand(Aliases[i].replace_with, user, safe);
return 1;
}
else
std::string command = "*";
while ((command = commands.GetToken()) != "")
{
- DoCommand(command, user, original_line);
+ DoCommand(command, user, safe);
}
return 1;
}
SearchAndReplace(newline, "$host", user->host);
SearchAndReplace(newline, "$vhost", user->dhost);
+ /* Unescape any variable names in the user text before sending */
+ SearchAndReplace(newline, "\r", "$");
+
irc::tokenstream ss(newline);
const char* parv[127];
int x = 0;
- while ((pars[x] = ss.GetToken()) != "")
+ while (ss.GetToken(pars[x]))
{
parv[x] = pars[x].c_str();
- ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
x++;
}
- if (ServerInstance->CallCommandHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
- {
- user->WriteServ("421 %s %s :Unknown command", user->nick, parv[0]);
- }
+ ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
}
- virtual void OnRehash(const std::string ¶meter)
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
{
ReadAliases();
}
projects / user / henk / code / inspircd.git / blobdiff