X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=591dc97a8ad0d476b520bf8e7af3debfbf4691ce;hb=b4599531f97a9e6207b6bb8d728d7523b6995523;hp=b228dc8b771fb8795299e2ed45baed2d1fa238a0;hpb=4ab1c43c1eee708fc50a4808f714a731891b75e8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index b228dc8b7..591dc97a8 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -22,8 +22,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
 /** Handle /OPERMOTD
  */
 class CommandOpermotd : public Command
@@ -36,37 +34,36 @@ 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))
+		if ((parameters.empty()) || (irc::equals(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;
 	}
 
 	void ShowOperMOTD(User* user)
 	{
-		const std::string& servername = ServerInstance->Config->ServerName;
 		if (opermotd.empty())
 		{
-			user->SendText(":%s 455 %s :OPERMOTD file is missing", servername.c_str(), user->nick.c_str());
+			user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
 			return;
 		}
 
-		user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
+		user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
 
 		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
 		{
-			user->SendText(":%s 372 %s :- %s", servername.c_str(), user->nick.c_str(), i->c_str());
+			user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
 		}
 
-		user->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
+		user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
 	}
 };
 
@@ -82,14 +79,6 @@ class ModuleOpermotd : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnRehash, I_OnOper };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
@@ -101,18 +90,22 @@ class ModuleOpermotd : public Module
 			cmd.ShowOperMOTD(user);
 	}
 
-	void OnRehash(User* user) CXX11_OVERRIDE
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		cmd.opermotd.clear();
 		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
 		onoper = conf->getBool("onoper", true);
 
-		FileReader f(conf->getString("file", "opermotd"));
-		for (int i=0, filesize = f.FileSize(); i < filesize; i++)
-			cmd.opermotd.push_back(f.GetLine(i));
-
-		if (conf->getBool("processcolors"))
+		try
+		{
+			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.
+		}
 	}
 };