X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=9caa73d9101f167738fa847da73d1950deb20b7b;hb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;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..9caa73d91 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.
@@ -40,16 +40,16 @@ CmdResult ShowOperMOTD(User* user)
 
 /** Handle /OPERMOTD
  */
-class cmd_opermotd : public Command
+class CommandOpermotd : public Command
 {
  public:
-	cmd_opermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", 'o', 0)
+	CommandOpermotd (InspIRCd* Instance) : Command(Instance,"OPERMOTD", "o", 0)
 	{
 		this->source = "m_opermotd.so";
 		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,7 +58,8 @@ class cmd_opermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-	cmd_opermotd* mycommand;
+	CommandOpermotd cmd;
+	bool onoper;
  public:
 
 	void LoadOperMOTD()
@@ -72,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(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()
@@ -91,20 +94,17 @@ class ModuleOpermotd : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$", 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();
 	}