X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_opermotd.cpp;h=e0120c4dd04c29df04099fc0ff2154ae73fb15b3;hb=8df3d792bc99d9dd73db7a601ebe8d4a397c3522;hp=7b4584db9c52fdd0a0c05553f49a875809f94017;hpb=9d4004e8d477232c143830508a7a6e41fd2d31b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 7b4584db9..e0120c4dd 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,56 +1,84 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
-static FileReader* opermotd;
+#include "inspircd.h"
 
-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
+	{
+		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
 	{
-		return ShowOperMOTD(user);
+		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");
 	}
 };
 
@@ -61,44 +89,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.
+		}
 	}
 };