committed by
mathieui
parent
fdae7b03e0
commit
fbb93dbd08
@@ -3,6 +3,7 @@
|
||||
#include <utils/scopeguard.hpp>
|
||||
#include <bridge/bridge.hpp>
|
||||
#include <config/config.hpp>
|
||||
#include <utils/is_requester_allowed_to_persist.hpp>
|
||||
#include <utils/string.hpp>
|
||||
#include <utils/split.hpp>
|
||||
#include <xmpp/jid.hpp>
|
||||
@@ -159,6 +160,7 @@ void ConfigureGlobalStep1(XmppComponent&, AdhocSession& session, XmlNode& comman
|
||||
}
|
||||
}
|
||||
|
||||
if (utils::is_requester_allowed_to_persist(Jid(session.get_owner_jid())))
|
||||
{
|
||||
XmlSubNode persistent(x, "field");
|
||||
persistent["var"] = "persistent";
|
||||
@@ -208,7 +210,8 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session,
|
||||
bridge->set_record_history(options.col<Database::RecordHistory>());
|
||||
}
|
||||
else if (field->get_tag("var") == "persistent" &&
|
||||
value)
|
||||
value
|
||||
&& utils::is_requester_allowed_to_persist(Jid(session.get_owner_jid())))
|
||||
options.col<Database::GlobalPersistent>() = to_bool(value->get_inner());
|
||||
}
|
||||
|
||||
@@ -640,6 +643,7 @@ void insert_irc_channel_configuration_form(XmlNode& node, const Jid& requester,
|
||||
}
|
||||
}
|
||||
|
||||
if (utils::is_requester_allowed_to_persist(requester))
|
||||
{
|
||||
XmlSubNode persistent(x, "field");
|
||||
persistent["var"] = "persistent";
|
||||
@@ -699,7 +703,7 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const
|
||||
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 && utils::is_requester_allowed_to_persist(requester))
|
||||
options.col<Database::Persistent>() = to_bool(value->get_inner());
|
||||
else if (field->get_tag("var") == "record_history" &&
|
||||
value && !value->get_inner().empty())
|
||||
@@ -953,3 +957,4 @@ void GetIrcConnectionInfoStep1(XmppComponent& component, AdhocSession& session,
|
||||
|
||||
message = ss.str();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user