Replace std::deque with std::vector in spanningtree and related modules

[user/henk/code/inspircd.git] / src / modules / m_close.cpp

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index fb4b0368286d5a109720f331369a4dbd61b463ce..1520c9df4f063045180599e69e9dc2f5cfab45e6 100644 (file)
--- 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) 2008 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.
  *
@@ -33,7 +43,7 @@ class CommandClose : public Command
                        if ((*u)->registered != REG_ALL)
                        {
                                ServerInstance->Users->QuitUser(*u, "Closing all unknown connections per request");
-                               std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetPort());
+                               std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetServerPort());
                                closed[key]++;
                        }
                }
@@ -41,29 +51,26 @@ 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,(*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);
-                       
+                       user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
+
                return CMD_LOCALONLY;
        }
 };
 
 class ModuleClose : public Module
 {
-       CommandClose* newcommand;
+       CommandClose cmd;
  public:
        ModuleClose(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me)
        {
-               // Create a new command
-               newcommand = new CommandClose(ServerInstance);
-               ServerInstance->AddCommand(newcommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleClose()
@@ -72,7 +79,7 @@ class ModuleClose : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
 };