From 10f8f610d05d40d7583d331998117ab7ff1613ad Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Mon, 22 Feb 2016 09:23:23 +0100
Subject: [PATCH] Libtransport: Fix 'register' command in AdminInterface

---
 libtransport/AdminInterface.cpp              | 4 ++--
 spectrum/src/frontends/xmpp/XMPPFrontend.cpp | 9 +++++++++
 spectrum/src/frontends/xmpp/XMPPFrontend.h   | 2 ++
 spectrum_manager/src/CMakeLists.txt          | 2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/libtransport/AdminInterface.cpp b/libtransport/AdminInterface.cpp
index 7eaaeb71..3527c8b6 100644
--- a/libtransport/AdminInterface.cpp
+++ b/libtransport/AdminInterface.cpp
@@ -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";
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
index 8969af5a..a5101878 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
@@ -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;
+}
+
 }
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.h b/spectrum/src/frontends/xmpp/XMPPFrontend.h
index e627c163..c4e24a34 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.h
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.h
@@ -94,6 +94,8 @@ namespace Transport {
 				return m_rawXML;
 			}
 
+			std::string getRegistrationFields();
+
 		private:
 			void handleConnected();
 			void handleConnectionError(const Swift::ComponentError &error);
diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt
index ab0c5ed1..5e1535e4 100644
--- a/spectrum_manager/src/CMakeLists.txt
+++ b/spectrum_manager/src/CMakeLists.txt
@@ -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