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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index f14e437ee..100b7864b 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -21,49 +21,43 @@
 */
 
 
-class cmd_lockserv : public Command
+class CommandLockserv : public Command
 {
-private:
 	bool& locked;
-
 public:
-	cmd_lockserv (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 char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		locked = true;
-		user->WriteServ("988 %s %s :Closed for new connections", user->nick, user->server);
-		ServerInstance->WriteOpers("*** Oper %s used LOCKSERV to temporarily close for new connections", user->nick);
+		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;
 	}
 };
 
-class cmd_unlockserv : public Command
+class CommandUnlockserv : public Command
 {
 private:
 	bool& locked;
 
 public:
-	cmd_unlockserv (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 char** parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		locked = false;
-		user->WriteServ("989 %s %s :Open for new connections", user->nick, user->server);
-		ServerInstance->WriteOpers("*** Oper %s used UNLOCKSERV to allow for new connections", user->nick);
+		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;
 	}
 };
 
@@ -71,8 +65,8 @@ class ModuleLockserv : public Module
 {
 private:
 	bool locked;
-	cmd_lockserv* lockcommand;
-	cmd_unlockserv* unlockcommand;
+	CommandLockserv lockcommand;
+	CommandUnlockserv unlockcommand;
 
 	virtual void ResetLocked()
 	{
@@ -80,48 +74,43 @@ private:
 	}
 
 public:
-	ModuleLockserv(InspIRCd* Me) : Module(Me)
+	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
 		ResetLocked();
-		lockcommand = new cmd_lockserv(ServerInstance, locked);
-		ServerInstance->AddCommand(lockcommand);
-
-		unlockcommand = new cmd_unlockserv(ServerInstance, locked);
-		ServerInstance->AddCommand(unlockcommand);
+		ServerInstance->AddCommand(&lockcommand);
+		ServerInstance->AddCommand(&unlockcommand);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 	virtual ~ModuleLockserv()
 	{
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserRegister] = List[I_OnRehash] = List[I_OnCheckReady] = 1;
-	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ResetLocked();
 	}
 
-	virtual int OnUserRegister(User* user)
+	virtual ModResult OnUserRegister(User* user)
 	{
 		if (locked)
 		{
-			User::QuitUser(ServerInstance, user, "Server is temporarily closed. Please try again later.");
-			return 1;
+			ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later.");
+			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(1, 0, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("Allows locking of the server to stop all incoming connections till unlocked again", VF_VENDOR);
 	}
 };