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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 2c4a44925..bd1853d43 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,109 +1,115 @@
-// opermotd module by typobox43
-
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-
-/* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
-
-FileReader* opermotd;
-Server* Srv;
-
-void do_opermotd(char** parameters, int pcnt, userrec* user);
-
-void LoadOperMOTD()
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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 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"
+
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
 {
+ public:
+	file_cache opermotd;
 
-	ConfigReader* conf = new ConfigReader;
-	std::string filename;
-
-	filename = conf->ReadValue("opermotd","file",0);
-
-	opermotd->LoadFile(filename);
-	
-}
-
-void ShowOperMOTD(userrec* user)
-{
-	if(!opermotd->FileSize())
+	CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0, 1)
 	{
-		Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-		return;
+		flags_needed = 'o'; syntax = "[<servername>]";
 	}
 
-	Srv->SendServ(user->fd,std::string("375 ") + user->nick + std::string(" :- IRC Operators Message of the Day"));
-
-	for(int i=0; i != opermotd->FileSize(); i++)
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
 	{
-		Srv->SendServ(user->fd,std::string("372 ") + user->nick + std::string(" :- ") + opermotd->GetLine(i));
+		if ((parameters.empty()) || (parameters[0] == ServerInstance->Config->ServerName))
+			ShowOperMOTD(user);
+		return CMD_SUCCESS;
 	}
 
-	Srv->SendServ(user->fd,std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
-
-}
-
-void do_opermotd(char** parameters, int pcnt, userrec* user)
-{
-	ShowOperMOTD(user);
-}
-
-class ModuleOpermotd : public Module
-{
-	public:
-		ModuleOpermotd()
-		{
-			Srv = new Server;
-			
-			Srv->AddCommand("OPERMOTD",do_opermotd,'o',0,"m_opermotd.so");
-			opermotd = new FileReader();
-			LoadOperMOTD();
-		}
-
-		virtual ~ModuleOpermotd()
-		{
-			delete Srv;
-		}
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	{
+		if (!parameters.empty())
+			return ROUTE_OPT_UCAST(parameters[0]);
+		return ROUTE_LOCALONLY;
+	}
 
-		virtual Version GetVersion()
+	void ShowOperMOTD(User* user)
+	{
+		const std::string& servername = ServerInstance->Config->ServerName;
+		if (opermotd.empty())
 		{
-			return Version(1,0,0,1,VF_VENDOR);
+			user->SendText(":%s 455 %s :OPERMOTD file is missing", servername.c_str(), user->nick.c_str());
+			return;
 		}
 
-		virtual void OnOper(userrec* user, std::string opertype)
-		{
-			ShowOperMOTD(user);
-		}
+		user->SendText(":%s 375 %s :- IRC Operators Message of the Day", servername.c_str(), user->nick.c_str());
 
-		virtual void OnRehash(std::string parameter)
+		for (file_cache::const_iterator i = opermotd.begin(); i != opermotd.end(); ++i)
 		{
-			LoadOperMOTD();
+			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());
+	}
 };
 
-class ModuleOpermotdFactory : public ModuleFactory
+
+class ModuleOpermotd : public Module
 {
-	public:
-		ModuleOpermotdFactory()
-		{
-		}
+	CommandOpermotd cmd;
+	bool onoper;
+ public:
+
+	ModuleOpermotd()
+		: cmd(this)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR | VF_OPTCOMMON);
+	}
+
+	void OnOper(User* user, const std::string &opertype) CXX11_OVERRIDE
+	{
+		if (onoper && IS_LOCAL(user))
+			cmd.ShowOperMOTD(user);
+	}
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		cmd.opermotd.clear();
+		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+		onoper = conf->getBool("onoper", true);
 
-		~ModuleOpermotdFactory()
+		try
 		{
+			FileReader reader(conf->getString("file", "opermotd"));
+			cmd.opermotd = reader.GetVector();
 		}
-
-		virtual Module* CreateModule()
+		catch (CoreException&)
 		{
-			return new ModuleOpermotd;
+			// Nothing happens here as we do the error handling in ShowOperMOTD.
 		}
 
+		if (conf->getBool("processcolors"))
+			InspIRCd::ProcessColors(cmd.opermotd);
+	}
 };
 
-extern "C" void* init_module(void)
-{
-	return new ModuleOpermotdFactory;
-}
+MODULE_INIT(ModuleOpermotd)