X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=2431853c25e922928bcf283ead0aa93e5eba672b;hb=c46f8a368c42f64284244f3d2dfc022a383294fa;hp=3a05fbd56c2b7ceb27faf19702c153a1aba67173;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 3a05fbd56..2431853c2 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -22,44 +22,48 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
-static FileReader* opermotd;
-
-CmdResult ShowOperMOTD(User* user)
-{
-	if(!opermotd->FileSize())
-	{
-		user->WriteServ(std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-		return CMD_FAILURE;
-	}
-
-	user->WriteServ(std::string("375 ") + user->nick + std::string(" :- IRC Operators Message of the Day"));
-
-	for(int i=0; i != opermotd->FileSize(); i++)
-	{
-		user->WriteServ(std::string("372 ") + user->nick + std::string(" :- ") + opermotd->GetLine(i));
-	}
-
-	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
-
-	/* don't route me */
-	return CMD_SUCCESS;
-}
-
 /** Handle /OPERMOTD
  */
 class CommandOpermotd : public Command
 {
  public:
-	CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
+	file_cache opermotd;
+
+	CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1)
 	{
 		flags_needed = 'o'; syntax = "[<servername>]";
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
 	{
-		return ShowOperMOTD(user);
+		if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
+			ShowOperMOTD(user);
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
+			return ROUTE_OPT_UCAST(parameters[0]);
+		return ROUTE_LOCALONLY;
+	}
+
+	void ShowOperMOTD(User* user)
+	{
+		if (opermotd.empty())
+		{
+			user->WriteRemoteNumeric(455, "OPERMOTD file is missing");
+			return;
+		}
+
+		user->WriteRemoteNumeric(RPL_MOTDSTART, "- IRC Operators Message of the Day");
+
+		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
+		{
+			user->WriteRemoteNumeric(RPL_MOTD, InspIRCd::Format("- %s", i->c_str()));
+		}
+
+		user->WriteRemoteNumeric(RPL_ENDOFMOTD, "- End of OPERMOTD");
 	}
 };
 
@@ -70,44 +74,40 @@ class ModuleOpermotd : public Module
 	bool onoper;
  public:
 
-	void LoadOperMOTD()
-	{
-		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
-		opermotd->LoadFile(conf->getString("file","opermotd"));
-		onoper = conf->getBool("onoper", true);
-	}
-
 	ModuleOpermotd()
 		: cmd(this)
 	{
-		opermotd = NULL;
-		ServerInstance->AddCommand(&cmd);
-		opermotd = new FileReader;
-		LoadOperMOTD();
-		Implementation eventlist[] = { I_OnRehash, I_OnOper };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleOpermotd()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		delete opermotd;
-		opermotd = NULL;
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
 	}
 
-	virtual Version GetVersion()
+	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
 	{
-		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
+		if (onoper && IS_LOCAL(user))
+			cmd.ShowOperMOTD(user);
 	}
 
-	virtual void OnOper(User* user, const std::string &opertype)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		if (onoper)
-			ShowOperMOTD(user);
-	}
+		cmd.opermotd.clear();
+		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+		onoper = conf->getBool("onoper", true);
 
-	virtual void OnRehash(User* user)
-	{
-		LoadOperMOTD();
+		try
+		{
+			FileReader reader(conf->getString("file", "opermotd"));
+			cmd.opermotd = reader.GetVector();
+		}
+		catch (CoreException&)
+		{
+			// Nothing happens here as we do the error handling in ShowOperMOTD.
+		}
+
+		if (conf->getBool("processcolors"))
+			InspIRCd::ProcessColors(cmd.opermotd);
 	}
 };