From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 9 Apr 2012 15:57:41 +0000 (+0300)
Subject: Add basic_privs privilege
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=b1f043d010b6260422615c82c3af6a3b80fdd3c9;p=zefram%2Fminetest%2Fminetest_engine.git

Add basic_privs privilege
---

diff --git a/builtin/chatcommands.lua b/builtin/chatcommands.lua
index d2bf62c6..047cfc69 100644
--- a/builtin/chatcommands.lua
+++ b/builtin/chatcommands.lua
@@ -111,8 +111,13 @@ minetest.register_chatcommand("privs", {
 minetest.register_chatcommand("grant", {
 	params = "<name> <privilege>|all",
 	description = "Give privilege to player",
-	privs = {privs=true},
+	privs = {},
 	func = function(name, param)
+		if not minetest.check_player_privs(name, {privs=true}) and 
+				not minetest.check_player_privs(name, {basic_privs=true}) then
+			minetest.chat_send_player(name, "Your privileges are insufficient.")
+			return
+		end
 		local grantname, grantprivstr = string.match(param, "([^ ]+) (.+)")
 		if not grantname or not grantprivstr then
 			minetest.chat_send_player(name, "Invalid parameters (see /help grant)")
@@ -125,6 +130,10 @@ minetest.register_chatcommand("grant", {
 		local privs = minetest.get_player_privs(grantname)
 		local privs_known = true
 		for priv, _ in pairs(grantprivs) do
+			if priv ~= "interact" and priv ~= "shout" and not minetest.check_player_privs(name, {privs=true}) then
+				minetest.chat_send_player(name, "Your privileges are insufficient.")
+				return
+			end
 			if not minetest.registered_privileges[priv] then
 				minetest.chat_send_player(name, "Unknown privilege: "..priv)
 				privs_known = false
@@ -144,8 +153,13 @@ minetest.register_chatcommand("grant", {
 minetest.register_chatcommand("revoke", {
 	params = "<name> <privilege>|all",
 	description = "Remove privilege from player",
-	privs = {privs=true},
+	privs = {},
 	func = function(name, param)
+		if not minetest.check_player_privs(name, {privs=true}) and 
+				not minetest.check_player_privs(name, {basic_privs=true}) then
+			minetest.chat_send_player(name, "Your privileges are insufficient.")
+			return
+		end
 		local revokename, revokeprivstr = string.match(param, "([^ ]+) (.+)")
 		if not revokename or not revokeprivstr then
 			minetest.chat_send_player(name, "Invalid parameters (see /help revoke)")
@@ -153,6 +167,12 @@ minetest.register_chatcommand("revoke", {
 		end
 		local revokeprivs = minetest.string_to_privs(revokeprivstr)
 		local privs = minetest.get_player_privs(revokename)
+		for priv, _ in pairs(revokeprivs) do
+			if priv ~= "interact" and priv ~= "shout" and not minetest.check_player_privs(name, {privs=true}) then
+				minetest.chat_send_player(name, "Your privileges are insufficient.")
+				return
+			end
+		end
 		if revokeprivstr == "all" then
 			privs = {}
 		else
diff --git a/builtin/privileges.lua b/builtin/privileges.lua
index 5db0ca94..6cb42c10 100644
--- a/builtin/privileges.lua
+++ b/builtin/privileges.lua
@@ -30,6 +30,7 @@ minetest.register_privilege("teleport", "Can use /teleport command")
 minetest.register_privilege("bring", "Can teleport other players")
 minetest.register_privilege("settime", "Can use /time")
 minetest.register_privilege("privs", "Can modify privileges")
+minetest.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
 minetest.register_privilege("server", "Can do server maintenance stuff")
 minetest.register_privilege("shout", "Can speak in chat")
 minetest.register_privilege("ban", "Can ban and unban players")