diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index a80d51361aa..9056e769f69 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -1,11 +1,41 @@
/client/proc/create_poll()
- set name = "Create Server Poll"
- set category = "Server"
+ set name = "Create Poll"
+ set category = "Special Verbs"
if(!check_rights(R_PERMISSIONS))
return
if(!dbcon.IsConnected())
src << "Failed to establish database connection."
return
+ var/returned = create_poll_function()
+ if(returned)
+ var/DBQuery/query_check_option = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE pollid = [returned]")
+ if(!query_check_option.Execute())
+ var/err = query_check_option.ErrorMsg()
+ log_game("SQL ERROR obtaining id from poll_option table. Error : \[[err]\]\n")
+ return
+ if(query_check_option.NextRow())
+ var/DBQuery/query_log_get = dbcon.NewQuery("SELECT polltype, question, adminonly FROM [format_table_name("poll_question")] WHERE id = [returned]")
+ if(!query_log_get.Execute())
+ var/err = query_log_get.ErrorMsg()
+ log_game("SQL ERROR obtaining polltype, question, adminonly from poll_question table. Error : \[[err]\]\n")
+ return
+ if(query_log_get.NextRow())
+ var/polltype = query_log_get.item[1]
+ var/question = query_log_get.item[2]
+ var/adminonly = query_log_get.item[3]
+ log_admin("[key_name(usr)] has created a new server poll. Poll Type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"] - Question: [question]")
+ message_admins("[key_name_admin(usr)] has created a new server poll. Poll Type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"]
Question: [question]")
+ else
+ src << "Poll question created without any options, poll will be deleted."
+ var/DBQuery/query_del_poll = dbcon.NewQuery("DELETE FROM [format_table_name("poll_question")] WHERE id = [returned]")
+ if(!query_del_poll.Execute())
+ var/err = query_del_poll.ErrorMsg()
+ log_game("SQL ERROR deleting poll question [returned]. Error : \[[err]\]\n")
+ return
+
+/client/proc/create_poll_function()
+ if(!check_rights(R_PERMISSIONS))
+ return
var/polltype = input("Choose poll type.","Poll Type") in list("Single Option","Text Reply","Rating","Multiple Choice")
var/choice_amount = 0
switch(polltype)
@@ -18,6 +48,8 @@
if("Multiple Choice")
polltype = "MULTICHOICE"
choice_amount = input("How many choices should be allowed?","Select choice amount") as num|null
+ if(!choice_amount)
+ return
var/starttime = SQLtime()
var/endtime = input("Set end time for poll as format YYYY-MM-DD HH:MM:SS. All times in server time. HH:MM:SS is optional and 24-hour. Must be later than starting time for obvious reasons.", "Set end time", SQLtime()) as text
if(!endtime)
@@ -61,6 +93,10 @@
var/err = query_polladd_question.ErrorMsg()
log_game("SQL ERROR adding new poll question to table. Error : \[[err]\]\n")
return
+ if(polltype == "TEXT")
+ log_admin("[key_name(usr)] has created a new server poll. Poll type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"] - Question: [question]")
+ message_admins("[key_name_admin(usr)] has created a new server poll. Poll type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"]
Question: [question]")
+ return
var/pollid = 0
var/DBQuery/query_get_id = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_question")] WHERE question = '[question]' AND starttime = '[starttime]' AND endtime = '[endtime]' AND createdby_ckey = '[sql_ckey]' AND createdby_ip = '[address]'")
if(!query_get_id.Execute())
@@ -69,13 +105,11 @@
return
if(query_get_id.NextRow())
pollid = query_get_id.item[1]
- if(polltype == "TEXT")
- return
var/add_option = 1
while(add_option)
var/option = input("Write your option","Option") as message|null
if(!option)
- return
+ return pollid
option = sanitizeSQL(option)
var/percentagecalc
switch(alert("Calculate option results as percentage?",,"Yes","No","Cancel"))
@@ -84,7 +118,7 @@
if("No")
percentagecalc = 0
else
- return
+ return pollid
var/minval = 0
var/maxval = 0
var/descmin = ""
@@ -93,33 +127,36 @@
if(polltype == "NUMVAL")
minval = input("Set minimum rating value.","Minimum rating") as num|null
if(!minval)
- return
+ return pollid
maxval = input("Set maximum rating value.","Maximum rating") as num|null
if(!maxval)
- return
+ return pollid
if(minval >= maxval)
src << "Minimum rating value can't be more than maximum rating value"
- return
+ return pollid
descmin = input("Optional: Set description for minimum rating","Minimum rating description") as message|null
if(descmin)
descmin = sanitizeSQL(descmin)
+ else if(descmin == null)
+ return pollid
descmid = input("Optional: Set description for median rating","Median rating description") as message|null
if(descmid)
descmid = sanitizeSQL(descmid)
+ else if(descmid == null)
+ return pollid
descmax = input("Optional: Set description for maximum rating","Maximum rating description") as message|null
if(descmax)
descmax = sanitizeSQL(descmax)
+ else if(descmax == null)
+ return pollid
var/DBQuery/query_polladd_option = dbcon.NewQuery("INSERT INTO [format_table_name("poll_option")] (pollid, text, percentagecalc, minval, maxval, descmin, descmid, descmax) VALUES ('[pollid]', '[option]', '[percentagecalc]', '[minval]', '[maxval]', '[descmin]', '[descmid]', '[descmax]')")
if(!query_polladd_option.Execute())
var/err = query_polladd_option.ErrorMsg()
log_game("SQL ERROR adding new poll option to table. Error : \[[err]\]\n")
- return
- switch(alert(" ",,"Add option","Finish","Cancel"))
+ return pollid
+ switch(alert(" ",,"Add option","Finish"))
if("Add option")
add_option = 1
if("Finish")
- log_admin("[key_name(usr)] has created a new server poll. Poll type: [polltype] - Question: [question] - Admin Only: [adminonly ? "Yes" : "No"]")
- message_admins("[key_name_admin(usr)] has created a new server poll. Poll type: [polltype] - Question: [question] - Admin Only: [adminonly ? "Yes" : "No"]")
add_option = 0
- else
- return
+ return pollid
\ No newline at end of file