X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_whowas.cpp;h=17a779ec33df209e513a788ff3ba707b62bb11c9;hb=19523c7500bfa5624c2c9c80075f5ddb166c833e;hp=3df97086e28ccf97c22531cf6099f9d51c2fd16a;hpb=17fd32bf7492aa40ce531b64c81754f039907ca7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index 3df97086e..17a779ec3 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -1,26 +1,36 @@
-/*       +------------------------------------+
- *       | 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 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * 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"
 #include "commands/cmd_whowas.h"
 
 WhoWasMaintainTimer * timer;
 
-CommandWhowas::CommandWhowas(InspIRCd* Instance, Module* parent) : Command(Instance,parent, "WHOWAS", 0, 1, false, 2)
+CommandWhowas::CommandWhowas( Module* parent) : Command(parent, "WHOWAS", 1)
 {
 	syntax = "<nick>{,<nick>}";
-	timer = new WhoWasMaintainTimer(Instance, 3600);
-	Instance->Timers->AddTimer(timer);
+	Penalty = 2;
+	timer = new WhoWasMaintainTimer(3600);
+	ServerInstance->Timers->AddTimer(timer);
 }
 
 CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, User* user)
@@ -28,7 +38,7 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 	/* if whowas disabled in config */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
 	{
-		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
+		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),name.c_str());
 		return CMD_FAILURE;
 	}
 
@@ -64,10 +74,10 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 					user->WriteNumeric(379, "%s %s :was connecting from *@%s",
 						user->nick.c_str(), parameters[0].c_str(), u->host.c_str());
 
-				if (*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex"))
-					user->WriteNumeric(312, "%s %s %s :%s",user->nick.c_str(),parameters[0].c_str(), ServerInstance->Config->HideWhoisServer, b);
+				if (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"))
+					user->WriteNumeric(312, "%s %s %s :%s",user->nick.c_str(),parameters[0].c_str(), ServerInstance->Config->HideWhoisServer.c_str(), b);
 				else
-					user->WriteNumeric(312, "%s %s %s :%s",user->nick.c_str(),parameters[0].c_str(), u->server, b);
+					user->WriteNumeric(312, "%s %s %s :%s",user->nick.c_str(),parameters[0].c_str(), u->server.c_str(), b);
 			}
 		}
 		else
@@ -96,8 +106,7 @@ std::string CommandWhowas::GetStats()
 			whowas_bytes += (sizeof(whowas_set) + ( sizeof(WhoWasGroup) * n->size() ) );
 		}
 	}
-	stats.assign("Whowas(MAPSETS) " +ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)");
-	return stats;
+	return "Whowas entries: " +ConvToStr(whowas_size)+" ("+ConvToStr(whowas_bytes)+" bytes)";
 }
 
 void CommandWhowas::AddToWhoWas(User* user)
@@ -308,21 +317,25 @@ class ModuleWhoWas : public Module
 {
 	CommandWhowas cmd;
  public:
-	ModuleWhoWas(InspIRCd *Me) : Module(Me), cmd(Me, this)
+	ModuleWhoWas() : cmd(this)
+	{
+	}
+
+	void init()
 	{
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 	}
 
-	const char* OnRequest(Request* request)
+	void OnRequest(Request& request)
 	{
-		WhowasRequest* req = static_cast<WhowasRequest*>(request);
-		switch (req->type)
+		WhowasRequest& req = static_cast<WhowasRequest&>(request);
+		switch (req.type)
 		{
 			case WhowasRequest::WHOWAS_ADD:
-				cmd.AddToWhoWas(req->user);
+				cmd.AddToWhoWas(req.user);
 				break;
 			case WhowasRequest::WHOWAS_STATS:
-				req->value = cmd.GetStats();
+				req.value = cmd.GetStats();
 				break;
 			case WhowasRequest::WHOWAS_PRUNE:
 				cmd.PruneWhoWas(ServerInstance->Time());
@@ -331,7 +344,6 @@ class ModuleWhoWas : public Module
 				cmd.MaintainWhoWas(ServerInstance->Time());
 				break;
 		}
-		return NULL;
 	}
 
 	Version GetVersion()