X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=460f735d651a68db4a4d2ac30ffa5bc63b64d5c1;hb=48033e9b3a708f265c0bc2d62460a6cefa70dd45;hp=3408e4621f278d630d859a2dcc7289588f3de3ac;hpb=1fe23633b78b836f6c906b651255c1bd169f3778;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 3408e4621..460f735d6 100644
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -25,13 +25,13 @@
 /** 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';
@@ -41,7 +41,7 @@ public:
 	{
 		if (locked)
 		{
-			user->WriteServ("NOTICE %s :The server is already locked.", user->nick.c_str());
+			user->WriteNotice("The server is already locked.");
 			return CMD_FAILURE;
 		}
 
@@ -54,10 +54,9 @@ public:
 
 class CommandUnlockserv : public Command
 {
-private:
 	bool& locked;
 
-public:
+ public:
 	CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock)
 	{
 		flags_needed = 'o';
@@ -67,7 +66,7 @@ public:
 	{
 		if (!locked)
 		{
-			user->WriteServ("NOTICE %s :The server isn't locked.", user->nick.c_str());
+			user->WriteNotice("The server isn't locked.");
 			return CMD_FAILURE;
 		}
 
@@ -80,33 +79,31 @@ public:
 
 class ModuleLockserv : public Module
 {
-private:
 	bool locked;
 	CommandLockserv lockcommand;
 	CommandUnlockserv unlockcommand;
 
-public:
+ public:
 	ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked)
 	{
-		locked = false;
-		ServerInstance->AddCommand(&lockcommand);
-		ServerInstance->AddCommand(&unlockcommand);
-		Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
-	virtual ~ModuleLockserv()
+	void init() CXX11_OVERRIDE
 	{
+		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)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		// Emergency way to unlock
 		if (!user) locked = false;
 	}
 
-	virtual ModResult OnUserRegister(LocalUser* user)
+	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
 	{
 		if (locked)
 		{
@@ -116,12 +113,12 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ModResult OnCheckReady(LocalUser* user)
+	ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
 	{
 		return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows locking of the server to stop all incoming connections until unlocked again", VF_VENDOR);
 	}