X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=bd1853d43da43a37a78739e1420aa9ddc47d6e97;hb=ffc8101b5fe2fae0de62d94f4a95d5434989dffc;hp=87e8874e304d915709cd86117c23e5882c8d6bcb;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 87e8874e3..bd1853d43 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,56 +1,70 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
  *
- * 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;
-
-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;
-}
+#include "inspircd.h"
 
 /** 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())
+			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());
+			return;
+		}
+
+		user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
+
+		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->SendText(":%s 376 %s :- End of OPERMOTD", servername.c_str(), user->nick.c_str());
 	}
 };
 
@@ -61,51 +75,40 @@ class ModuleOpermotd : public Module
 	bool onoper;
  public:
 
-	void LoadOperMOTD()
+	ModuleOpermotd()
+		: cmd(this)
 	{
-		ConfigReader* conf = new ConfigReader(ServerInstance);
-		std::string filename;
-		filename = conf->ReadValue("opermotd","file",0);
-		if (opermotd)
-		{
-			delete opermotd;
-			opermotd = NULL;
-		}
-		opermotd = new FileReader(ServerInstance, filename);
-		onoper = conf->ReadFlag("opermotd","onoper","yes",0);
-		delete conf;
 	}
 
-	ModuleOpermotd(InspIRCd* Me)
-		: Module(Me), cmd(this)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		opermotd = NULL;
-		ServerInstance->AddCommand(&cmd);
-		opermotd = new FileReader(ServerInstance);
-		LoadOperMOTD();
-		Implementation eventlist[] = { I_OnRehash, I_OnOper };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
 	}
 
-	virtual ~ModuleOpermotd()
+	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
 	{
+		if (onoper && IS_LOCAL(user))
+			cmd.ShowOperMOTD(user);
 	}
 
-	virtual Version GetVersion()
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
-	}
-
+		cmd.opermotd.clear();
+		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+		onoper = conf->getBool("onoper", true);
 
-	virtual void OnOper(User* user, const std::string &opertype)
-	{
-		if (onoper)
-			ShowOperMOTD(user);
-	}
+		try
+		{
+			FileReader reader(conf->getString("file", "opermotd"));
+			cmd.opermotd = reader.GetVector();
+		}
+		catch (CoreException&)
+		{
+			// Nothing happens here as we do the error handling in ShowOperMOTD.
+		}
 
-	virtual void OnRehash(User* user)
-	{
-		LoadOperMOTD();
+		if (conf->getBool("processcolors"))
+			InspIRCd::ProcessColors(cmd.opermotd);
 	}
 };