Skip to content

Check the client for permission instead of the event source #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 19, 2021
Merged

Check the client for permission instead of the event source #300

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1778eeb
Check the client for permission instead of the event source
NanoBob Mar 11, 2021
fc7f60b
Added fallback to source in case the event is triggered from the serv…
NanoBob Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions [admin]/admin/server/admin_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ end
addEvent ( "aTeam", true )
addEventHandler ( "aTeam", _root, function ( action, name, r, g, b )
if checkClient( "command."..action, source, 'aTeam', action ) then return end
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
mdata = tostring ( data )
mdata = ""
if ( action == "createteam" ) then
Expand Down Expand Up @@ -878,7 +878,7 @@ addEventHandler ( "aPlayer", _root, function ( player, action, data, additional,
if not isElement( player ) then
return -- Ignore if player is no longer valid
end
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
local admin = source
local mdata = ""
local more = ""
Expand Down Expand Up @@ -1187,7 +1187,7 @@ end
addEvent ( "aVehicle", true )
addEventHandler ( "aVehicle", _root, function ( player, action, data )
if checkClient( "command."..action, source, 'aVehicle', action ) then return end
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
if ( not player ) then return end
local vehicle = getPedOccupiedVehicle ( player )
if ( vehicle ) then
Expand Down Expand Up @@ -1271,7 +1271,7 @@ addEvent ( "aResource", true )
addEventHandler ( "aResource", _root, function ( name, action )
if checkClient( "command."..action, source, 'aResource', action ) then return end
local pname = getPlayerName ( source )
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
local text = ""
if ( action == "start" ) then if ( startResource ( getResourceFromName ( name ), true ) ) then text = "started" end
elseif ( action == "restart" ) then
Expand All @@ -1298,7 +1298,7 @@ end )
addEvent ( "aServer", true )
addEventHandler ( "aServer", _root, function ( action, data, data2 )
if checkClient( "command."..action, source, 'aServer', action ) then return end
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
local mdata = tostring ( data )
local mdata2 = ""
if ( action == "setgame" ) then
Expand Down Expand Up @@ -1452,7 +1452,7 @@ addEventHandler ( "aMessage", _root, function ( action, data )
table.remove( aReports, 1 )
end
end
if ( hasObjectPermissionTo ( source, "general.adminpanel" ) ) then
if ( hasObjectPermissionTo ( client or source, "general.adminpanel" ) ) then
if ( action == "get" ) then
triggerClientEvent ( source, "aMessage", source, "get", aReports )
elseif ( action == "read" ) then
Expand Down Expand Up @@ -1487,7 +1487,7 @@ end )
addEvent ( "aBans", true )
addEventHandler ( "aBans", _root, function ( action, data, arg1, arg2, arg3 )
if checkClient( "command."..action, source, 'aBans', action ) then return end
if ( hasObjectPermissionTo ( source, "command."..action ) ) then
if ( hasObjectPermissionTo ( client or source, "command."..action ) ) then
local mdata = ""
local more = ""
if ( action == "banip" ) then
Expand Down Expand Up @@ -1548,7 +1548,7 @@ end )
addEvent ( "aExecute", true )
addEventHandler ( "aExecute", _root, function ( action, echo )
if checkClient( "command.execute", source, 'aExecute', action ) then return end
if ( hasObjectPermissionTo ( source, "command.execute" ) ) then
if ( hasObjectPermissionTo ( client or source, "command.execute" ) ) then
local result = loadstring("return " .. action)()
if ( echo == true ) then
local restring = ""
Expand Down