X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=3a05fbd56c2b7ceb27faf19702c153a1aba67173;hb=0b3a4371c504c45c8a4504d114efb2ca674374e0;hp=b37a3b69e16181802a7055b8a40c6b8e977f4981;hpb=9fc9227cf51585dd2e44c2fcd0014c8da8f8739f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index b37a3b69e..3a05fbd56 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,118 +1,114 @@
-// opermotd module by typobox43
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/*
+ * 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"
 
 /* $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"));
+	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
+	/* don't route me */
+	return CMD_SUCCESS;
 }
 
-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;
-
-		}
-
-		virtual Version GetVersion() {
-
-			return Version(1,0,0,1,0);
-
-		}
-
-		virtual void OnOper(userrec* user) {
-
-			ShowOperMOTD(user);
-
-		}
-
-		virtual void OnRehash() {
-
-			LoadOperMOTD();
-
-		}
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
+{
+ public:
+	CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
+	{
+		flags_needed = 'o'; syntax = "[<servername>]";
+	}
 
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
+	{
+		return ShowOperMOTD(user);
+	}
 };
 
-class ModuleOpermotdFactory : public ModuleFactory {
 
-	public:
+class ModuleOpermotd : public Module
+{
+	CommandOpermotd cmd;
+	bool onoper;
+ public:
 
-		ModuleOpermotdFactory() {
-
-		}
-
-		~ModuleOpermotdFactory() {
+	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 Module* CreateModule() {
+	virtual ~ModuleOpermotd()
+	{
+		delete opermotd;
+		opermotd = NULL;
+	}
 
-			return new ModuleOpermotd;
+	virtual Version GetVersion()
+	{
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
+	}
 
-		}
+	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)