m_lockserv Remove obsolete comments and unnecessary string clear()s

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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index ce3ab4c2ba628989109367cb326868fc29ebac41..dc71101a86916878ee75f2dda0cfe4df6385f9b8 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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: Allows locking of the server to stop all incoming connections till unlocked again */
@@ -25,18 +32,16 @@ class CommandLockserv : public Command
 {
        bool& locked;
 public:
-       CommandLockserv (InspIRCd* Instance, Module* Creator, bool& lock)
-               : Command(Instance, Creator, "LOCKSERV", "o", 0), locked(lock)
+       CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
        {
-               syntax.clear();
+               flags_needed = 'o';
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                locked = true;
-               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
+               user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server.c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
-               /* Dont send to the network */
                return CMD_SUCCESS;
        }
 };
@@ -47,18 +52,16 @@ private:
        bool& locked;
 
 public:
-       CommandUnlockserv (InspIRCd* Instance, Module* Creator, bool &lock)
-               : Command(Instance, Creator, "UNLOCKSERV", "o", 0), locked(lock)
+       CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
        {
-               syntax.clear();
+               flags_needed = 'o';
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
                locked = false;
-               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
+               user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server.c_str());
                ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
-               /* Dont send to the network */
                return CMD_SUCCESS;
        }
 };
@@ -70,15 +73,10 @@ private:
        CommandLockserv lockcommand;
        CommandUnlockserv unlockcommand;
 
-       virtual void ResetLocked()
-       {
-               locked = false;
-       }
-
 public:
-       ModuleLockserv(InspIRCd* Me) : Module(Me), lockcommand(Me, this, locked), unlockcommand(Me, this, locked)
+       ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
        {
-               ResetLocked();
+               locked = false;
                ServerInstance->AddCommand(&lockcommand);
                ServerInstance->AddCommand(&unlockcommand);
                Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
@@ -92,10 +90,11 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ResetLocked();
+               // Emergency way to unlock
+               if (!user) locked = false;
        }
 
-       virtual ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                if (locked)
                {
@@ -105,14 +104,14 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnCheckReady(User* user)
+       virtual ModResult OnCheckReady(LocalUser* user)
        {
                return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
        }
 };