X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_close.cpp;h=806a88640fcae54af7d566b95baa2295629decb8;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=009d50d463ce63e94e8330c40635ca104ca8c4a8;hpb=3626aeb9ce4798c73cf3a5621388406062c450f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index 009d50d46..806a88640 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -1,27 +1,24 @@
-/*       +------------------------------------+
- *       | 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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Carsten Valdemar Munk <carsten.munk+inspircd@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.
  *
- * Based on the UnrealIRCd 4.0 (1.1.x fork) module
- *
- * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk
- * This program is free but copyrighted software; see
- *            the file COPYING for 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 /CLOSE functionality */
+#include "inspircd.h"
 
 /** Handle /CLOSE
  */
@@ -33,14 +30,13 @@ class CommandClose : public Command
 	{
 	flags_needed = 'o'; }
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *src)
 	{
 		std::map<std::string,int> closed;
 
-		std::vector<User*>::reverse_iterator u = ServerInstance->Users->local_users.rbegin();
-		while (u != ServerInstance->Users->local_users.rend())
+		for (LocalUserList::const_iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); ++u)
 		{
-			User* user = *u++;
+			LocalUser* user = *u;
 			if (user->registered != REG_ALL)
 			{
 				ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request");
@@ -52,13 +48,14 @@ class CommandClose : public Command
 		int total = 0;
 		for (std::map<std::string,int>::iterator ci = closed.begin(); ci != closed.end(); ci++)
 		{
-			user->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",user->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
-			total += (*ci).second;
+			src->WriteNotice("*** Closed " + ConvToStr(ci->second) + " unknown " + (ci->second == 1 ? "connection" : "connections") +
+				" from [" + ci->first + "]");
+			total += ci->second;
 		}
 		if (total)
-			user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick.c_str(),total,(total>1)?"s":"");
+			src->WriteNotice("*** " + ConvToStr(total) + " unknown " + (total == 1 ? "connection" : "connections") + " closed");
 		else
-			user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
+			src->WriteNotice("*** No unknown connections found");
 
 		return CMD_SUCCESS;
 	}
@@ -68,19 +65,19 @@ class ModuleClose : public Module
 {
 	CommandClose cmd;
  public:
-	ModuleClose(InspIRCd* Me)
-		: Module(Me), cmd(this)
+	ModuleClose()
+		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
 	}
 
-	virtual ~ModuleClose()
+	void init() CXX11_OVERRIDE
 	{
+		ServerInstance->Modules->AddService(cmd);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Provides /CLOSE functionality", VF_VENDOR);
 	}
 };