From 4199f645f3d9e43f25a5c498f13ec083e9d4412e Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Fri, 15 May 2020 03:11:50 +0200
Subject: [PATCH] Do more strict privilege checks

---
 init.lua               | 34 +++++++++++++++++++++++-----------
 locale/schemedit.de.tr |  2 +-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/init.lua b/init.lua
index 13ece19..1641715 100644
--- a/init.lua
+++ b/init.lua
@@ -28,13 +28,15 @@ end
 
 minetest.register_privilege("schemedit")
 local NEEDED_PRIV = "schemedit"
-local function check_priv(player_name)
+local function check_priv(player_name, quit)
 	local privs = minetest.get_player_privs(player_name)
 	if privs[NEEDED_PRIV] then
 		return true
 	else
-		minetest.chat_send_player(player_name, minetest.colorize("red",
-				S("Insufficient privileges! You need the “@1” privilege to use this.", NEEDED_PRIV)))
+		if not quit then
+			minetest.chat_send_player(player_name, minetest.colorize("red",
+					S("Insufficient privileges! You need the “@1” privilege to use this.", NEEDED_PRIV)))
+		end
 		return false
 	end
 end
@@ -318,7 +320,12 @@ schemedit.add_form("main", {
 		return form
 	end,
 	handle = function(self, pos, name, fields)
-		if not check_priv(name) then
+		if fields.doc then
+			doc.show_entry(name, "nodes", "schemedit:creator", true)
+			return
+		end
+
+		if not check_priv(name, fields.quit) then
 			return
 		end
 
@@ -351,11 +358,6 @@ schemedit.add_form("main", {
 			meta.schem_name = fields.name
 		end
 
-		if fields.doc then
-			doc.show_entry(name, "nodes", "schemedit:creator", true)
-			return
-		end
-
 		-- Toggle border
 		if fields.border then
 			if meta.schem_border == "true" and schemedit.markers[hashpos] then
@@ -575,7 +577,7 @@ schemedit.add_form("slice", {
 		return form
 	end,
 	handle = function(self, pos, name, fields)
-		if not check_priv(name) then
+		if not check_priv(name, fields.quit) then
 			return
 		end
 
@@ -674,7 +676,7 @@ schemedit.add_form("probtool", {
 		return form
 	end,
 	handle = function(self, pos, name, fields)
-		if not check_priv(name) then
+		if not check_priv(name, fields.quit) then
 			return
 		end
 
@@ -1116,10 +1118,20 @@ S("The node HUD is not updated automatically and may be outdated. The node HUD o
 		end
 	end,
 	on_secondary_use = function(itemstack, user, pointed_thing)
+		local uname = user:get_player_name()
+		if uname and not check_priv(uname) then
+			return
+		end
+
 		schemedit.clear_displayed_node_probs(user)
 	end,
 	-- Set note probability and force_place and enable node probability display
 	on_place = function(itemstack, placer, pointed_thing)
+		local pname = placer:get_player_name()
+		if pname and not check_priv(pname) then
+			return
+		end
+
 		-- Use pointed node's on_rightclick function first, if present
 		local node = minetest.get_node(pointed_thing.under)
 		if placer and not placer:get_player_control().sneak then
diff --git a/locale/schemedit.de.tr b/locale/schemedit.de.tr
index c14032d..32003c1 100644
--- a/locale/schemedit.de.tr
+++ b/locale/schemedit.de.tr
@@ -70,7 +70,7 @@ Main=Grundeinstellungen
 X size:=X-Größe:
 Y size:=Y-Größe:
 Z size:=Z-Größe:
-Insufficient privileges! You need the “@1” privilege to use this.=Unzureichende Privilegien! Sie benötigen das „@1“-Privileg, um dies tun zu können.
+Insufficient privileges! You need the “@1” privilege to use this.=Unzureichende Privilegien! Sie benötigen das „@1“-Privileg, um dies benutzen zu können.
 Convert .mts schematic file to .lua file (loaded from @1)=„.mts“-Schematicdatei zu „.lua“-Datei konvertieren (geladen von @1)
 <schematic name>[.mts] [comments]=<Schematic-Name>[.mts] [comments]
 Failed.=Fehlgeschlagen.
-- 
2.11.4.GIT