X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=7fd19122b64d4f5a1b89ac9468e2b23b49dac8da;hb=43fe72edad4c5dfd1a3a700bea17c8ee7a7c3d8e;hp=3d79ab13e8770da027fd6ba2ec777ea2ff9f2b14;hpb=de6a9294e350a7339e280ab3e8a5f4c8d1343660;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 3d79ab13e..7fd19122b 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -13,109 +13,104 @@ using namespace std;
 FileReader* opermotd;
 Server* Srv;
 
-void do_opermotd(char** parameters, int pcnt, userrec* user);
-
-void LoadOperMOTD() {
-
+void LoadOperMOTD()
+{
 	ConfigReader* conf = new ConfigReader;
 	std::string filename;
 
 	filename = conf->ReadValue("opermotd","file",0);
 
 	opermotd->LoadFile(filename);
-	
+	delete conf;
 }
 
-void ShowOperMOTD(userrec* user) {
-
-	if(!opermotd->FileSize()) {
-
+void ShowOperMOTD(userrec* user)
+{
+	if(!opermotd->FileSize())
+	{
 		Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
 		return;
-
 	}
 
 	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++) {
-
+	for(int i=0; i != opermotd->FileSize(); i++)
+	{
 		Srv->SendServ(user->fd,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);
-
-}
+class cmd_opermotd : public command_t
+{
+ public:
+	cmd_opermotd () : command_t("OPERMOTD", 'o', 0)
+	{
+		this->source = "m_opermotd.so";
+	}
 
-class ModuleOpermotd : public Module {
+	void Handle (char** parameters, int pcnt, userrec* user)
+	{
+		ShowOperMOTD(user);
+	}
+};
 
+class ModuleOpermotd : public Module
+{
+		cmd_opermotd* mycommand;
 	public:
-
-		ModuleOpermotd() {
-
-			Srv = new Server;
-			
-			Srv->AddCommand("OPERMOTD",do_opermotd,'o',0,"m_opermotd.so");
-
+		ModuleOpermotd(Server* Me)
+			: Module::Module(Me)
+		{
+			Srv = Me;
+			mycommand = new cmd_opermotd();
+			Srv->AddCommand(mycommand);
 			opermotd = new FileReader();
 			LoadOperMOTD();
-
 		}
 
-		virtual ~ModuleOpermotd() {
-
-			delete Srv;
-
+		virtual ~ModuleOpermotd()
+		{
 		}
 
-		virtual Version GetVersion() {
-
+		virtual Version GetVersion()
+		{
 			return Version(1,0,0,1,VF_VENDOR);
-
 		}
 
-		virtual void OnOper(userrec* user, std::string opertype) {
-
+		virtual void OnOper(userrec* user, std::string opertype)
+		{
 			ShowOperMOTD(user);
-
 		}
 
-		virtual void OnRehash() {
-
+		virtual void OnRehash(std::string parameter)
+		{
 			LoadOperMOTD();
-
 		}
 
 };
 
-class ModuleOpermotdFactory : public ModuleFactory {
-
+class ModuleOpermotdFactory : public ModuleFactory
+{
 	public:
-
-		ModuleOpermotdFactory() {
-
+		ModuleOpermotdFactory()
+		{
 		}
 
-		~ModuleOpermotdFactory() {
-
+		~ModuleOpermotdFactory()
+		{
 		}
 
-		virtual Module* CreateModule() {
-
-			return new ModuleOpermotd;
-
+		virtual Module* CreateModule(Server* Me)
+		{
+			return new ModuleOpermotd(Me);
 		}
 
 };
 
-extern "C" void* init_module(void) {
-
+extern "C" void* init_module(void)
+{
 	return new ModuleOpermotdFactory;
-
 }