X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=a80aa513c0822ac3609f532b0b303ba0245ba7f7;hb=7c197db72eab03321e4f3e847054e13126520504;hp=e38d0b82761f9120607d7e9daae8a5ea1dc03df6;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index e38d0b827..a80aa513c 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,119 +1,131 @@
-// opermotd module by typobox43
-
-using namespace std;
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
 static FileReader* opermotd;
-static Server* Srv;
-
-void LoadOperMOTD()
-{
-	ConfigReader* conf = new ConfigReader;
-	std::string filename;
-
-	filename = conf->ReadValue("opermotd","file",0);
-
-	opermotd->LoadFile(filename);
-	DELETE(conf);
-}
 
-void ShowOperMOTD(userrec* user)
+CmdResult ShowOperMOTD(userrec* 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"));
 
+	return CMD_SUCCESS;
 }
 
+/** Handle /OPERMOTD
+ */
 class cmd_opermotd : public command_t
 {
  public:
-	cmd_opermotd () : command_t("OPERMOTD", 'o', 0)
+	cmd_opermotd (InspIRCd* Instance) : command_t(Instance,"OPERMOTD", 'o', 0)
 	{
 		this->source = "m_opermotd.so";
 		syntax = "[<servername>]";
 	}
 
-	void Handle (const char** parameters, int pcnt, userrec* user)
+	CmdResult Handle (const char** parameters, int pcnt, userrec* user)
 	{
-		ShowOperMOTD(user);
+		return ShowOperMOTD(user);
 	}
 };
 
+
 class ModuleOpermotd : public Module
 {
-		cmd_opermotd* mycommand;
-	public:
-		ModuleOpermotd(Server* Me)
-			: Module::Module(Me)
-		{
-			Srv = Me;
-			mycommand = new cmd_opermotd();
-			Srv->AddCommand(mycommand);
-			opermotd = new FileReader();
-			LoadOperMOTD();
-		}
+	cmd_opermotd* mycommand;
+ public:
 
-		virtual ~ModuleOpermotd()
+	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);
+		DELETE(conf);
+	}
+	
+	ModuleOpermotd(InspIRCd* Me)
+		: Module::Module(Me)
+	{
+		opermotd = NULL;
+		mycommand = new cmd_opermotd(ServerInstance);
+		ServerInstance->AddCommand(mycommand);
+		opermotd = new FileReader(ServerInstance);
+		LoadOperMOTD();
+	}
 
-		virtual Version GetVersion()
-		{
-			return Version(1,0,0,1,VF_VENDOR);
-		}
+	virtual ~ModuleOpermotd()
+	{
+	}
 
-		void Implements(char* List)
-		{
-			List[I_OnRehash] = List[I_OnOper] = 1;
-		}
+	virtual Version GetVersion()
+	{
+		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+	}
 
-		virtual void OnOper(userrec* user, const std::string &opertype)
-		{
-			ShowOperMOTD(user);
-		}
+	void Implements(char* List)
+	{
+		List[I_OnRehash] = List[I_OnOper] = 1;
+	}
 
-		virtual void OnRehash(const std::string &parameter)
-		{
-			LoadOperMOTD();
-		}
+	virtual void OnOper(userrec* user, const std::string &opertype)
+	{
+		ShowOperMOTD(user);
+	}
 
+	virtual void OnRehash(userrec* user, const std::string &parameter)
+	{
+		LoadOperMOTD();
+	}
 };
 
 class ModuleOpermotdFactory : public ModuleFactory
 {
-	public:
-		ModuleOpermotdFactory()
-		{
-		}
-
-		~ModuleOpermotdFactory()
-		{
-		}
+ public:
+	ModuleOpermotdFactory()
+	{
+	}
 
-		virtual Module* CreateModule(Server* Me)
-		{
-			return new ModuleOpermotd(Me);
-		}
+	~ModuleOpermotdFactory()
+	{
+	}
 
+	virtual Module* CreateModule(InspIRCd* Me)
+	{
+		return new ModuleOpermotd(Me);
+	}
 };
 
 extern "C" void* init_module(void)