From c44d57135100cb7e86e6666998be580c572992c9 2012-04-11 09:16:56
From: Jan Kaluza <hanzz.k@gmail.com>
Date: 2012-04-11 09:16:56
Subject: [PATCH] Send backend config

---

diff --git a/plugin/cpp/networkplugin.cpp b/plugin/cpp/networkplugin.cpp
index 1b2436cac3404bbb3fae6aa90cd33a911deac3b7..c6d52eb7e6aa519a15e1f272e874be10a6388c5c 100644
--- a/plugin/cpp/networkplugin.cpp
+++ b/plugin/cpp/networkplugin.cpp
@@ -62,7 +62,21 @@ NetworkPlugin::~NetworkPlugin() {
 
 void NetworkPlugin::sendConfig(const PluginConfig &cfg) {
 	std::string data = "[registration]";
-	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0");
+	data += std::string("needPassword=") + (cfg.m_needPassword ? "1" : "0") + "\n";
+
+	for (std::vector<std::string>::const_iterator it = cfg.m_extraFields.begin(); it != cfg.m_extraFields.end(); it++) {
+		data += std::string("extraField=") + (*it) + "\n";
+	}
+
+	pbnetwork::BackendConfig m;
+	m.set_config(data);
+
+	std::string message;
+	m.SerializeToString(&message);
+
+	WRAP(message, pbnetwork::WrapperMessage_Type_TYPE_BACKEND_CONFIG);
+
+	send(message);
 }
 
 void NetworkPlugin::handleMessage(const std::string &user, const std::string &legacyName, const std::string &msg, const std::string &nickname, const std::string &xhtml) {
diff --git a/src/userregistry.cpp b/src/userregistry.cpp
index 5394671d55742cc3d0149ba78f81102325e9f8a5..8d8a3975bd812c0ed7d6aa8fba6b081ad43609cc 100644
--- a/src/userregistry.cpp
+++ b/src/userregistry.cpp
@@ -41,10 +41,10 @@ void UserRegistry::isValidUserPassword(const Swift::JID& user, Swift::ServerFrom
 	std::vector<std::string> const &x = CONFIG_VECTOR(config,"service.admin_jid");
 	if (std::find(x.begin(), x.end(), user.toBare().toString()) != x.end()) {
 		if (Swift::safeByteArrayToString(password) == CONFIG_STRING(config, "service.admin_password")) {
-		session->handlePasswordValid();
+			session->handlePasswordValid();
 		}
 		else {
-		session->handlePasswordInvalid();
+			session->handlePasswordInvalid();
 		}
 		return;
 	}