X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermotd.cpp;h=3a05fbd56c2b7ceb27faf19702c153a1aba67173;hb=6c2edc2c5ab07a1fa8c32d3fa9abd6b9149b804c;hp=9cf068959390104277d030f1b9cc546abc33bc7e;hpb=a3d00f20ae31b4d3b9147e5c9999739aef84f762;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index 9cf068959..3a05fbd56 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
@@ -35,7 +44,7 @@ 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
@@ -43,13 +52,12 @@ CmdResult ShowOperMOTD(User* user)
 class CommandOpermotd : public Command
 {
  public:
-	CommandOpermotd (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 std::vector<const std::string>& parameters, User* user)
+	CmdResult Handle (const std::vector<std::string>& parameters, User* user)
 	{
 		return ShowOperMOTD(user);
 	}
@@ -58,30 +66,23 @@ class CommandOpermotd : public Command
 
 class ModuleOpermotd : public Module
 {
-	CommandOpermotd* mycommand;
+	CommandOpermotd cmd;
+	bool onoper;
  public:
 
 	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;
+		ConfigTag* conf = ServerInstance->Config->ConfValue("opermotd");
+		opermotd->LoadFile(conf->getString("file","opermotd"));
+		onoper = conf->getBool("onoper", true);
 	}
-	
-	ModuleOpermotd(InspIRCd* Me)
-		: Module(Me)
+
+	ModuleOpermotd()
+		: cmd(this)
 	{
 		opermotd = NULL;
-		mycommand = new CommandOpermotd(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);
@@ -89,20 +90,22 @@ class ModuleOpermotd : public Module
 
 	virtual ~ModuleOpermotd()
 	{
+		delete opermotd;
+		opermotd = NULL;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+		return Version("Shows a message to opers after oper-up, adds /opermotd", VF_VENDOR);
 	}
 
-
 	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();
 	}