X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=49409a1c05f5e90f33fe1f429a48d1a51d1a6cc3;hb=99af213a58946185621b3e4de01970a7c21cce93;hp=010f4ae58a405c2e7df150962ab636e5b85dba90;hpb=761e6d75ba37b984998952940ed681e79e456142;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 010f4ae58..49409a1c0 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -34,16 +34,16 @@ class CommandOpermotd : public Command
 		flags_needed = 'o'; syntax = "[<servername>]";
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
 			ShowOperMOTD(user);
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		if (!parameters.empty())
+		if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
 			return ROUTE_OPT_UCAST(parameters[0]);
 		return ROUTE_LOCALONLY;
 	}
@@ -56,14 +56,14 @@ class CommandOpermotd : public Command
 			return;
 		}
 
-		user->WriteRemoteNumeric(375, "- IRC Operators Message of the Day");
+		user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
 
 		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
 		{
-			user->WriteRemoteNumeric(372, InspIRCd::Format("- %s", i->c_str()));
+			user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
 		}
 
-		user->WriteRemoteNumeric(376, "- End of OPERMOTD");
+		user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
 	}
 };
 
@@ -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);
 	}
 };