X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=a101254292b31583dc69ef84966955fab3123538;hb=ccd95e668a3bcbd26c4cd2984cdd8809347f9815;hp=f26454d3e0017c33b68223fbc3ba09e334e7cff9;hpb=694e307c09334c21aaf1a6c3f0b7b6d95440dd3e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index f26454d3e..a10125429 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -47,17 +47,17 @@ SVSHoldMap HoldMap;
 
 /** Handle /SVSHold
  */
-class cmd_svshold : public Command
+class CommandSvshold : public Command
 {
  public:
-	cmd_svshold(InspIRCd* Me) : Command(Me, "SVSHOLD", 'o', 1)
+	CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1)
 	{
 		this->source = "m_svshold.so";
 		this->syntax = "<nickname> [<duration> :<reason>]";
 		TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user)
 	{
 		/* syntax: svshold nickname time :reason goes here */
 		/* 'time' is a human-readable timestring, like 2d3h2s. */
@@ -125,12 +125,12 @@ class cmd_svshold : public Command
 				if(length > 0)
 				{
 					user->WriteServ( "385 %s %s :Added %lu second SVSHOLD (%s)", user->nick, parameters[0], length, reason.c_str());
-					ServerInstance->WriteOpers("*** %s added %lu second SVSHOLD on %s (%s)", user->nick, length, parameters[0], reason.c_str());
+					ServerInstance->SNO->WriteToSnoMask('A', "%s added %lu second SVSHOLD on %s (%s)", user->nick, length, parameters[0], reason.c_str());
 				}
 				else
 				{
 					user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], parameters[0], reason.c_str());
-					ServerInstance->WriteOpers("*** %s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str());
+					ServerInstance->SNO->WriteToSnoMask('A', "%s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str());
 				}
 			}
 			else
@@ -151,22 +151,20 @@ bool SVSHoldComp(const SVSHold* ban1, const SVSHold* ban2)
 
 class ModuleSVSHold : public Module
 {
-	cmd_svshold *mycommand;
+	CommandSvshold *mycommand;
 	
 
  public:
 	ModuleSVSHold(InspIRCd* Me) : Module(Me)
 	{
-		mycommand = new cmd_svshold(Me);
+		mycommand = new CommandSvshold(Me);
 		ServerInstance->AddCommand(mycommand);
+		Implementation eventlist[] = { I_OnUserPreNick, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnStats };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserPreNick] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1;
-	}
 	
-	virtual int OnStats(char symbol, userrec* user, string_list &results)
+	virtual int OnStats(char symbol, User* user, string_list &results)
 	{
 		ExpireBans();
 	
@@ -182,7 +180,7 @@ class ModuleSVSHold : public Module
 		return 0;
 	}
 
-	virtual int OnUserPreNick(userrec *user, const std::string &newnick)
+	virtual int OnUserPreNick(User *user, const std::string &newnick)
 	{
 		ExpireBans();
 	
@@ -262,8 +260,8 @@ class ModuleSVSHold : public Module
 			{
 				if ((*iter)->set_on + (*iter)->length <= ServerInstance->Time())
 				{
-					ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
-					ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
+					ServerInstance->Logs->Log("m_svshold",DEBUG, "m_svshold.so: hold on %s expired, removing...", (*iter)->nickname.c_str());
+					ServerInstance->SNO->WriteToSnoMask('A',"%li second SVSHOLD on %s (%s) set %u seconds ago expired", (*iter)->length, (*iter)->nickname.c_str(), (*iter)->reason.c_str(), ServerInstance->Time() - (*iter)->set_on);
 					HoldMap.erase(assign((*iter)->nickname));
 					delete *iter;
 					safeiter = iter;