Check for empty passwords

This commit is contained in:
rubenwardy 2019-01-19 23:43:19 +00:00
parent d1f3a56ddc
commit 4a98bed62c

View file

@ -59,13 +59,24 @@ local function can_grant_interact(player)
return not minetest.check_player_privs(name, { interact = true }) and not minetest.check_player_privs(name, { fly = true })
end
local function has_password(pname)
local handler = minetest.get_auth_handler()
local auth = handler.get_auth(pname)
return auth and not minetest.check_password_entry(pname, auth.password, "")
end
function rules.show(player)
local pname = player:get_player_name()
local fs = "size[8,7]bgcolor[#080808BB;true]" ..
default.gui_bg ..
default.gui_bg_img ..
"textlist[0.1,0.1;7.8,6.3;msg;" .. rules.txt .. ";-1;true]"
if not can_grant_interact(player) then
if not has_password(pname) then
fs = fs .. "box[4,6.5;3.1,0.7;#900]"
fs = fs .. "label[4.2,6.6;Please set a password]"
fs = fs .. "button_exit[0.5,6;3.5,2;yes;Okay]"
elseif not can_grant_interact(player) then
fs = fs .. "button_exit[0.5,6;7,2;yes;Okay]"
else
local yes = minetest.formspec_escape("Yes, let me play!")
@ -75,7 +86,7 @@ function rules.show(player)
fs = fs .. "button_exit[4,6;3.5,2;yes;" .. yes .. "]"
end
minetest.show_formspec(player:get_player_name(), "rules:rules", fs)
minetest.show_formspec(pname, "rules:rules", fs)
end
minetest.register_chatcommand("rules", {
@ -96,13 +107,34 @@ minetest.register_chatcommand("rules", {
})
minetest.register_on_joinplayer(function(player)
local privs = minetest.get_player_privs(player:get_player_name())
local pname = player:get_player_name()
local privs = minetest.get_player_privs(pname)
if privs.interact and privs.fly then
privs.interact = false
minetest.set_player_privs(player:get_player_name(), privs)
end
if can_grant_interact(player) then
if not has_password(pname) then
local privs = minetest.get_player_privs(pname)
privs.shout = false
privs.interact = false
privs.kick = false
privs.ban = false
minetest.set_player_privs(pname, privs)
minetest.show_formspec(pname, "rules:pwd", [[
size[8,3]
no_prepends[]
bgcolor[#600]
label[0.2,0.2;Please set a password]
button_exit[0.5,2;7,2;yes;Okay]
textarea[0.2,1;7.9,2;;;]] ..
minetest.formspec_escape("Press escape or the back button. " ..
"Select 'change password'.\n" ..
"When done, type /rules.\n" ..
"You will not be able to obtain interact until you get this."))
elseif can_grant_interact(player) then
rules.show(player)
end
end)
@ -135,4 +167,3 @@ minetest.register_on_player_receive_fields(function(player, form, fields)
return true
end)