From 97bb1fc04badca5a8e1b8f405e0929cd4b89cce6 Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 23 Jul 2012 22:44:53 +0000
Subject: [PATCH] - Made it possible to have admin-only in-game polls.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4156 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/modules/mob/new_player/new_player.dm | 5 ++++-
 code/modules/mob/new_player/poll.dm       | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index b93c7a6e7ea..a87b74f46b7 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -53,7 +53,10 @@
 			dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
 
 			if(dbcon.IsConnected())
-				var/DBQuery/query = dbcon.NewQuery("SELECT id FROM erro_poll_question WHERE Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM erro_poll_vote WHERE ckey = \"[ckey]\")")
+				var/isadmin = 0
+				if(src.client && src.client.holder)
+					isadmin = 1
+				var/DBQuery/query = dbcon.NewQuery("SELECT id FROM erro_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime AND id NOT IN (SELECT pollid FROM erro_poll_vote WHERE ckey = \"[ckey]\")")
 				query.Execute()
 				var/newpoll = 0
 				while(query.NextRow())
diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm
index a5f71beba48..188e80c4cfe 100644
--- a/code/modules/mob/new_player/poll.dm
+++ b/code/modules/mob/new_player/poll.dm
@@ -67,8 +67,11 @@
 	var/DBConnection/dbcon = new()
 	dbcon.Connect("dbi:mysql:[db]:[address]:[port]","[user]","[pass]")
 	if(dbcon.IsConnected())
+		var/isadmin = 0
+		if(src.client && src.client.holder)
+			isadmin = 1
 
-		var/DBQuery/select_query = dbcon.NewQuery("SELECT id, question FROM erro_poll_question WHERE Now() BETWEEN starttime AND endtime")
+		var/DBQuery/select_query = dbcon.NewQuery("SELECT id, question FROM erro_poll_question WHERE [(isadmin ? "" : "adminonly = false AND")] Now() BETWEEN starttime AND endtime")
 		select_query.Execute()
 
 		var/output = "<div align='center'><B>Player polls</B>"