* +------------------------------------+
*
* InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class ModuleAlias : public Module
{
private:
+
+ char fprefix;
+
/* We cant use a map, there may be multiple aliases with the same name.
* We can, however, use a fancy invention: the multimap. Maps a key to one or more values.
* -- w00t
*/
std::multimap<std::string, Alias> Aliases;
+ /* whether or not +B users are allowed to use fantasy commands */
+ bool AllowBots;
+
virtual void ReadAliases()
{
ConfigReader MyConf(ServerInstance);
+ AllowBots = MyConf.ReadFlag("fantasy", "allowbots", "no", 0);
+
+ std::string fpre = MyConf.ReadValue("fantasy","prefix",0);
+ fprefix = fpre.empty() ? '!' : fpre[0];
+
Aliases.clear();
for (int i = 0; i < MyConf.Enumerate("alias"); i++)
{
return word;
}
- void SearchAndReplace(std::string& newline, const std::string &find, const std::string &replace)
- {
- std::string::size_type x = newline.find(find);
- while (x != std::string::npos)
- {
- newline.erase(x, find.length());
- newline.insert(x, replace);
- x = newline.find(find);
- }
- }
-
virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
{
std::multimap<std::string, Alias>::iterator i, upperbound;
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");
-
while (i != upperbound)
{
if (i->second.UserCommand)
{
- if (DoAlias(user, NULL, &(i->second), compare, safe))
+ if (DoAlias(user, NULL, &(i->second), compare, original_line))
{
return 1;
}
i++;
}
- // If aliases have been processed, aliases took it.
- return 1;
+ // If we made it here, no aliases actually matched.
+ return 0;
}
virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
return 0;
}
+ /* Stop here if the user is +B and allowbot is set to no. */
+ if (!AllowBots && user->IsModeSet('B'))
+ {
+ ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: user is +B and allowbot is set to no");
+ return 0;
+ }
+
Channel *c = (Channel *)dest;
std::string fcommand;
ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: looking at fcommand %s", fcommand.c_str());
// we don't want to touch non-fantasy stuff
- if (*fcommand.c_str() != '!')
+ if (*fcommand.c_str() != fprefix)
{
ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: not a fcommand");
return 0;
}
- // nor do we give a shit about the !
+ // nor do we give a shit about the prefix
fcommand.erase(fcommand.begin());
std::transform(fcommand.begin(), fcommand.end(), fcommand.begin(), ::toupper);
ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: now got %s", fcommand.c_str());
if (i == Aliases.end())
return 0;
-
+
/* Avoid iterating on to other aliases if no patterns match */
std::multimap<std::string, Alias>::iterator upperbound = Aliases.upper_bound(fcommand);
while (*(compare.c_str()) == ' ')
compare.erase(compare.begin());
- std::string safe(compare);
-
- /* Escape out any $ symbols in the user provided text (ugly, but better than crashy) */
- SearchAndReplace(safe, "$", "\r");
-
- ServerInstance->Logs->Log("FANTASY", DEBUG, "fantasy: compare is %s and safe is %s", compare.c_str(), safe.c_str());
-
while (i != upperbound)
{
if (i->second.ChannelCommand)
{
- if (DoAlias(user, c, &(i->second), compare, safe))
+ // We use substr(1) here to remove the fantasy prefix
+ if (DoAlias(user, c, &(i->second), compare, text.substr(1)))
return 0;
}
i++;
}
-
+
return 0;
}
{
if (!ServerInstance->ULine(u->server))
{
- ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
+ ServerInstance->SNO->WriteToSnoMask('a', "NOTICE -- Service "+a->RequiredNick+" required by alias "+std::string(a->AliasedCommand.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
user->WriteNumeric(401, ""+std::string(user->nick)+" "+a->RequiredNick+" :is an imposter! Please inform an IRC operator as soon as possible.");
return 1;
}
}
/* Special variables */
- SearchAndReplace(newline, "$nick", user->nick);
- SearchAndReplace(newline, "$ident", user->ident);
- SearchAndReplace(newline, "$host", user->host);
- SearchAndReplace(newline, "$vhost", user->dhost);
+ SearchAndReplace(newline, std::string("$nick"), user->nick);
+ SearchAndReplace(newline, std::string("$ident"), user->ident);
+ SearchAndReplace(newline, std::string("$host"), user->host);
+ SearchAndReplace(newline, std::string("$vhost"), user->dhost);
if (c)
{
/* Channel specific variables */
- SearchAndReplace(newline, "$chan", c->name);
+ SearchAndReplace(newline, std::string("$chan"), c->name);
+ }
+ else
+ {
+ /* We don't want these in a user alias */
+ SearchAndReplace(newline, std::string("$chan"), std::string(""));
}
-
- /* Unescape any variable names in the user text before sending */
- SearchAndReplace(newline, "\r", "$");
irc::tokenstream ss(newline);
pars.clear();
ServerInstance->Parser->CallHandler(command, pars, user);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ReadAliases();
}
projects / user / henk / code / inspircd.git / blobdiff