X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_close.cpp;h=1cddc5012805d94fb88508cc68152db80dce422e;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=e395b427fcd251f38cd44a99549edb0e6b2e881a;hpb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index e395b427f..1cddc5012 100644
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -1,8 +1,18 @@
 /*       +------------------------------------+
- *       | UnrealIRCd v4.0                    |
+ *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk 
+ *  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.
+ *
+ * ---------------------------------------------------
+ *
+ * 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.
  *
@@ -15,25 +25,26 @@
 
 /** Handle /CLOSE
  */
-class cmd_close : public command_t
+class CommandClose : public Command
 {
  public:
 	/* Command 'close', needs operator */
-	cmd_close (InspIRCd* Instance) : command_t(Instance,"CLOSE", 'o', 0)
+	CommandClose(Module* Creator) : Command(Creator,"CLOSE", 0)
 	{
-		this->source = "m_close.so";
-	}
+	flags_needed = 'o'; }
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		std::map<std::string,int> closed;
 
-		for (std::vector<userrec*>::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++)
+		std::vector<User*>::reverse_iterator u = ServerInstance->Users->local_users.rbegin();
+		while (u != ServerInstance->Users->local_users.rend())
 		{
-			if ((*u)->registered != REG_ALL)
+			User* user = *u++;
+			if (user->registered != REG_ALL)
 			{
-				userrec::QuitUser(ServerInstance, *u, "Closing all unknown connections per request");
-				std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetPort());
+				ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request");
+				std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->GetServerPort());
 				closed[key]++;
 			}
 		}
@@ -41,28 +52,26 @@ class cmd_close : public command_t
 		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,(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
+			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;
 		}
 		if (total)
-			user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick,total,(total>1)?"s":"");
+			user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick.c_str(),total,(total>1)?"s":"");
 		else
-			user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick);
-			
-		return CMD_LOCALONLY;
+			user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
+
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleClose : public Module
 {
-	cmd_close* newcommand;
+	CommandClose cmd;
  public:
-	ModuleClose(InspIRCd* Me)
-		: Module(Me)
+	ModuleClose()
+		: cmd(this)
 	{
-		// Create a new command
-		newcommand = new cmd_close(ServerInstance);
-		ServerInstance->AddCommand(newcommand);
+		ServerInstance->AddCommand(&cmd);
 	}
 
 	virtual ~ModuleClose()
@@ -71,7 +80,7 @@ class ModuleClose : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Provides /CLOSE functionality", VF_VENDOR, API_VERSION);
 	}
 };