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

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 7fd19122b..e38d0b827 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -10,8 +10,8 @@ using namespace std;
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
 
-FileReader* opermotd;
-Server* Srv;
+static FileReader* opermotd;
+static Server* Srv;
 
 void LoadOperMOTD()
 {
@@ -21,25 +21,25 @@ void LoadOperMOTD()
 	filename = conf->ReadValue("opermotd","file",0);
 
 	opermotd->LoadFile(filename);
-	delete conf;
+	DELETE(conf);
 }
 
 void ShowOperMOTD(userrec* user)
 {
 	if(!opermotd->FileSize())
 	{
-		Srv->SendServ(user->fd,std::string("425 ") + user->nick + std::string(" :OPERMOTD file is missing"));
+		user->WriteServ(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"));
+	user->WriteServ(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("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"));
 
 }
 
@@ -49,9 +49,10 @@ class cmd_opermotd : public command_t
 	cmd_opermotd () : command_t("OPERMOTD", 'o', 0)
 	{
 		this->source = "m_opermotd.so";
+		syntax = "[<servername>]";
 	}
 
-	void Handle (char** parameters, int pcnt, userrec* user)
+	void Handle (const char** parameters, int pcnt, userrec* user)
 	{
 		ShowOperMOTD(user);
 	}
@@ -80,12 +81,17 @@ class ModuleOpermotd : public Module
 			return Version(1,0,0,1,VF_VENDOR);
 		}
 
-		virtual void OnOper(userrec* user, std::string opertype)
+		void Implements(char* List)
+		{
+			List[I_OnRehash] = List[I_OnOper] = 1;
+		}
+
+		virtual void OnOper(userrec* user, const std::string &opertype)
 		{
 			ShowOperMOTD(user);
 		}
 
-		virtual void OnRehash(std::string parameter)
+		virtual void OnRehash(const std::string &parameter)
 		{
 			LoadOperMOTD();
 		}