stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Libtransport: Fix 'register' command in AdminInterface

Browse source
This commit is contained in:
Jan Kaluza 2016-02-22 09:23:23 +01:00
parent cb26fb0258
commit 10f8f610d0
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libtransport/AdminInterface.cpp
View file

@ -273,10 +273,10 @@ void AdminInterface::handleQuery(Swift::Message::ref message) {
res.jid = args[1];
res.uin = args[2];
if (args.size() == 3) {
res.password = args[3];
res.password = "";
}
else {
res.password = args[4];
res.password = args[3];
}
res.language = "en";
res.encoding = "utf-8";

9
spectrum/src/frontends/xmpp/XMPPFrontend.cpp
View file

@ -396,4 +396,13 @@ void XMPPFrontend::handleCapsChanged(const Swift::JID& jid) {
onCapabilitiesReceived(jid, m_entityCapsManager->getCaps(jid));
}
std::string XMPPFrontend::getRegistrationFields() {
std::string fields = "Jabber ID";
// if (CONFIG_BOOL(m_config, "registration.needRegistration")) {
fields += "\n" + CONFIG_STRING(m_config, "registration.username_label") + "\n";
fields += CONFIG_STRING(m_config, "registration.password_label");
// }
return fields;
}
}

2
spectrum/src/frontends/xmpp/XMPPFrontend.h
View file

@ -94,6 +94,8 @@ namespace Transport {
return m_rawXML;
}
std::string getRegistrationFields();
private:
void handleConnected();
void handleConnectionError(const Swift::ComponentError &error);

2
spectrum_manager/src/CMakeLists.txt
View file

@ -18,10 +18,12 @@ target_link_libraries(spectrum2_manager transport ${APPLE_FRAMEWORKS})
endif()
INSTALL(TARGETS spectrum2_manager RUNTIME DESTINATION bin)
IF(NOT EXISTS "/etc/spectrum2/spectrum_manager.cfg")
INSTALL(FILES
spectrum_manager.cfg
DESTINATION /etc/spectrum2
)
ENDIF()
INSTALL(DIRECTORY
html