votemanager: added additional resource settings for ban votes (#192)

* votemanager: store empty string for vote reason instead of nil if none is provided

Saving nil in a table seems to have odd side effects when further adding key values to it. 

local tab = {true,false,false,nil,5} tab.cheese = "Yes" local a,b,c,d,e = unpack (tab) outputChatBox(tostring(e))

Should output 5 but instead outputs nil. If I remove the tab.cheese = "Yes"

local tab = {true,false,false,nil,5} local a,b,c,d,e = unpack (tab) outputChatBox(tostring(e))

It will correctly output 5 again. However I don't see any easy and clean way to get around it, as votemanager depends on some further modification of the tables and unpacking them later to work properly. Turning the vote reason into an empty string "" sounds like a rather small sacrifice to ensure proper functionality.

* votemanager: add additional voteban settings for server owners

banPlayer provides a lot of banning options, none of which votemanager currently supports changing. This commit adds settings to the meta.xml for the following settings: voteban_banip true/false (default: true); voteban_banusername true/false (default: false); voteban_banserial true/false (default: false); voteban_duration number in seconds (default: 3600)

* votemanager: add additional voteban settings for server owners #2

addendum to previous commit

banPlayer provides a lot of banning options, none of which votemanager currently supports changing. This commit adds settings to the meta.xml for the following settings: voteban_banip true/false (default: true); voteban_banusername true/false (default: false); voteban_banserial true/false (default: false); voteban_duration number in seconds (default: 3600)

* votemanager: store empty string for vote reason instead of nil if none is provided addendum

Removed unnecessary reason == "" from kill votes as it is never used after the initial use.

* changed default voteban behavior from IP to serial

Author: Dark-Dragon

[managers]/votemanager/meta.xml

@@ -49,6 +49,10 @@
 		<setting name="*voteban_locktime" value="[120]"/>
 		<setting name="*voteban_percentage" value="[75]"/>
 		<setting name="*voteban_allowchange" value="[true]"/>
+		<setting name="*voteban_banip" value="[false]"/>
+		<setting name="*voteban_banusername" value="[false]"/>
+		<setting name="*voteban_banserial" value="[true]"/>
+		<setting name="*voteban_duration" value="[3600]"/>
 
 		<setting name="*votekill_enabled" value="[false]"/>
 		<setting name="*votekill_timeout" value="[15]"/>

[managers]/votemanager/votemanager_polls.lua

@@ -58,6 +58,12 @@ addEventHandler("onResourceStart", thisResourceRoot,
 			info.percentage  = get(settingsGroup.."_percentage") or nil
 			info.timeout     = get(settingsGroup.."_timeout")    or nil
 			info.allowchange = get(settingsGroup.."_allowchange")
+			if name == "ban" then
+				info.banip       = get(settingsGroup.."_banip")
+				info.banusername = get(settingsGroup.."_banusername")
+				info.banserial   = get(settingsGroup.."_banserial")
+				info.duration    = get(settingsGroup.."_duration")
+			end
 			info.blockedPlayers = {}
 			addCommandHandler("vote"..name, vote[name].handler )
 		end
@@ -426,6 +432,8 @@ function voteKick(player, reason)
 		local title = "Kick "..getPlayerName(player).."?"
 		if reason then
 			title = title.." ("..reason..")"
+		else
+			reason = ""
 		end
 		return startPoll{
 			title=title,
@@ -446,14 +454,16 @@ function voteBan(player, reason)
 		local title = "Ban "..getPlayerName(player).."?"
 		if reason then
 			title = title.." ("..reason..")"
+		else
+			reason = ""
 		end
 		return startPoll{
 			title=title,
 			percentage = vote.ban.percentage,
 			visibleTo = rootElement,
 			timeout = vote.ban.timeout,
 			allowchange = vote.ban.allowchange;
-			[1]={"Yes",banPlayer,player,serverConsole,reason},
+			[1]={"Yes",banPlayer,player,vote.ban.banip,vote.ban.banusername,vote.ban.banserial,serverConsole,reason,vote.ban.duration},
 			[2]={"No",outputVoteManager,"voteban: not enough votes to ban "..getPlayerName(player)..".",rootElement,vR,vG,vB;default=true},
 		}
 	end