X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=3408e4621f278d630d859a2dcc7289588f3de3ac;hb=0b3a4371c504c45c8a4504d114efb2ca674374e0;hp=203f030caa298df7ebb03615252416df245bfc33;hpb=52ba3b6df7d2a67076c0ce8cd479d5d5884064ad;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 203f030ca..3408e4621 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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 */
@@ -23,24 +30,25 @@
 
 class CommandLockserv : public Command
 {
-private:
 	bool& locked;
-
 public:
-	CommandLockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "LOCKSERV", "o", 0), locked(lock)
+	CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock)
 	{
-		this->source = "m_lockserv.so";
-		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->WriteToSnoMask('A', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str());
-		/* Dont send to the network */
-		return CMD_LOCALONLY;
+		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;
 	}
 };
 
@@ -50,20 +58,23 @@ private:
 	bool& locked;
 
 public:
-	CommandUnlockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "UNLOCKSERV", "o", 0), locked(lock)
+	CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
 	{
-		this->source = "m_lockserv.so";
-		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->WriteToSnoMask('A', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str());
-		/* Dont send to the network */
-		return CMD_LOCALONLY;
+		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;
 	}
 };
 
@@ -71,23 +82,15 @@ class ModuleLockserv : public Module
 {
 private:
 	bool locked;
-	CommandLockserv* lockcommand;
-	CommandUnlockserv* unlockcommand;
-
-	virtual void ResetLocked()
-	{
-		locked = false;
-	}
+	CommandLockserv lockcommand;
+	CommandUnlockserv unlockcommand;
 
 public:
-	ModuleLockserv(InspIRCd* Me) : Module(Me)
+	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
-		ResetLocked();
-		lockcommand = new CommandLockserv(ServerInstance, locked);
-		ServerInstance->AddCommand(lockcommand);
-
-		unlockcommand = new CommandUnlockserv(ServerInstance, locked);
-		ServerInstance->AddCommand(unlockcommand);
+		locked = false;
+		ServerInstance->AddCommand(&lockcommand);
+		ServerInstance->AddCommand(&unlockcommand);
 		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
@@ -97,29 +100,30 @@ public:
 	}
 
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		ResetLocked();
+		// Emergency way to unlock
+		if (!user) locked = false;
 	}
 
-	virtual int OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(LocalUser* user)
 	{
 		if (locked)
 		{
 			ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later.");
-			return 1;
+			return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual bool OnCheckReady(User* user)
+	virtual ModResult OnCheckReady(LocalUser* user)
 	{
-		return !locked;
+		return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
 	}
 };