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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 5d50d4192..9caa73d91 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,11 +1,15 @@
-// opermotd module by typobox43
-
-using namespace std;
-
-#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"
 
@@ -13,40 +17,49 @@ using namespace std;
 
 static FileReader* opermotd;
 
-void ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(User* user)
 {
 	if(!opermotd->FileSize())
 	{
 		user->WriteServ(std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
-		return;
+		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_LOCALONLY;
 }
 
-class cmd_opermotd : public command_t
+/** Handle /OPERMOTD
+ */
+class CommandOpermotd : public Command
 {
  public:
-	cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
+	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
 	{
 		this->source = "m_opermotd.so";
 		syntax = "[<servername>]";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec* user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
 	{
-		ShowOperMOTD(user);
+		return ShowOperMOTD(user);
 	}
 };
 
 
 class ModuleOpermotd : public Module
 {
-	cmd_opermotd* mycommand;
+	CommandOpermotd cmd;
+	bool onoper;
  public:
 
 	void LoadOperMOTD()
@@ -60,17 +73,19 @@ class ModuleOpermotd : public Module
 			opermotd = NULL;
 		}
 		opermotd = new FileReader(ServerInstance, filename);
-		DELETE(conf);
+		onoper = conf->ReadFlag("opermotd","onoper","yes",0);
+		delete conf;
 	}
-	
+
 	ModuleOpermotd(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me), cmd(Me)
 	{
 		opermotd = NULL;
-		mycommand = new cmd_opermotd(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
+		ServerInstance->AddCommand(&cmd);
 		opermotd = new FileReader(ServerInstance);
 		LoadOperMOTD();
+		Implementation eventlist[] = { I_OnRehash, I_OnOper };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleOpermotd()
@@ -79,43 +94,20 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,1,VF_VENDOR);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnOper] = 1;
-	}
 
-	virtual void OnOper(userrec* user, const std::string &opertype)
+	virtual void OnOper(User* user, const std::string &opertype)
 	{
-		ShowOperMOTD(user);
+		if (onoper)
+			ShowOperMOTD(user);
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		LoadOperMOTD();
 	}
 };
 
-class ModuleOpermotdFactory : public ModuleFactory
-{
- public:
-	ModuleOpermotdFactory()
-	{
-	}
-
-	~ModuleOpermotdFactory()
-	{
-	}
-
-	virtual Module* CreateModule(InspIRCd* Me)
-	{
-		return new ModuleOpermotd(Me);
-	}
-};
-
-extern "C" void* init_module(void)
-{
-	return new ModuleOpermotdFactory;
-}
+MODULE_INIT(ModuleOpermotd)