From 90041eaba4f833386ac3795a69f8db43676cbdc4 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sat, 23 Jun 2012 16:34:23 +0000 Subject: [PATCH] - Fixed some odd behavior with the spam filter for admin pm-s. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3895 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/verbs/adminpm.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 3894a31bed2..897257de402 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -40,9 +40,6 @@ src << "Error: Admin-PM: You are unable to use admin PM-s (muted by admins)." return - if (src.handle_spam_prevention(msg,MUTE_ADMINHELP)) - return - if( !C || !istype(C,/client) ) if(holder) src << "Error: Admin-PM: Client not found." else adminhelp(msg) //admin we are replying to left. adminhelp instead @@ -51,12 +48,16 @@ //get message text, limit it's length.and clean/escape html if(!msg) msg = input(src,"Message:", "Private message to [C.key]") as text|null + if(!msg) return if(!C) if(holder) src << "Error: Admin-PM: Client not found." else adminhelp(msg) //admin we are replying to has vanished, adminhelp instead return + if (src.handle_spam_prevention(msg,MUTE_ADMINHELP)) + return + //clean the message if it's not sent by a GA or GM if( !holder || !(holder.rank in list("Game Admin", "Game Master")) ) msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))