X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=591dc97a8ad0d476b520bf8e7af3debfbf4691ce;hb=625e5435f51650f547f4411441c0b7b958c53d30;hp=2431853c25e922928bcf283ead0aa93e5eba672b;hpb=a3e0768758ca68429a29d9c78ce672f2d938c6e7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp index 2431853c2..591dc97a8 100644 --- a/src/modules/m_opermotd.cpp +++ b/src/modules/m_opermotd.cpp @@ -34,14 +34,14 @@ class CommandOpermotd : public Command flags_needed = 'o'; syntax = "[]"; } - CmdResult Handle (const std::vector& parameters, User* user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName)) + if ((parameters.empty()) || (irc::equals(parameters[0], ServerInstance->Config->ServerName))) ShowOperMOTD(user); return CMD_SUCCESS; } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos)) return ROUTE_OPT_UCAST(parameters[0]); @@ -100,14 +100,12 @@ class ModuleOpermotd : public Module { FileReader reader(conf->getString("file", "opermotd")); cmd.opermotd = reader.GetVector(); + InspIRCd::ProcessColors(cmd.opermotd); } catch (CoreException&) { // Nothing happens here as we do the error handling in ShowOperMOTD. } - - if (conf->getBool("processcolors")) - InspIRCd::ProcessColors(cmd.opermotd); } };