diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index 92abf6d46d7..dcd53ef1732 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -3,31 +3,9 @@
set category = "Special Verbs"
if(!check_rights(R_PERMISSIONS))
return
- if(!SSdbcore.IsConnected())
+ if(!SSdbcore.Connected())
to_chat(src, "Failed to establish database connection.")
return
- var/returned = create_poll_function()
- if(returned)
- var/datum/DBQuery/query_check_option = SSdbcore.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE pollid = [returned]")
- if(!query_check_option.warn_execute())
- return
- if(query_check_option.NextRow())
- var/datum/DBQuery/query_log_get = SSdbcore.NewQuery("SELECT polltype, question, adminonly FROM [format_table_name("poll_question")] WHERE id = [returned]")
- if(!query_log_get.warn_execute())
- return
- if(query_log_get.NextRow())
- var/polltype = query_log_get.item[1]
- var/question = query_log_get.item[2]
- var/adminonly = text2num(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
- to_chat(src, "Poll question created without any options, poll will be deleted.")
- var/datum/DBQuery/query_del_poll = SSdbcore.NewQuery("DELETE FROM [format_table_name("poll_question")] WHERE id = [returned]")
- if(!query_del_poll.warn_execute())
- return
-
-/client/proc/create_poll_function()
var/polltype = input("Choose poll type.","Poll Type") in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting")|null
var/choice_amount = 0
switch(polltype)
@@ -40,7 +18,9 @@
if("Multiple Choice")
polltype = POLLTYPE_MULTI
choice_amount = input("How many choices should be allowed?","Select choice amount") as num|null
- if(!choice_amount)
+ if(choice_amount == 0)
+ to_chat(src, "Multiple choice poll must have at least one choice allowed.")
+ else if (choice_amount == null)
return
if ("Instant Runoff Voting")
polltype = POLLTYPE_IRV
@@ -51,22 +31,15 @@
if(!endtime)
return
endtime = sanitizeSQL(endtime)
- var/datum/DBQuery/query_validate_time = SSdbcore.NewQuery("SELECT STR_TO_DATE('[endtime]','%Y-%c-%d %T')")
+ var/datum/DBQuery/query_validate_time = SSdbcore.NewQuery("SELECT STR_TO_DATE('[endtime]','%Y-%c-%d %T') < NOW()")
if(!query_validate_time.warn_execute())
return
if(query_validate_time.NextRow())
+ var/checktime = text2num(query_validate_time.item[1])
+ if(!checktime)
+ to_chat(src, "Datetime entered is improperly formatted or not later than current server time.")
+ return
endtime = query_validate_time.item[1]
- if(!endtime)
- to_chat(src, "Datetime entered is invalid.")
- return
- var/datum/DBQuery/query_time_later = SSdbcore.NewQuery("SELECT TIMESTAMP('[endtime]') < NOW()")
- if(!query_time_later.warn_execute())
- return
- if(query_time_later.NextRow())
- var/checklate = text2num(query_time_later.item[1])
- if(checklate)
- to_chat(src, "Datetime entered is not later than current server time.")
- return
var/adminonly
switch(alert("Admin only poll?",,"Yes","No","Cancel"))
if("Yes")
@@ -88,34 +61,13 @@
if(!question)
return
question = sanitizeSQL(question)
- var/datum/DBQuery/query_polladd_question = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_question")] (polltype, starttime, endtime, question, adminonly, multiplechoiceoptions, createdby_ckey, createdby_ip, dontshow) VALUES ('[polltype]', '[starttime]', '[endtime]', '[question]', '[adminonly]', '[choice_amount]', '[sql_ckey]', INET_ATON('[address]'), '[dontshow]')")
- if(!query_polladd_question.warn_execute())
- return
- if(polltype == 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/datum/DBQuery/query_get_id = SSdbcore.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 = INET_ATON('[address]')")
- if(!query_get_id.warn_execute())
- return
- if(query_get_id.NextRow())
- pollid = query_get_id.item[1]
+ var/list/sql_option_list = list()
var/add_option = 1
while(add_option)
- var/option = input("Write your option","Option") as message|null
+ var/option = input("Write your option","Option") option as message|null
if(!option)
- return pollid
+ return
option = sanitizeSQL(option)
- var/percentagecalc = 1
- if (polltype != POLLTYPE_IRV)
- switch(alert("Calculate option results as percentage?",,"Yes","No","Cancel"))
- if("Yes")
- percentagecalc = 1
- if("No")
- percentagecalc = 0
- else
- return pollid
var/minval = 0
var/maxval = 0
var/descmin = ""
@@ -123,32 +75,34 @@
var/descmax = ""
if(polltype == POLLTYPE_RATING)
minval = input("Set minimum rating value.","Minimum rating") as num|null
- if(!minval)
- return pollid
+ if(minval)
+ minval = sanitizeSQL(minval)
+ else if(minval == null)
+ return
maxval = input("Set maximum rating value.","Maximum rating") as num|null
- if(!maxval)
- return pollid
+ if(maxval)
+ maxval = sanitizeSQL(maxval)
if(minval >= maxval)
- to_chat(src, "Minimum rating value can't be more than maximum rating value")
- return pollid
+ to_chat(src, "Maximum rating value can't be less than or equal to minimum rating value")
+ continue
+ else if(maxval == null)
+ return
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
+ return
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
+ return
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/datum/DBQuery/query_polladd_option = SSdbcore.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.warn_execute())
- return pollid
+ return
+ sql_option_list += list(list("text" = "'[option]'", "minval" = "'[minval]'", "maxval" = "'[maxval]'", "descmin" = "'[descmin]'", "descmid" = "'[descmid]'", "descmax" = "'[descmax]'"))
switch(alert(" ",,"Add option","Finish", "Cancel"))
if("Add option")
add_option = 1
@@ -156,4 +110,18 @@
add_option = 0
else
return 0
- return pollid
\ No newline at end of file
+ var/datum/DBQuery/query_polladd_question = SSdbcore.NewQuery("INSERT INTO [format_table_name("poll_question")] (polltype, starttime, endtime, question, adminonly, multiplechoiceoptions, createdby_ckey, createdby_ip, dontshow) VALUES ('[polltype]', '[starttime]', '[endtime]', '[question]', '[adminonly]', '[choice_amount]', '[sql_ckey]', INET_ATON('[address]'), '[dontshow]')")
+ if(!query_polladd_question.warn_execute())
+ return
+ if(polltype != POLLTYPE_TEXT)
+ var/pollid = 0
+ var/datum/DBQuery/query_get_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()")
+ if(!query_get_id.warn_execute())
+ return
+ if(query_get_id.NextRow())
+ pollid = query_get_id.item[1]
+ for(var/i in sql_option_list)
+ sql_option_list[i] |= list("pollid" = "'[pollid]'")
+ SSdbcore.MassInsert(format_table_name("poll_option"), sql_option_list, warn = 1)
+ 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]")