X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=9caa73d9101f167738fa847da73d1950deb20b7b;hb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;hp=06b994c915927a8d97b86d975460a6d01b0dcd6f;hpb=211b24ba8cf6e21f435f145b0366adc8a3b62460;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 06b994c91..9caa73d91 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,118 +1,113 @@
-// opermotd module by typobox43
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.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() {
-
-	ConfigReader* conf = new ConfigReader;
-	std::string filename;
-
-	filename = conf->ReadValue("opermotd","file",0);
-
-	opermotd->LoadFile(filename);
-	
-}
-
-void ShowOperMOTD(userrec* user) {
-
-	if(!opermotd->FileSize()) {
-
-		Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-		return;
+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;
 	}
 
-	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++) {
-
-		Srv->SendServ(user->fd,std::string("372 ") + user->nick + std::string(" :- ") + opermotd->GetLine(i));
+	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));
 	}
 
-	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);
+	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
+	/* don't route me */
+	return CMD_LOCALONLY;
 }
 
-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;
-
-		}
-
-		virtual Version GetVersion() {
-
-			return Version(1,0,0,1);
-
-		}
-
-		virtual void OnOper(userrec* user) {
-
-			ShowOperMOTD(user);
-
-		}
-
-		virtual void OnRehash() {
-
-			LoadOperMOTD();
-
-		}
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
+{
+ public:
+	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
+	{
+		this->source = "m_opermotd.so";
+		syntax = "[<servername>]";
+	}
 
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+	{
+		return ShowOperMOTD(user);
+	}
 };
 
-class ModuleOpermotdFactory : public ModuleFactory {
-
-	public:
-
-		ModuleOpermotdFactory() {
 
+class ModuleOpermotd : public Module
+{
+	CommandOpermotd cmd;
+	bool onoper;
+ public:
+
+	void LoadOperMOTD()
+	{
+		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;
+	}
 
-		~ModuleOpermotdFactory() {
+	ModuleOpermotd(InspIRCd* Me)
+		: Module(Me), cmd(Me)
+	{
+		opermotd = NULL;
+		ServerInstance->AddCommand(&cmd);
+		opermotd = new FileReader(ServerInstance);
+		LoadOperMOTD();
+		Implementation eventlist[] = { I_OnRehash, I_OnOper };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
+	}
 
-		}
+	virtual ~ModuleOpermotd()
+	{
+	}
 
-		virtual Module* CreateModule() {
+	virtual Version GetVersion()
+	{
+		return Version("$Id$", VF_VENDOR, API_VERSION);
+	}
 
-			return new ModuleOpermotd;
 
-		}
+	virtual void OnOper(User* user, const std::string &opertype)
+	{
+		if (onoper)
+			ShowOperMOTD(user);
+	}
 
+	virtual void OnRehash(User* user)
+	{
+		LoadOperMOTD();
+	}
 };
 
-extern "C" void* init_module(void) {
-
-	return new ModuleOpermotdFactory;
-
-}
+MODULE_INIT(ModuleOpermotd)