X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=0db02a7815a3180c412d1fc54a186b31f005bace;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=78c15dead9f4ebb3b8609a6afbc024ea5c9a7ec6;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 78c15dead..0db02a781 100644
--- 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 */
@@ -18,82 +25,85 @@
 /** Adds numerics
  * 988 <nick> <servername> :Closed for new connections
  * 989 <nick> <servername> :Open for new connections
-*/
-
+ */
 
 class CommandLockserv : public Command
 {
 	bool& locked;
-public:
+
+ public:
 	CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
 	{
-		flags_needed = 'o'; syntax.clear();
+		flags_needed = 'o';
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
+		if (locked)
+		{
+			user->WriteServ("NOTICE %s :The server is already locked.", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
 		locked = true;
-		user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server);
-		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
-		/* Dont send to the network */
+		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 disallow new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
 };
 
 class CommandUnlockserv : public Command
 {
-private:
 	bool& locked;
 
-public:
+ public:
 	CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
 	{
-		flags_needed = 'o'; syntax.clear();
+		flags_needed = 'o';
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
+		if (!locked)
+		{
+			user->WriteServ("NOTICE %s :The server isn't locked.", user->nick.c_str());
+			return CMD_FAILURE;
+		}
+
 		locked = false;
-		user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server);
-		ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
-		/* Dont send to the network */
+		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 new connections", user->nick.c_str());
 		return CMD_SUCCESS;
 	}
 };
 
 class ModuleLockserv : public Module
 {
-private:
 	bool locked;
 	CommandLockserv lockcommand;
 	CommandUnlockserv unlockcommand;
 
-	virtual void ResetLocked()
-	{
-		locked = false;
-	}
-
-public:
+ public:
 	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
-		ResetLocked();
-		ServerInstance->AddCommand(&lockcommand);
-		ServerInstance->AddCommand(&unlockcommand);
-		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual ~ModuleLockserv()
+	void init()
 	{
+		locked = false;
+		ServerInstance->Modules->AddService(lockcommand);
+		ServerInstance->Modules->AddService(unlockcommand);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-
 	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)
 		{
@@ -103,14 +113,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("Allows locking of the server to stop all incoming connections till unlocked again", VF_VENDOR, API_VERSION);
+		return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
 	}
 };