X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=afce073a85bd04fa645dc1835732e43aaf420ac7;hb=5a2af6ded883d71c6c4c9f1497cca1721f8b0742;hp=3a05fbd56c2b7ceb27faf19702c153a1aba67173;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 3a05fbd56..afce073a8 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -22,44 +22,60 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
-static FileReader* opermotd;
-
-CmdResult ShowOperMOTD(User* user)
+enum
 {
-	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));
-	}
+	// From UnrealIRCd.
+	ERR_NOOPERMOTD = 425,
 
-	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
-
-	/* don't route me */
-	return CMD_SUCCESS;
-}
+	// From ircd-ratbox.
+	RPL_OMOTDSTART = 720,
+	RPL_OMOTD = 721,
+	RPL_ENDOFOMOTD = 722
+};
 
 /** 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)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		return ShowOperMOTD(user);
+		if ((parameters.empty()) || (irc::equals(parameters[0], ServerInstance->Config->ServerName)))
+			ShowOperMOTD(user, true);
+		return CMD_SUCCESS;
+	}
+
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
+	{
+		if ((!parameters.empty()) && (parameters[0].find('.') != std::string::npos))
+			return ROUTE_OPT_UCAST(parameters[0]);
+		return ROUTE_LOCALONLY;
+	}
+
+	void ShowOperMOTD(User* user, bool show_missing)
+	{
+		if (opermotd.empty())
+		{
+			if (show_missing)
+				user->WriteRemoteNumeric(ERR_NOOPERMOTD, "OPERMOTD file is missing.");
+			return;
+		}
+
+		user->WriteRemoteNumeric(RPL_OMOTDSTART, "Server operators message of the day");
+
+		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
+		{
+			user->WriteRemoteNumeric(RPL_OMOTD, InspIRCd::Format("- %s", i->c_str()));
+		}
+
+		user->WriteRemoteNumeric(RPL_ENDOFOMOTD, "End of OPERMOTD");
 	}
 };
 
@@ -70,44 +86,38 @@ 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 and adds the OPERMOTD command", 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, false);
 	}
 
-	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();
+			InspIRCd::ProcessColors(cmd.opermotd);
+		}
+		catch (CoreException&)
+		{
+			// Nothing happens here as we do the error handling in ShowOperMOTD.
+		}
 	}
 };