X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=0a19d56df911ccc91d5c0cd49f7e790771aa7a25;hb=24731c63b6320be22f7b3220236271fa7476b975;hp=872678502ab45fd5175c63e8895c21205f216e22;hpb=8232baefbfbb2b3a8c059561e4d19a55344d87ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 872678502..0a19d56df 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-2008 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.
@@ -23,22 +23,19 @@
 
 class CommandLockserv : public Command
 {
-private:
 	bool& locked;
-
 public:
-	CommandLockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "LOCKSERV", "o", 0), locked(lock)
+	CommandLockserv (InspIRCd* Instance, Module* Creator, bool& lock)
+		: Command(Instance, Creator, "LOCKSERV", "o", 0), locked(lock)
 	{
-		this->source = "m_lockserv.so";
 		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, user->server);
-		ServerInstance->SNO->WriteToSnoMask('A', "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);
+		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;
 	}
@@ -50,18 +47,17 @@ private:
 	bool& locked;
 
 public:
-	CommandUnlockserv (InspIRCd* Instance, bool &lock)
-	: Command(Instance, "UNLOCKSERV", "o", 0), locked(lock)
+	CommandUnlockserv (InspIRCd* Instance, Module* Creator, bool &lock)
+		: Command(Instance, Creator, "UNLOCKSERV", "o", 0), locked(lock)
 	{
-		this->source = "m_lockserv.so";
 		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, user->server);
-		ServerInstance->SNO->WriteToSnoMask('A', "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);
+		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;
 	}
@@ -71,8 +67,8 @@ class ModuleLockserv : public Module
 {
 private:
 	bool locked;
-	CommandLockserv* lockcommand;
-	CommandUnlockserv* unlockcommand;
+	CommandLockserv lockcommand;
+	CommandUnlockserv unlockcommand;
 
 	virtual void ResetLocked()
 	{
@@ -80,14 +76,11 @@ private:
 	}
 
 public:
-	ModuleLockserv(InspIRCd* Me) : Module(Me)
+	ModuleLockserv(InspIRCd* Me) : Module(Me), lockcommand(Me, this, locked), unlockcommand(Me, this, locked)
 	{
 		ResetLocked();
-		lockcommand = new CommandLockserv(ServerInstance, locked);
-		ServerInstance->AddCommand(lockcommand);
-
-		unlockcommand = new CommandUnlockserv(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);
 	}
@@ -97,7 +90,7 @@ public:
 	}
 
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
 		ResetLocked();
 	}
@@ -119,7 +112,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 1, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };