X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=100b7864b70803a5521fac51ae2c1e69a0b5295b;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=77dc5a219dfbc762a1f2b4dfe652dc37f365e781;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 77dc5a219..100b7864b 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -23,24 +23,20 @@
 
 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'; syntax.clear();
 	}
 
 	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_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -50,20 +46,18 @@ 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'; syntax.clear();
 	}
 
 	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_LOCALONLY;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -80,7 +74,7 @@ private:
 	}
 
 public:
-	ModuleLockserv(InspIRCd* Me) : Module(Me), lockcommand(Me, locked), unlockcommand(Me, locked)
+	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
 		ResetLocked();
 		ServerInstance->AddCommand(&lockcommand);
@@ -99,24 +93,24 @@ public:
 		ResetLocked();
 	}
 
-	virtual int OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(User* 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(User* user)
 	{
-		return !locked;
+		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 till unlocked again", VF_VENDOR);
 	}
 };