Fix access checks on chanprotect preventing use of SAMODE

[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 a99036049982f0b513d292bfb6c28bf6cd2b1441..e81c29d20fe459505aab313e07197e48f4774969 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -12,7 +12,7 @@
  *
  * Based on the UnrealIRCd 4.0 (1.1.x fork) module
  *
- * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk 
+ * UnrealIRCd 4.0 (C) 2007 Carsten Valdemar Munk
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -29,10 +29,9 @@ 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 std::vector<std::string> &parameters, User *user)
        {
@@ -43,7 +42,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]++;
                        }
                }
@@ -58,22 +57,19 @@ class CommandClose : public Command
                        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.c_str());
-                       
-               return CMD_LOCALONLY;
+
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleClose : public Module
 {
-       CommandClose* newcommand;
+       CommandClose cmd;
  public:
        ModuleClose(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(this)
        {
-               // Create a new command
-               newcommand = new CommandClose(ServerInstance);
-               ServerInstance->AddCommand(newcommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleClose()
@@ -82,7 +78,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);
        }
 };