Access local user list via new UserManager::GetLocalUsers() and make local_users...

[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 7a823e799504062229c65e78c528efcb42503dc5..f3c751f177558f9df8af90a690657206c7745629 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -1,17 +1,24 @@
-/*       +------------------------------------+
- *       | UnrealIRCd v4.0                    |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk 
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Carsten Valdemar Munk <carsten.munk+inspircd@gmail.com>
  *
- * ---------------------------------------------------
+ * 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 /CLOSE functionality */
+#include "inspircd.h"
 
 /** Handle /CLOSE
  */
@@ -19,21 +26,23 @@ class CommandClose : public Command
 {
  public:
        /* Command 'close', needs operator */
-       CommandClose (InspIRCd* Instance) : Command(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, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *src)
        {
                std::map<std::string,int> closed;
 
-               for (std::vector<User*>::iterator u = ServerInstance->local_users.begin(); u != ServerInstance->local_users.end(); u++)
+               const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+               for (UserManager::LocalList::const_iterator u = list.begin(); u != list.end(); ++u)
                {
-                       if ((*u)->registered != REG_ALL)
+                       LocalUser* user = *u;
+                       if (user->registered != REG_ALL)
                        {
-                               User::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,37 +50,31 @@ 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());
-                       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,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);
-                       
-               return CMD_LOCALONLY;
+                       src->WriteNotice("*** No unknown connections found");
+
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleClose : public Module
 {
-       CommandClose* newcommand;
+       CommandClose cmd;
  public:
-       ModuleClose(InspIRCd* Me)
-               : Module(Me)
-       {
-               // Create a new command
-               newcommand = new CommandClose(ServerInstance);
-               ServerInstance->AddCommand(newcommand);
-       }
-
-       virtual ~ModuleClose()
+       ModuleClose()
+               : cmd(this)
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("Provides /CLOSE functionality", VF_VENDOR);
        }
 };