diff --git a/raz.lua b/raz.lua index dc0a0ea..a7c30ca 100644 --- a/raz.lua +++ b/raz.lua @@ -1,4 +1,13 @@ - +--+++++++++++++++++++++++++++++++++++++++ +-- +-- convert_to_areas +-- get region datatable from id and +-- makes an area table +-- +--+++++++++++++++++++++++++++++++++++++++ +-- input: region ID +-- msg/error handling: no +-- returns this_area as table in the area-format function markers:convert_to_areas(id) local this_area = {} local pos1,pos2,data = raz:get_region_data_by_id(id) @@ -11,26 +20,58 @@ function markers:convert_to_areas(id) return this_area end +--+++++++++++++++++++++++++++++++++++++++ +-- +-- check_region_mark +-- checks if pname is owner of an region and has the correct privileg +-- or is region_admin +-- +--+++++++++++++++++++++++++++++++++++++++ +-- input: region ID +-- msg/error handling: no +-- returns true - is owner with privileg or region_admin +function markers:check_region_mark(pname, owner) + if( owner == pname and minetest.check_player_privs(pname, { region_mark = true }) ) + or minetest.check_player_privs(pname, { region_admin = true }) then + return true; + end + return false +end + +--+++++++++++++++++++++++++++++++++++++++ +-- +-- check_region_mark +-- checks if pname is owner of an region and has the correct privileg +-- or is region_admin +-- +--+++++++++++++++++++++++++++++++++++++++ +-- input: region ID +-- msg/error handling: no +-- returns true - is owner with privileg or region_admin +function markers:check_region_set(pname, owner) + if( owner == pname and minetest.check_player_privs(pname, { region_set = true }) ) + or minetest.check_player_privs(pname, { region_admin = true }) then + return true; + end + return false +end + --+++++++++++++++++++++++++++++++++++++++ -- -- get area by pos1 uand pos2 +-- looks for the region in the pos1-pos2 zone -- --+++++++++++++++++++++++++++++++++++++++ -- input: pos1, pos2 as vector (table) -- returns the first area found -- msg/error handling: no -- return nil if the is no area --- return id of the first found area +-- return area-table with id of the first found area markers.get_area_by_pos1_pos2 = function(pos1, pos2) - -- get nil or id of th efirst area local found_id = raz:get_area_by_pos1_pos2(pos1, pos2) - --minetest.log("action", "[" .. raz.modname .. "] raz:get_area_by_pos1_pos2(pos1, pos2):"..tostring(minetest.serialize(found)) ) if found_id ~= nil then - --local data = raz:get_region_datatable(found_id) + local return_table = markers:convert_to_areas(found_id) - --return_table[ 'id' ] = found_id - --return_table[ 'owner' ] = data.owner - --return_table[ 'name' ] = data.region_name return return_table else @@ -38,20 +79,38 @@ markers.get_area_by_pos1_pos2 = function(pos1, pos2) end end +----------------------------------------- +-- +-- player can add region +-- +----------------------------------------- +-- check ich name has the privileg +-- pos1 and pos2 are not in an other region +-- the player/name has less when MAX-Regions set +-- msg/error handling: +-- return false, err-text +-- return true, nil +function markers:player_can_add_region(pos1, pos2, name) + if not minetest.check_player_privs(name, { region_mark = true }) then + return false, "You dont have the privileg 'region_mark' " + end + if raz:get_area_by_pos1_pos2(pos1, pos2) ~= nil then + return false, "The pos1,pos2 are in an other region! - You can not mark the region." + end + + return true, nil +end - --- protect/buy an area +-- protect an region markers.marker_on_receive_fields = function(pos, formname, fields, sender) - if( not( pos )) then minetest.log("action", "[" .. markers.modname .. "] markers.marker_on_receive_fields nor )pos) sender = "..tostring(sender) ) minetest.chat_send_player( name, 'Sorry, could not find the marker you where using to access this formspec.' ); return; end - local meta = minetest.get_meta( pos ); local name = sender:get_player_name(); @@ -118,17 +177,15 @@ markers.marker_on_receive_fields = function(pos, formname, fields, sender) pos1.y = pos1.y - add_depth; pos2.y = pos2.y + add_height; - -- warum? wird das gemacht? + -- sort pos1 and pos2 pos1, pos2 = markers:sortPos( pos1, pos2 ); - --minetest.chat_send_player('singleplayer','INPUT: '..minetest.serialize( pos1 )..' pos2: '..minetest.serialize( pos2 )); minetest.log("action", "[markers] /protect invoked, owner="..name.. " areaname="..fields['set_area_name'].. " startpos="..minetest.pos_to_string(pos1).. " endpos=" ..minetest.pos_to_string(pos2)); - local canAdd, errMsg = raz:player_can_add_region(pos1, pos2, name) - minetest.chat_send_player(name, "CanAdd = "..tostring(canAdd).." err = "..tostring(errMsg)) + local canAdd, errMsg = markers:player_can_add_region(pos1, pos2, name) if canAdd == false then minetest.chat_send_player(name, "You can't protect that area: "..tostring(errMsg)) minetest.show_formspec( name, "markers:mark", markers.get_marker_formspec(sender, pos, errMsg)); @@ -137,7 +194,7 @@ markers.marker_on_receive_fields = function(pos, formname, fields, sender) local data = raz:create_data(name,fields['set_area_name'],true) local id = raz:set_region(pos1,pos2,data) - minetest.chat_send_player(name, "Area protected. ID: "..tostring(id)) + minetest.chat_send_player(name, "Area protected. ID: "..tostring(id)) minetest.show_formspec( name, "markers:mark", markers.get_marker_formspec(sender, pos, nil)); @@ -154,9 +211,9 @@ if not vector.interpolate then end -- taken from mobf -local COLOR_RED = "#FF0000"; -local COLOR_GREEN = "#00FF00"; -local COLOR_WHITE = "#FFFFFF"; +--local COLOR_RED = "#FF0000"; +--local COLOR_GREEN = "#00FF00"; +--local COLOR_WHITE = "#FFFFFF"; -- we need to store which list we present to which player @@ -166,10 +223,7 @@ markers.menu_data_by_player = {} markers.get_area_by_pos = function(pos) local found_areas = raz.raz_store:get_areas_for_pos(pos) --{}; --- for id, area in pairs(raz.raz_store:get_areas_for_pos(pos)) do - -- table.insert(found_areas, area ); - -- end - -- end + return found_areas; end @@ -186,21 +240,14 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se local title = '???'; local tlabel = ''; + -- expects a position in mode_data if( mode=='pos' ) then -- title would be too long for a label title = 'All areas which contain position..'; tlabel = '<'..minetest.pos_to_string( mode_data )..'>:'; id_list = raz.raz_store:get_areas_for_pos(pos) --- for id, area in pairs(areas.areas) do --- - -- if( mode_data.x >= area.pos1.x and mode_data.x <= area.pos2.x and - -- mode_data.y >= area.pos1.y and mode_data.y <= area.pos2.y and - -- mode_data.z >= area.pos1.z and mode_data.z <= area.pos2.z )then-- --- - -- table.insert( id_list, id ); - -- end - -- end + -- expects a playername in mode_data elseif( mode=='player' ) then @@ -211,7 +258,6 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se local data = {} while raz.raz_store:get_area(counter) do data = raz:get_region_datatable(counter) - -- for id, area in pairs(areas.areas) do if( data.owner == mode_data ) then table.insert( id_list, counter ); @@ -219,29 +265,21 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se counter = counter + 1 end + -- expects an area_id in mode_data elseif( mode=='subareas' ) then - title = 'All subareas of area..'; - tlabel = '<'..tostring( areas.areas[ mode_data ].name )..'> ['..tostring( mode_data )..']:'; + minetest.log("error", "[" .. markers.modname .. "] {markers.get_area_list_formspec} there are no subareas in raz-mod.") - -- for id, area in pairs(areas.areas) do --- - -- if( area.parent and area.parent == mode_data ) then - -- table.insert( id_list, id ); - -- end - -- end - id_list = {1,2,4} - -- show only areas that do not have parents + -- show only regions that do have parent attribute = true elseif( mode=='main_areas' ) then - title = 'All main areas withhin '..tostring( markers.AREA_RANGE )..' m:'; - tlabel = '*all main areas*'; + title = 'All parent region withhin '..tostring( markers.AREA_RANGE )..' m:'; + tlabel = '*all parent regions *'; local counter = 0 local data = {} while raz.raz_store:get_area(counter) do data = raz:get_region_datatable(counter) - -- for id, area in pairs(areas.areas) do if( data.parent == true ) then table.insert( id_list, counter ); @@ -249,10 +287,10 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se counter = counter + 1 end - + -- show all regions elseif( mode=='all' ) then - title = 'All areas withhin '..tostring( markers.AREA_RANGE )..' m:'; - tlabel = '*all areas*'; + title = 'All regions withhin '..tostring( markers.AREA_RANGE )..' m:'; + tlabel = '*all regions*'; local counter = 0 local data = {} @@ -262,11 +300,10 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se end end - -- Sort the list of areas so the nearest comes first + -- Sort the list of regions so the nearest comes first local nearsorter = function(a, b) - -- maybe in AreaStore() min and max is user for pos1 , pos2 - return vector.distance(vector.interpolate(raz.raz_store:get_area(a).pos1, raz.raz_store:get_area(a).pos2, 0.5), ppos) < - vector.distance(vector.interpolate(raz.raz_store:get_area(b).pos1, raz.raz_store:get_area(b).pos2, 0.5), ppos) + return vector.distance(vector.interpolate(raz.raz_store:get_area(a).min, raz.raz_store:get_area(a).max, 0.5), ppos) < + vector.distance(vector.interpolate(raz.raz_store:get_area(b).min, raz.raz_store:get_area(b).max, 0.5), ppos) end table.sort(id_list, nearsorter) @@ -283,11 +320,13 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se "textlist[0.5,0.5;7,8;markers_area_list_selection;"; local liste = ''; + local liste_string = "" for i,v in ipairs( id_list ) do if( liste ~= '' ) then liste = liste..','; end - liste = liste..minetest.formspec_escape( raz:get_region_status(pos) ); + list_string = "ID = "..v.." - "..raz:get_region_attribute(v, "region_name") + liste = liste..minetest.formspec_escape( list_string ) end @@ -308,32 +347,11 @@ markers.get_area_list_formspec = function(ppos, player, mode, pos, mode_data, se and id_list[ selected ] and raz.raz_store:get_area( id_list[ selected ]) ) then - local this_area = raz.raz_store:get_area( id_list[ selected ]); - - local subareas = {}; --- for i,v in pairs( areas.areas ) do --- if( v.parent and v.parent == id_list[ selected ]) then --- table.insert( subareas, i ); - -- end - -- end + local this_area = markers:convert_to_areas( id_list[ selected ]); formspec = formspec.. markers.show_compass_marker( 8.5, 3.0, false, pos, this_area.pos1, this_area.pos2 ); - --- if( this_area.parent) then --- formspec = formspec.. --- 'button[8.0,0.5;2,0.5;show_parent;'.. --- minetest.formspec_escape( areas.areas[ this_area.parent ].name )..']'; - -- end - --- if( #subareas > 0 ) then - -- formspec = formspec.. - -- 'button[8.0,1.0;2,0.5;list_subareas;'.. --- minetest.formspec_escape( 'List subareas ('..tostring( #subareas )..')')..']'; --- end - - if( mode=='player' ) then formspec = formspec.. 'label[8.0,1.5;'.. @@ -376,30 +394,22 @@ markers.get_area_desc_formspec = function( id, player, pos ) if( not id or not raz.raz_store:get_area( id )) then return 'field[info;Error:;Area not found.]'; end - -- build the this_area table - local this_area = markers:convert_to_areas(id) --{} --raz.raz_store:get_area( id ); - --local pos1,pos2,data = raz:get_region_data_by_id(id) - --this_area[ 'id' ] = id - --this_area[ 'owner' ] = data.owner - --this_area[ 'name' ] = data.region_name - --this_area[ 'pos1' ] = pos1 - --this_area[ 'pos2' ] = pos2 - --this_area[ 'guests' ] = raz:convert_string_to_table(data.guests, ",") + + -- build the this_area table from raz_store data + local this_area = markers:convert_to_areas(id) local pname = player:get_player_name(); -- show some buttons only if area is owned by the player - local is_owner = false; - - if( this_area.owner == pname or minetest.check_player_privs(pname, { region_admin = true }) ) then - is_owner = true; - end + local has_region_mark = markers:check_region_mark(pname, this_area.owner) + local has_region_set = markers:check_region_set(pname, this_area.owner) + local formspec = 'size[10,9]'.. 'label[2.5,0.0;Area information and management]'.. 'button_exit[4.7,7.0;1,0.5;abort;OK]'; - -- general information about the area + -- general information about the region formspec = formspec.. 'label[0.5,1.0;This is area number ]'.. 'label[4.7,1.0;'..tostring( id )..']'.. @@ -411,64 +421,46 @@ markers.get_area_desc_formspec = function( id, player, pos ) 'label[4.7,2.0;'..minetest.formspec_escape( this_area.owner)..']'; - -- these functions are only available to the owner of the area - if( is_owner ) then + -- these functions are only available to the owner of the region with privileg region_set + if has_region_set then formspec = formspec.. - 'button_exit[8.0,0.0;2.2,0.7;change_owner;Change owner]'.. - 'button_exit[8.0,1.0;2.2,0.7;delete;Delete]'.. - 'button_exit[8.0,1.7;2.2,0.7;rename;Rename]'; --.. --- 'button_exit[8.0,2.0;2,0.5;list_player_areas;My areas]'; --- else --- formspec = formspec.. --- 'button_exit[8.0,2.0;2,0.5;list_player_areas;Player\'s areas]'; + 'button_exit[8.0,0.0;2.2,0.7;change_owner;Change owner]'; end - - + -- these functions are only available to the owner of the region with privileg region_mark + if has_region_mark then + formspec = formspec.. + 'button_exit[8.0,1.0;2.2,0.7;delete;Delete]'.. + 'button_exit[8.0,1.7;2.2,0.7;rename;Rename]' + end -- show subowners and areas with the same coordinates formspec = formspec.. 'label[0.5,2.5;invited Guests of the area:]'; - local further_owners = this_area.guests--{}; + local guests = this_area.guests--{}; - if( #further_owners > 0 ) then + if( #guests > 0 ) then formspec = formspec.. - 'label[4.7,2.5;'..minetest.formspec_escape( table.concat( further_owners, ', '))..'.]'; + 'label[4.7,2.5;'..minetest.formspec_escape( table.concat( guests, ', '))..'.]'; - -- deleting subowners is done by deleting their areas - if( is_owner ) then + if( has_region_set ) then formspec = formspec.. - 'button_exit[8.0,2.5;2.2,0.5;add_guest;Add Guest]'.. - 'button_exit[8.0,3.0;2.2,0.5;ban_guest;remove Guest]'; + 'button_exit[8.0,2.5;2.2,0.7;add_guest;Add Guest]'.. + 'button_exit[8.0,3.2;2.2,0.7;ban_guest;remove Guest]'; end else formspec = formspec.. 'label[4.7,2.5;-none-]'; - if( is_owner ) then + if( has_region_set ) then formspec = formspec.. - 'button_exit[8.0,2.5;2.2,0.5;add_guest;Add Guest]'.. - 'button_exit[8.0,3.0;2.2,0.5;ban_guest;remove Guest]'; + 'button_exit[8.0,2.5;2.2,0.7;add_guest;Add Guest]'.. + 'button_exit[8.0,3.2;2.2,0.7;ban_guest;remove Guest]'; end end - - -- does the area have subareas, i.e. is it a parent area for others? - local sub_areas = {}; - if( #sub_areas > 0 ) then - - formspec = formspec.. - 'label[0.5,4.0;Number of defined subareas:]'.. - 'label[4.7,4.0;'..tostring( #sub_areas )..']'.. - 'button_exit[8.0,4.0;2,0.5;list_subareas;List subareas]'; - -- else - -- formspec = formspec.. --- 'label[0.5,4.0;There are no subareas defined.]'; - end - - -- give information about the size of the area local length_x = (math.abs( this_area.pos2.x - this_area.pos1.x )+1); local length_y = (math.abs( this_area.pos2.y - this_area.pos1.y )+1); @@ -486,9 +478,7 @@ markers.get_area_desc_formspec = function( id, player, pos ) formspec = formspec.. markers.show_compass_marker( 2.0, 7.0, true, pos, this_area.pos1, this_area.pos2 ); --- TODO: buy / sell button - - local pname = player:get_player_name(); + --local pname = player:get_player_name(); if( not( markers.menu_data_by_player[ pname ] )) then markers.menu_data_by_player[ pname ] = {}; end @@ -529,98 +519,108 @@ markers.form_input_handler_areas = function( player, formname, fields) local menu_data = markers.menu_data_by_player[ pname ]; local formspec = ''; - -- rename an area - if( fields.rename - and menu_data.selected -- raz_store-ID is set - and raz.raz_store:get_area(menu_data.selected) -- there is an region for this ID - and raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) then -- the owner of the ID/region is pname + ----------------------------------------------------------------------- + -- rename an region + -- only region_admin or owner with region_mark can rename region + if( fields.rename -- rename + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID - local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table + -- there are no checks here - those happen when the region will renamed + local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table + if( not( area.name )) then area.name = '-enter area name-'; end formspec = 'field[rename_new_name;Enter new name for area:;'..minetest.formspec_escape( area.name )..']'; - elseif( fields.rename_new_name - and menu_data.selected -- raz_store-ID is set - and raz.raz_store:get_area(menu_data.selected) -- there is an region for this ID - and ((raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) -- the owner of the ID/region is pname OR region_admin - or minetest.check_player_privs(pname, { region_admin = true }))) then - - local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table + elseif( fields.rename_new_name -- rename_new_name + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID - -- actually rename the area - raz:region_set_attribute(pname, menu_data.selected, "region_name", fields.rename_new_name) - minetest.chat_send_player( pname, 'Region successfully renamed.'); - -- shwo the renamed area - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - + local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table - + -- check owner with privileg or region admin + if markers:check_region_mark(pname, area.owner) then -- owner with privileg or admin + + -- actually rename the area + local err = raz:region_set_attribute(pname, menu_data.selected, "region_name", fields.rename_new_name) + if err then + minetest.chat_send_player( pname, 'Region successfully renamed.'); + + -- shwo the renamed area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + else + raz:msg_handling(err, pname) + end + else + if area.owner ~= pname then + minetest.chat_send_player( pname, 'Permission denied. You are not owner of this region!'); + else + minetest.chat_send_player( pname, "Permission denied. Missing privileg \'region_mark\'!"); + end + end + + ----------------------------------------------------------------------- -- change owner the area - elseif( fields.change_owner - and menu_data.selected -- raz_store-ID is set - and raz.raz_store:get_area(menu_data.selected)) -- there is an region for this ID - then + -- only region_admin or owner with region_set can change owner + elseif( fields.change_owner -- change_owner + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected)) then -- there is an region for this ID -- there are no checks here - those happen when the area is transferred local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table formspec = 'field[change_owner_name;Give area \"'..minetest.formspec_escape( area.name )..'\" to player:;-enter name of NEW OWNER-]'; - elseif( fields.change_owner_name - and menu_data.selected -- raz_store-ID is set - and raz.raz_store:get_area(menu_data.selected)) -- there is an region for this - then + elseif( fields.change_owner_name -- change_owner_name + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected)) then -- there is an region for this - local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table + + local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table - -- only own areas can be transfered to another player (or region_admin) - if( area.owner ~= pname - and not( minetest.check_player_privs(pname, { region_admin = true }))) then - - minetest.chat_send_player( pname, 'Permission denied. You do not own the region.'); - - -- did pname has the correct privileg? - elseif( not( minetest.check_player_privs(pname, { region_set = true }))) then - - minetest.chat_send_player( pname, 'Permission denied. You do not have the correct privileg.'); - - -- the new Player do not exist - elseif( not( minetest.player_exists( fields.change_owner_name ))) then + -- check new owner is player + if( not( minetest.player_exists( fields.change_owner_name ))) then minetest.chat_send_player( pname, 'That player does not exist.'); + -- check owner with privileg or region admin + elseif markers:check_region_set(pname, area.owner) then -- owner with privileg or admin + + -- actually change the owner + local err = raz:region_set_attribute(pname, menu_data.selected, "owner", fields.change_owner_name) + if err then + + minetest.chat_send_player( pname, 'Your region '..tostring( area.name )..' has been transfered to '..tostring( fields.change_owner_name )..'.'); + + minetest.chat_send_player( fields.change_owner_name, pname..' has given you control over an region.') + else + raz:msg_handling(err, pname) + end + + elseif area.owner ~= pname then + minetest.chat_send_player( pname, 'Permission denied. You are not owner of this region!'); else - -- actually change the owner - raz:region_set_attribute(pname, menu_data.selected, "owner", fields.change_owner_name) - - minetest.chat_send_player( pname, 'Your region '..tostring( area.name )..' has been transfered to '..tostring( fields.change_owner_name )..'.'); - - minetest.chat_send_player( fields.change_owner_name, pname..' has given you control over an region.') + minetest.chat_send_player( pname, "Permission denied. Missing privileg \'region_set\'!"); end formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + ----------------------------------------------------------------------- -- add a guest - check id / region with ID elseif( fields.add_guest and menu_data.selected -- raz_store-ID is set and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID --- and raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) then -- the owner of the ID/region is pname - - local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table - formspec = 'field[add_guest_name;Grant access to area \"'..minetest.formspec_escape( area.name )..'\" to player:;-enter player name-]'; + formspec = 'field[add_guest_name;Invite a player to your region: \"'..minetest.formspec_escape( area.name )..'\";-enter player name-]'; elseif( fields.add_guest_name - -- the player has to own the area already; we need a diffrent name here - -- and fields.add_guest_name ~= pname and menu_data.selected -- raz_store-ID is set and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID - -- and raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) then -- the owner of the ID/region is pname local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table @@ -631,52 +631,52 @@ markers.form_input_handler_areas = function( player, formname, fields) -- show the formspec formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - -- check privileg - elseif( not( minetest.check_player_privs(pname, { region_set = true }) -- privileg - and not (raz:get_region_attribute(menu_data.selected, "owner" ) == pname )) -- and owner - or not ( minetest.check_player_privs(pname, { region_admin = true })) ) then -- or admin - - minetest.chat_send_player( pname, 'Permission denied. You do not have the correct privileg.'); + -- check owner with privileg or region admin + elseif markers:check_region_set(pname, area.owner) then -- owner with privileg or admin - else - -- log the creation of the new area + -- log add guest minetest.log("action", pname.." add_guest through the markers-mod. guest = "..fields.add_guest_name.. " AreaName = "..area.name.." ParentID = "..menu_data.selected.. " StartPos = "..area.pos1.x..","..area.pos1.y..","..area.pos1.z.. " EndPos = " ..area.pos2.x..","..area.pos2.y..","..area.pos2.z) - -- actually addthe guest - raz:region_set_attribute(pname, menu_data.selected, "guest", fields.add_guest_name, true) + -- actually add the guest + if raz:region_set_attribute(pname, menu_data.selected, "guest", fields.add_guest_name, true) then - minetest.chat_send_player( fields.add_guest_name, - "You have been invitedinto the region #".. - menu_data.selected..". Type /region list to show your region.") + minetest.chat_send_player( fields.add_guest_name, + "You have been invitedinto the region #".. + menu_data.selected..". Type /region list to show your region.") - minetest.chat_send_player( pname, 'The player may now build and dig in your area.'); - -- shwo the new area - --markers.menu_data_by_player[ pname ].selected = new_id; - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + minetest.chat_send_player( pname, 'The player may now build and dig in your area.'); + + -- shwo the new area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + + else + minetest.chat_send_player( pname, "ther is a player with this name {".. fields.ban_guest_name.."} in your guestlist!"); + end + + elseif area.owner ~= pname then + minetest.chat_send_player( pname, 'Permission denied. You are not owner of this region!'); + else + minetest.chat_send_player( pname, "Permission denied. Missing privileg \'region_setz\'!"); end + + ----------------------------------------------------------------------- -- ban a guest elseif( fields.ban_guest and menu_data.selected -- raz_store-ID is set - and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID --- and raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) then -- the owner of the ID/region is pname - - + and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table formspec = 'field[ban_guest_name;Grant access to area \"'..minetest.formspec_escape( area.name )..'\" to player:;-enter player name-]'; elseif( fields.ban_guest_name - -- the player has to own the area already; we need a diffrent name here - -- and fields.ban_guest_name ~= pname and menu_data.selected -- raz_store-ID is set and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID - -- and raz:get_region_attribute(menu_data.selected, "owner" ) == pname ) then -- the owner of the ID/region is pname local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table @@ -687,153 +687,124 @@ markers.form_input_handler_areas = function( player, formname, fields) -- show the formspec formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - -- check privileg - elseif( not( minetest.check_player_privs(pname, { region_set = true }) -- privileg - and not (raz:get_region_attribute(menu_data.selected, "owner" ) == pname )) -- and owner - or not ( minetest.check_player_privs(pname, { region_admin = true })) ) then -- or admin - - minetest.chat_send_player( pname, 'Permission denied. You do not have the correct privileg.'); + -- check owner with privileg or region admin + elseif markers:check_region_set(pname, area.owner) then -- owner with privileg or admin - else - -- log the creation of the new area - minetest.log("action", pname.." add_guest through the markers-mod. guest = "..fields.ban_guest_name.. + -- log ban guest + minetest.log("action", pname.." ban_guest through the markers-mod. guest = "..fields.ban_guest_name.. " AreaName = "..area.name.." ParentID = "..menu_data.selected.. " StartPos = "..area.pos1.x..","..area.pos1.y..","..area.pos1.z.. " EndPos = " ..area.pos2.x..","..area.pos2.y..","..area.pos2.z) - -- actually addthe guest - raz:region_set_attribute(pname, menu_data.selected, "guest", fields.ban_guest_name, false) + -- actually add the guest + if raz:region_set_attribute(pname, menu_data.selected, "guest", fields.ban_guest_name, false) then - minetest.chat_send_player( fields.ban_guest_name, - "You have been invitedinto the region #".. - menu_data.selected..". Type /region list to show your region.") + minetest.chat_send_player( fields.ban_guest_name, + "You have been banned from the region #".. + menu_data.selected..". Type /region list to show your region.") - minetest.chat_send_player( pname, 'The player may now build and dig in your area.'); - -- shwo the new area - --markers.menu_data_by_player[ pname ].selected = new_id; - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - end + minetest.chat_send_player( pname, "You have banned player ".. fields.ban_guest_name.." from your region {"..area.name.."}"); ---[[ - - -- delete area - elseif( fields.delete - and menu_data.selected - and areas.areas[ menu_data.selected ] ) then - - local area = areas.areas[ menu_data.selected ]; - - -- a player can only delete own areas or subareas of own areas - if( area.owner ~= pname - and not( area.parent - and areas.areas[ area.parent ] - and areas.areas[ area.parent ].owner - and areas.areas[ area.parent ].owner == pname ) - and not( minetest.check_player_privs(pname, {areas=true}))) then - - minetest.chat_send_player( pname, 'Permission denied. You own neither the area itshelf nor its parent area.'); - -- shwo the area where the renaming failed - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + -- shwo the new area + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + else + minetest.chat_send_player( pname, "No player {".. fields.ban_guest_name.."} in your guestlist of region {"..area.name.."}"); + end else - formspec = 'field[rename_new_name;Enter new name for area:;'..minetest.formspec_escape( area.name )..']'; - formspec = 'field[delete_confirm;'..minetest.formspec_escape( 'Really delete area \"'..area.name.. - '\" (owned by '..area.owner..')? Confirm with YES:')..';-type yes in capitals to confirm-]'; + minetest.chat_send_player( pname, 'Permission denied. You do not have the correct privileg.'); end + ----------------------------------------------------------------------- + -- delete area + elseif( fields.delete + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID + + local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table + + -- a player can only delete own regions with privileg - region_mark or as admin + -- check owner with privileg or region admin + if markers:check_region_mark(pname, area.owner) then -- owner with privileg or admin + + -- get name of region + formspec = 'field[rename_new_name;Enter new name for area:;'..minetest.formspec_escape( area.name )..']'; + -- confirm + formspec = 'field[delete_confirm;'..minetest.formspec_escape( 'Really delete area \"'..area.name.. + '\" (owned by '..area.owner..')? Confirm with YES:')..';-type yes in capitals to confirm-]'; + + elseif raz:get_region_attribute(menu_data.selected, "owner" ) ~= pname then + minetest.chat_send_player( pname, 'Permission denied. You are not owner of this region!'); + else + minetest.chat_send_player( pname, "Permission denied. missing privileg \'region_mark\'!"); + + -- show the area where the renaming failed + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + end + elseif( fields.delete_confirm - and menu_data.selected - and areas.areas[ menu_data.selected ] ) then - - local area = areas.areas[ menu_data.selected ]; - local old_owner = area.owner; + and menu_data.selected -- raz_store-ID is set + and raz.raz_store:get_area(menu_data.selected) ) then -- there is an region for this ID - local subareas = {}; - for i,v in pairs( areas.areas ) do - if( v.parent and v.parent == menu_data.selected ) then - table.insert( subareas, i ); - end - end + -- there are no checks here - those happened before + local area = markers:convert_to_areas(menu_data.selected) -- get raz_store converted to an areas-table - -- a player can only delete own areas or subareas of own areas - if( area.owner ~= pname - and not( area.parent - and areas.areas[ area.parent ] - and areas.areas[ area.parent ].owner - and areas.areas[ area.parent ].owner == pname ) - and not( minetest.check_player_privs(pname, {areas=true}))) then + -- a player can only delete own areas + -- check owner with privileg or region admin + if markers:check_region_mark(pname, area.owner) then -- owner with privileg or admin - minetest.chat_send_player( pname, 'Permission denied. You own neither the area itshelf nor its parent area.'); - -- shwo the renamed area - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - - -- avoid accidents - elseif( fields.delete_confirm ~= 'YES' ) then - minetest.chat_send_player( pname, 'Delition of area \"'..tostring( area.name )..'\" (owned by '..old_owner..') aborted.'); - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - - -- only areas without subareas can be deleted - elseif( #subareas > 0 ) then - minetest.chat_send_player( pname, 'The area has '..tostring( #subareas )..' subarea(s). Please delete those first!'); - formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); - + -- avoid accidents + if( fields.delete_confirm ~= 'YES' ) then + minetest.chat_send_player( pname, 'Delition of area \"'..tostring( area.name )..'\" (owned by '..area.owner..') aborted.'); + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + else + + minetest.chat_send_player( pname, 'Area \"'..tostring( area.name )..'\" (owned by '..area.owner..') deleted.'); + -- really delete + raz:delete_region(menu_data.selected) + -- show the list of areas owned by the previous owner + formspec = markers.get_area_list_formspec(ppos, player, 'player', menu_data.pos, area.owner, nil ); + end else - minetest.chat_send_player( pname, 'Area \"'..tostring( area.name )..'\" (owned by '..old_owner..') deleted.'); - -- really delete - areas:remove( menu_data.selected, false ); -- no recursive delete - areas:save(); - -- show the list of areas owned by the previous owner - formspec = markers.get_area_list_formspec(ppos, player, 'player', menu_data.pos, old_owner, nil ); + minetest.chat_send_player( pname, 'Permission denied. You are not owner of this region!'); + -- shwo the area where the renaming failed + formspec = markers.get_area_desc_formspec( menu_data.selected, player, menu_data.pos ); + end - - - elseif( fields.show_parent - and menu_data.selected - and areas.areas[ menu_data.selected ] - and areas.areas[ menu_data.selected ].parent ) then - - formspec = markers.get_area_desc_formspec( areas.areas[ menu_data.selected ].parent, player, menu_data.pos ); - - - elseif( fields.list_player_areas - and menu_data.selected - and areas.areas[ menu_data.selected ] ) then - - formspec = markers.get_area_list_formspec(ppos, player, 'player', menu_data.pos, areas.areas[ menu_data.selected ].owner, nil ); - - - elseif( fields.list_subareas - and menu_data.selected - and areas.areas[ menu_data.selected ] ) then - - formspec = markers.get_area_list_formspec(ppos, player, 'subareas', menu_data.pos, menu_data.selected, nil ); - + ----------------------------------------------------------------------- + -- list_main_areas elseif( fields.list_main_areas ) then - formspec = markers.get_area_list_formspec(ppos, player, 'main_areas', menu_data.pos, nil, nil ); - + formspec = markers.get_area_list_formspec(ppos, player, 'main_areas', menu_data.pos, nil, nil ); + + + ----------------------------------------------------------------------- + -- list_areas_at elseif( fields.list_areas_at - and menu_data.pos ) then + and menu_data.pos ) then - formspec = markers.get_area_list_formspec(ppos, player, 'pos', menu_data.pos, menu_data.pos, nil ); +-- formspec = markers.get_area_list_formspec(ppos, player, 'pos', menu_data.pos, menu_data.pos, nil ); + formspec = markers.get_area_list_formspec(ppos, player, 'all', menu_data.pos, menu_data.pos, nil ); + ----------------------------------------------------------------------- + -- markers_area_list_selection elseif( fields.markers_area_list_selection - and menu_data.typ - and menu_data.typ == 'area_list' - and menu_data.list - and #menu_data.list > 0 ) then + and menu_data.typ + and menu_data.typ == 'area_list' + and menu_data.list + and #menu_data.list > 0 ) then local field_data = fields.markers_area_list_selection:split( ':' ); if( not( field_data ) or #field_data < 2 ) then - field_data = { '', '' }; + field_data = { '', '' }; end local selected = tonumber( field_data[ 2 ] ); @@ -843,10 +814,11 @@ markers.form_input_handler_areas = function( player, formname, fields) formspec = markers.get_area_desc_formspec( tonumber( menu_data.list[ selected ] ), player, menu_data.pos ); else - -- on single click, just show the position of that particular area - formspec = markers.get_area_list_formspec(ppos, player, menu_data.mode, menu_data.pos, menu_data.mode_data, selected ); + -- on single click, just show the position of that particular area + formspec = markers.get_area_list_formspec(ppos, player, menu_data.mode, menu_data.pos, menu_data.mode_data, selected ); end -]]-- + + else return false; end @@ -884,25 +856,20 @@ markers.show_marker_stone_formspec = function( player, pos ) local min_area_size = 100000000000; for id, area in pairs(raz.raz_store:get_areas_for_pos(pos)) do - --for id, area in pairs(areas.areas) do - -- if( pos.x >= area.pos1.x and pos.x <= area.pos2.x and - -- pos.y >= area.pos1.y and pos.y <= area.pos2.y and - -- pos.z >= area.pos1.z and pos.z <= area.pos2.z )then - -- ignore y (height) value because some areas may go from bottom to top - local area_size = math.abs( area.max.x - area.min.x ) - * math.abs( area.max.z - area.min.z ); + -- ignore y (height) value because some areas may go from bottom to top + local area_size = math.abs( area.max.x - area.min.x ) + * math.abs( area.max.z - area.min.z ); - -- collect subareas that have the same size - if( area_size == min_area_size ) then - table.insert(found_areas, id ); - -- we have found a smaller area - that is more intresting here - elseif( area_size <= min_area_size ) then - found_areas = {}; - min_area_size = area_size; - table.insert(found_areas, id ); - end - -- end + -- collect subareas that have the same size + if( area_size == min_area_size ) then + table.insert(found_areas, id ); + -- we have found a smaller area - that is more intresting here + elseif( area_size <= min_area_size ) then + found_areas = {}; + min_area_size = area_size; + table.insert(found_areas, id ); + end end @@ -910,9 +877,9 @@ markers.show_marker_stone_formspec = function( player, pos ) if( #found_areas < 1 ) then formspec = 'size[4,3]'.. - 'label[0.5,0.5;This position is not protected.]'.. - 'button[1.0,1.5;2,0.5;list_main_areas;List all main areas]'.. - 'button_exit[3.0,1.5;1,0.5;abort;OK]'; + 'label[0.5,0.5;This position is not protected.]'.. + 'button[1.0,1.5;2,0.5;list_main_areas;List all main areas]'.. + 'button_exit[3.0,1.5;1,0.5;abort;OK]'; -- found exactly one areaa - display it elseif( #found_areas == 1 ) then @@ -953,7 +920,7 @@ markers.show_marker_stone_formspec = function( player, pos ) if( own_area > 0 ) then formspec = markers.get_area_desc_formspec( own_area, player, pos ); - +--[[ -- if the player owns none of these areas, show the topmost (parentless) area elseif( parent_area > 0 ) then @@ -968,6 +935,7 @@ markers.show_marker_stone_formspec = function( player, pos ) -- our superficial analysis of the structure of the areas failed; it is up to the player to -- find out which of the candidates he is intrested in; we list them all +]]-- else formspec = markers.get_area_list_formspec(ppos, player, 'pos', pos, pos, nil );