summaryrefslogtreecommitdiff
path: root/src/xmpp
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-04-29 01:40:46 +0200
committerlouiz’ <louiz@louiz.org>2018-04-29 01:40:46 +0200
commit7592d966e684410f603942e34413375c8d98ac9e (patch)
tree7b3af3008c6a6532edbf4f4fe3534778886e669e /src/xmpp
parentefa63ee5cb4be3aebc1489dc9db936eea26660d4 (diff)
downloadbiboumi-7592d966e684410f603942e34413375c8d98ac9e.tar.gz
biboumi-7592d966e684410f603942e34413375c8d98ac9e.tar.bz2
biboumi-7592d966e684410f603942e34413375c8d98ac9e.tar.xz
biboumi-7592d966e684410f603942e34413375c8d98ac9e.zip
Missing fields in a data-form response are now interpreted as an empty value
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/biboumi_adhoc_commands.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index 53806d6..b62dcfc 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -177,6 +177,7 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session,
{
const Jid owner(session.get_owner_jid());
auto options = Database::get_global_options(owner.bare());
+ options.clear();
for (const XmlNode* field: x->get_children("field", "jabber:x:data"))
{
const XmlNode* value = field->get_child("value", "jabber:x:data");
@@ -400,7 +401,8 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
server_domain = target.local;
auto options = Database::get_irc_server_options(owner.local + "@" + owner.domain,
server_domain);
- auto commands = Database::get_after_connection_commands(options);
+ options.clear();
+ Database::AfterConnectionCommands commands{};
for (const XmlNode* field: x->get_children("field", "jabber:x:data"))
{
@@ -608,6 +610,7 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const
const Iid iid(target.local, {});
auto options = Database::get_irc_channel_options(requester.bare(),
iid.get_server(), iid.get_local());
+ options.clear();
for (const XmlNode *field: x->get_children("field", "jabber:x:data"))
{
const XmlNode *value = field->get_child("value", "jabber:x:data");