X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=411cd42c86cd23ceb9a65eb809f7f98e3bebaa7e;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=ef3ae98c45952acb36d0a9fab6d99d5228adcda0;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index ef3ae98c4..411cd42c8 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -35,21 +35,20 @@ CmdResult ShowOperMOTD(User* user)
 	user->WriteServ(std::string("376 ") + user->nick + std::string(" :- End of OPERMOTD"));
 
 	/* don't route me */
-	return CMD_LOCALONLY;
+	return CMD_SUCCESS;
 }
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public Command
+class CommandOpermotd : public Command
 {
  public:
-	cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
+	CommandOpermotd(Module* Creator) : Command(Creator,"OPERMOTD", 0)
 	{
-		this->source = "m_opermotd.so";
-		syntax = "[<servername>]";
+		flags_needed = 'o'; syntax = "[<servername>]";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, User* user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
 	{
 		return ShowOperMOTD(user);
 	}
@@ -58,12 +57,13 @@ class cmd_opermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-	cmd_opermotd* mycommand;
+	CommandOpermotd cmd;
+	bool onoper;
  public:
 
 	void LoadOperMOTD()
 	{
-		ConfigReader* conf = new ConfigReader(ServerInstance);
+		ConfigReader* conf = new ConfigReader;
 		std::string filename;
 		filename = conf->ReadValue("opermotd","file",0);
 		if (opermotd)
@@ -71,18 +71,20 @@ class ModuleOpermotd : public Module
 			delete opermotd;
 			opermotd = NULL;
 		}
-		opermotd = new FileReader(ServerInstance, filename);
-		DELETE(conf);
+		opermotd = new FileReader(filename);
+		onoper = conf->ReadFlag("opermotd","onoper","yes",0);
+		delete conf;
 	}
-	
-	ModuleOpermotd(InspIRCd* Me)
-		: Module(Me)
+
+	ModuleOpermotd()
+		: cmd(this)
 	{
 		opermotd = NULL;
-		mycommand = new cmd_opermotd(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
-		opermotd = new FileReader(ServerInstance);
+		ServerInstance->AddCommand(&cmd);
+		opermotd = new FileReader;
 		LoadOperMOTD();
+		Implementation eventlist[] = { I_OnRehash, I_OnOper };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
 	virtual ~ModuleOpermotd()
@@ -91,20 +93,17 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR, API_VERSION);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnOper] = 1;
-	}
 
 	virtual void OnOper(User* user, const std::string &opertype)
 	{
-		ShowOperMOTD(user);
+		if (onoper)
+			ShowOperMOTD(user);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		LoadOperMOTD();
 	}