r5199 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-12 16:04:40 -0500 (Fri, 12 Dec 2008)
New Revision: 5199

Modified:
   trunk/data/qcsrc/server/vote.qc
Log:
also decolorize names...


Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2008-12-12 20:59:36 UTC (rev 5198)
+++ trunk/data/qcsrc/server/vote.qc	2008-12-12 21:04:40 UTC (rev 5199)
@@ -15,7 +15,7 @@
 {
 	float tokens;
 	float n, t;
-	string ns;
+	string ns, s;
 	entity e;
 	string reason;
 
@@ -49,19 +49,21 @@
 			reason = "";
 		if(caller)
 		{
-			if(cvar_value_issafe(caller.netname))
-				reason = strcat(reason, "player ", caller.netname);
+			s = strdecolorize(caller.netname);
+			if(cvar_value_issafe(s))
+				reason = strcat(reason, "player ", s);
 			else
-				reason = strcat(reason, "player ", uri_escape(caller.netname));
+				reason = strcat(reason, "player ", uri_escape(s));
 		}
 		else
 			reason = strcat(reason, "console vote");
 		if(GetKickVoteVictim_reason != "")
 		{
-			if(cvar_value_issafe(GetKickVoteVictim_reason))
-				reason = strcat(reason, ": ", GetKickVoteVictim_reason);
+			s = strdecolorize(GetKickVoteVictim_reason);
+			if(cvar_value_issafe(s))
+				reason = strcat(reason, ": ", s);
 			else
-				reason = strcat(reason, ": ", uri_escape(GetKickVoteVictim_reason));
+				reason = strcat(reason, ": ", uri_escape(s));
 		}
 
 		n = stof(ns);