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 0a3f0d9fa013078cd93fe55981b666abe63279ca..e81c29d20fe459505aab313e07197e48f4774969 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * 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]++;
                        }
                }
@@ -59,21 +58,18 @@ class CommandClose : public Command
                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()