diff options
| author | louiz’ <louiz@louiz.org> | 2017-07-21 17:27:03 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-07-21 17:27:03 +0200 |
| commit | 308869aa73c7c03d7e9fad2a780bf132e03c8c5a (patch) | |
| tree | bd594a4f2457fa927f0af0168b6adf683b6f65a3 /src/xmpp | |
| parent | f125de4833d65a83d1f550f4bfbff4d5e4c333b2 (diff) | |
| download | biboumi-308869aa73c7c03d7e9fad2a780bf132e03c8c5a.tar.gz biboumi-308869aa73c7c03d7e9fad2a780bf132e03c8c5a.tar.bz2 biboumi-308869aa73c7c03d7e9fad2a780bf132e03c8c5a.tar.xz biboumi-308869aa73c7c03d7e9fad2a780bf132e03c8c5a.zip | |
Do not ignore empty values when receiving a data form
Otherwise, these fields cannot be emptied by the user
fix #3281
Diffstat (limited to 'src/xmpp')
| -rw-r--r-- | src/xmpp/biboumi_adhoc_commands.cpp | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp index 27b079b..60af506 100644 --- a/src/xmpp/biboumi_adhoc_commands.cpp +++ b/src/xmpp/biboumi_adhoc_commands.cpp @@ -399,24 +399,20 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com options.col<Database::VerifyCert>() = val; } - else if (field->get_tag("var") == "fingerprint" && value && - !value->get_inner().empty()) + else if (field->get_tag("var") == "fingerprint" && value) { options.col<Database::TrustedFingerprint>() = value->get_inner(); } #endif // BOTAN_FOUND - else if (field->get_tag("var") == "pass" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "pass" && value) options.col<Database::Pass>() = value->get_inner(); - else if (field->get_tag("var") == "after_connect_command" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "after_connect_command") options.col<Database::AfterConnectionCommand>() = value->get_inner(); - else if (field->get_tag("var") == "username" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "username" && value) { auto username = value->get_inner(); // The username must not contain spaces @@ -424,16 +420,13 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com options.col<Database::Username>() = username; } - else if (field->get_tag("var") == "realname" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "realname" && value) options.col<Database::Realname>() = value->get_inner(); - else if (field->get_tag("var") == "encoding_out" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "encoding_out" && value) options.col<Database::EncodingOut>() = value->get_inner(); - else if (field->get_tag("var") == "encoding_in" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "encoding_in" && value) options.col<Database::EncodingIn>() = value->get_inner(); } @@ -572,16 +565,13 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const { const XmlNode *value = field->get_child("value", "jabber:x:data"); - if (field->get_tag("var") == "encoding_out" && - value && !value->get_inner().empty()) + if (field->get_tag("var") == "encoding_out" && value) options.col<Database::EncodingOut>() = value->get_inner(); - else if (field->get_tag("var") == "encoding_in" && - value && !value->get_inner().empty()) + else if (field->get_tag("var") == "encoding_in" && value) options.col<Database::EncodingIn>() = value->get_inner(); - else if (field->get_tag("var") == "persistent" && - value) + else if (field->get_tag("var") == "persistent" && value) options.col<Database::Persistent>() = to_bool(value->get_inner()); else if (field->get_tag("var") == "record_history" && value && !value->get_inner().empty()) |