X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_swhois.cpp;h=742781747f4e091de5e9848da2ac8b80095ee52c;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=bd2447c2afaf8c8a317e80fc9a41923a46a5f06f;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index bd2447c2a..742781747 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -1,19 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@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: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
+/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */
 
 /** Handle /SWHOIS
  */
@@ -21,9 +33,9 @@ class CommandSwhois : public Command
 {
  public:
 	StringExtItem swhois;
-	CommandSwhois (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"SWHOIS","o",2,2), swhois("swhois", Creator)
+	CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
 	{
-		syntax = "<nick> :<swhois>";
+		flags_needed = 'o'; syntax = "<nick> :<swhois>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
 	}
 
@@ -31,7 +43,7 @@ class CommandSwhois : public Command
 	{
 		User* dest = ServerInstance->FindNick(parameters[0]);
 
-		if (!dest)
+		if ((!dest) || (IS_SERVER(dest))) // allow setting swhois using SWHOIS before reg
 		{
 			user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str());
 			return CMD_FAILURE;
@@ -74,11 +86,16 @@ class ModuleSWhois : public Module
 	CommandSwhois cmd;
 
  public:
-	ModuleSWhois(InspIRCd* Me) : Module(Me), cmd(Me, this)
+	ModuleSWhois() : cmd(this)
+	{
+	}
+
+	void init()
 	{
-		ServerInstance->AddCommand(&cmd);
-		Implementation eventlist[] = { I_OnWhoisLine, I_OnPostCommand };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modules->AddService(cmd.swhois);
+		Implementation eventlist[] = { I_OnWhoisLine, I_OnPostOper };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	// :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
@@ -99,38 +116,12 @@ class ModuleSWhois : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnPostCommand(const std::string &command, const std::vector<std::string> &params, User *user, CmdResult result, const std::string &original_line)
+	void OnPostOper(User* user, const std::string &opertype, const std::string &opername)
 	{
-		if ((command != "OPER") || (result != CMD_SUCCESS))
+		if (!IS_LOCAL(user))
 			return;
-		ConfigReader Conf(ServerInstance);
-
-		std::string swhois;
-
-		for (int i = 0; i < Conf.Enumerate("oper"); i++)
-		{
-			std::string name = Conf.ReadValue("oper", "name", i);
-
-			if (name == params[0])
-			{
-				swhois = Conf.ReadValue("oper", "swhois", i);
-				break;
-			}
-		}
 
-		if (!swhois.length())
-		{
-			for (int i = 0; i < Conf.Enumerate("type"); i++)
-			{
-				std::string type = Conf.ReadValue("type", "name", i);
-
-				if (type == user->oper)
-				{
-					swhois = Conf.ReadValue("type", "swhois", i);
-					break;
-				}
-			}
-		}
+		std::string swhois = user->oper->getConfig("swhois");
 
 		if (!swhois.length())
 			return;
@@ -145,7 +136,7 @@ class ModuleSWhois : public Module
 
 	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides the SWHOIS command which allows setting of arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
 	}
 };