TeaSpeak/Teaspeak-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed skip and negate flags

Browse Source
This commit is contained in:
WolverinDEV
2019-07-31 15:15:34 +02:00
parent 76dad7e100
commit 356822a0c5
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/client/ConnectedClientCommandHandler.cpp
+10 -9
View File
@@ -1162,8 +1162,8 @@ CommandResult ConnectedClient::handleCommandChannelGroupAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0
cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permnegated"].as<bool>() ? 1 : 0
);
updateList |= permission_is_group_property(permType);
}
@@ -2335,8 +2335,9 @@ CommandResult ConnectedClient::handleCommandChannelAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0
cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permnegated"].as<bool>() ? 1 : 0
);
updateClients |= permission_is_client_property(permType);
update_view |= permType == permission::i_channel_needed_view_power;
@@ -2820,8 +2821,8 @@ CommandResult ConnectedClient::handleCommandServerGroupAddPerm(Command &cmd) {
permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0
cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permnegated"].as<bool>() ? 1 : 0
);
sgroupUpdate |= permission_is_group_property(permType);
checkTp |= permission_is_client_property(permType);
@@ -2978,8 +2979,8 @@ CommandResult ConnectedClient::handleCommandServerGroupAutoAddPerm(ts::Command&
permission::v2::PermissionUpdateType::set_value,
permission::v2::PermissionUpdateType::do_nothing,
cmd[index]["permnegated"].as<bool>() ? 1 : 0,
cmd[index]["permskip"].as<bool>() ? 1 : 0
cmd[index]["permskip"].as<bool>() ? 1 : 0,
cmd[index]["permnegated"].as<bool>() ? 1 : 0
);
}
}
@@ -6456,7 +6457,7 @@ CommandResult ConnectedClient::handleCommandPlaylistAddPerm(ts::Command &cmd) {
playlist->permissions()->setPermissionGranted(permType, cmd[index]["permvalue"], nullptr);
} else {
playlist->permissions()->setPermission(permType, cmd[index]["permvalue"], nullptr, cmd[index]["permnegated"], cmd[index]["permskip"]);
playlist->permissions()->setPermission(permType, cmd[index]["permvalue"], nullptr, cmd[index]["permskip"], cmd[index]["permnegated"]);
}
}