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

Merge branch 'master' into 1.4.0

Browse Source
This commit is contained in:
WolverinDEV
2019-07-23 15:54:04 +02:00
parent af4106614c 76dad7e100
commit e38199e6c7
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/client/ConnectedClientCommandHandler.cpp
+7
View File
@@ -1707,9 +1707,13 @@ CommandResult ConnectedClient::handleCommandChannelEdit(Command &cmd) {
bool target_channel_type_changed = false;
ChannelType::ChannelType target_channel_type = channel->channelType();
CHANNEL_PERM_TEST_INIT;
CHANNEL_PERMISSION_TEST(permission::i_channel_modify_power, permission::i_channel_needed_modify_power, channel, true);
for (const auto &key : cmd[0].keys()) {
if(key == "cid")
continue;
if(key == "return_code")
continue;
const auto &property = property::info<property::ChannelProperties>(key);
if(*property == property::CHANNEL_UNDEFINED) {
@@ -1727,6 +1731,9 @@ CommandResult ConnectedClient::handleCommandChannelEdit(Command &cmd) {
continue;
}
if(channel->properties()[*property].as<string>() == cmd[key].as<string>())
continue; /* we dont need to update stuff which is the same */
if(key == "channel_icon_id") {
CHANNEL_PERMISSION_TEST(permission::i_channel_permission_modify_power, permission::i_channel_needed_permission_modify_power, channel, true);
} else if (key == "channel_order") {