The rest of snomask +x (i think)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5068 e03df62e-2008-0410-955e-edbf42e46eb7

6 files changed, 21 insertions, 20 deletions

diff --git a/src/cmd_eline.cpp b/src/cmd_eline.cpp
index 27cad8c21..4af72138a 100644
--- a/src/cmd_eline.cpp
+++ b/src/cmd_eline.cpp
@@ -44,11 +44,11 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent E-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 	}
 	else
@@ -56,7 +56,7 @@ void cmd_eline::Handle (const char** parameters, int pcnt, userrec *user)
 		if (ServerInstance->XLines->del_eline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelELine,OnDelELine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed E-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
diff --git a/src/cmd_gline.cpp b/src/cmd_gline.cpp
index b7c22c467..d167e698b 100644
--- a/src/cmd_gline.cpp
+++ b/src/cmd_gline.cpp
@@ -44,11 +44,11 @@ void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent G-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent G-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed G-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 
 		ServerInstance->XLines->apply_lines(APPLY_GLINES);
@@ -58,7 +58,7 @@ void cmd_gline::Handle (const char** parameters, int pcnt, userrec *user)
 		if (ServerInstance->XLines->del_gline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelGLine,OnDelGLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed G-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed G-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index 52cbba26e..ff1805753 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -49,11 +49,11 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent K-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent K-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed K-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 
 		ServerInstance->XLines->apply_lines(APPLY_KLINES);
@@ -63,7 +63,7 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 		if (ServerInstance->XLines->del_kline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelKLine,OnDelKLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed K-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed K-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
@@ -71,3 +71,4 @@ void cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 		}
 	}
 }
+
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index 0dc36032d..4de2a4c38 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -33,11 +33,11 @@ void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 		FOREACH_MOD(I_OnAddQLine,OnAddQLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent Q-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Q-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Q-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 		ServerInstance->XLines->apply_lines(APPLY_QLINES);
 	}
@@ -46,7 +46,7 @@ void cmd_qline::Handle (const char** parameters, int pcnt, userrec *user)
 		if (ServerInstance->XLines->del_qline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelQLine,OnDelQLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed Q-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Q-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index 17fdeed16..145b1ee2e 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -41,11 +41,11 @@ void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 		FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(parameters[1]), user, parameters[2], parameters[0]));
 		if (!ServerInstance->Duration(parameters[1]))
 		{
-			ServerInstance->WriteOpers("*** %s added permanent Z-line for %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
 		}
 		else
 		{
-			ServerInstance->WriteOpers("*** %s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
+			ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires in %d seconds.",user->nick,parameters[0],ServerInstance->Duration(parameters[1]));
 		}
 		ServerInstance->XLines->apply_lines(APPLY_ZLINES);
 	}
@@ -54,7 +54,7 @@ void cmd_zline::Handle (const char** parameters, int pcnt, userrec *user)
 		if (ServerInstance->XLines->del_zline(parameters[0]))
 		{
 			FOREACH_MOD(I_OnDelZLine,OnDelZLine(user, parameters[0]));
-			ServerInstance->WriteOpers("*** %s Removed Z-line on %s.",user->nick,parameters[0]);
+			ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
 		}
 		else
 		{
diff --git a/src/xline.cpp b/src/xline.cpp
index 0a1150aa8..93251b9e4 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -578,35 +578,35 @@ void XLineManager::expire_lines()
 	while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
 	{
 		std::vector<GLine>::iterator i = glines.begin();
-		ServerInstance->WriteOpers("*** Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
 		glines.erase(i);
 	}
 
 	while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
 	{
 		std::vector<ELine>::iterator i = elines.begin();
-		ServerInstance->WriteOpers("*** Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
 		elines.erase(i);
 	}
 
 	while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
 	{
 		std::vector<ZLine>::iterator i = zlines.begin();
-		ServerInstance->WriteOpers("*** Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
 		zlines.erase(i);
 	}
 
 	while ((klines.size()) && (current > (klines.begin()->duration + klines.begin()->set_time)))
 	{
 		std::vector<KLine>::iterator i = klines.begin();
-		ServerInstance->WriteOpers("*** Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
 		klines.erase(i);
 	}
 
 	while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
 	{
 		std::vector<QLine>::iterator i = qlines.begin();
-		ServerInstance->WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
+		ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
 		qlines.erase(i);
 	}