std::string requires;
/** Alias requires ulined server */
bool uline;
+ /** Requires oper? */
+ bool operonly;
};
class ModuleAlias : public Module
a.replace_with = MyConf.ReadValue("alias", "replace", i);
a.requires = MyConf.ReadValue("alias", "requires", i);
a.uline = MyConf.ReadFlag("alias", "uline", i);
-
+ a.operonly = MyConf.ReadFlag("alias", "operonly", i);
Aliases.push_back(a);
}
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)
{
if (Aliases[i].text == c)
{
+ if ((Aliases[i].operonly) && (!*user->oper))
+ return 0;
+
if (Aliases[i].requires != "")
{
u = ServerInstance->FindNick(Aliases[i].requires);
/* Now, search and replace in a copy of the original_line, replacing $1 through $9 and $1- etc */
- std::string newline = Aliases[i].replace_with;
+ std::string::size_type crlf = Aliases[i].replace_with.find('\n');
- for (int v = 1; v < 10; v++)
+ if (crlf == std::string::npos)
{
- std::string var = "$";
- var.append(ConvToStr(v));
- var.append("-");
- std::string::size_type x = newline.find(var);
-
- while (x != std::string::npos)
- {
- newline.erase(x, var.length());
- newline.insert(x, GetVar(var, original_line));
- x = newline.find(var);
- }
-
- var = "$";
- var.append(ConvToStr(v));
- x = newline.find(var);
-
- while (x != std::string::npos)
+ DoCommand(Aliases[i].replace_with, user, original_line);
+ return 1;
+ }
+ else
+ {
+ irc::sepstream commands(Aliases[i].replace_with, '\n');
+ std::string command = "*";
+ while ((command = commands.GetToken()) != "")
{
- newline.erase(x, var.length());
- newline.insert(x, GetVar(var, original_line));
- x = newline.find(var);
+ DoCommand(command, user, original_line);
}
+ return 1;
}
+ }
+ }
+ return 0;
+ }
- /* Special variables */
- SearchAndReplace(newline, "$nick", user->nick);
- SearchAndReplace(newline, "$ident", user->ident);
- SearchAndReplace(newline, "$host", user->host);
- SearchAndReplace(newline, "$vhost", user->dhost);
+ void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+ {
+ for (int v = 1; v < 10; v++)
+ {
+ std::string var = "$";
+ var.append(ConvToStr(v));
+ var.append("-");
+ std::string::size_type x = newline.find(var);
- irc::tokenstream ss(newline);
- const char* parv[127];
- int x = 0;
+ while (x != std::string::npos)
+ {
+ newline.erase(x, var.length());
+ newline.insert(x, GetVar(var, original_line));
+ x = newline.find(var);
+ }
- while ((pars[x] = ss.GetToken()) != "")
- {
- parv[x] = pars[x].c_str();
- ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
- x++;
- }
+ var = "$";
+ var.append(ConvToStr(v));
+ x = newline.find(var);
- ServerInstance->CallCommandHandler(parv[0], &parv[1], x-1, user);
- return 1;
+ while (x != std::string::npos)
+ {
+ newline.erase(x, var.length());
+ newline.insert(x, GetVar(var, original_line));
+ x = newline.find(var);
}
}
- return 0;
- }
+
+ /* Special variables */
+ SearchAndReplace(newline, "$nick", user->nick);
+ SearchAndReplace(newline, "$ident", user->ident);
+ SearchAndReplace(newline, "$host", user->host);
+ SearchAndReplace(newline, "$vhost", user->dhost);
+
+ irc::tokenstream ss(newline);
+ const char* parv[127];
+ int x = 0;
+
+ while ((pars[x] = ss.GetToken()) != "")
+ {
+ parv[x] = pars[x].c_str();
+ ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
+ x++;
+ }
+
+ ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]);
+
+ if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
+ {
+ ServerInstance->Log(DEBUG,"Unknown command or not enough parameters");
+ }
+ else
+ {
+ ServerInstance->Log(DEBUG,"Command handler called successfully.");
+ }
+ }
virtual void OnRehash(const std::string ¶meter)
{