From 3a19c755fbcd83760ebe59a0b793aa9e798ac4f3 Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Thu, 25 Feb 2016 08:52:28 +0100
Subject: [PATCH] Web interface: Fix base_location setting for register.shtml
 page

---
 spectrum_manager/src/html/header.shtml        | 1 +
 spectrum_manager/src/html/js/app.js           | 2 +-
 spectrum_manager/src/server.cpp               | 9 +++++++++
 tests/tests_output/localhost/vcard/client.dat | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/spectrum_manager/src/html/header.shtml b/spectrum_manager/src/html/header.shtml
index b06dc197..27983b48 100644
--- a/spectrum_manager/src/html/header.shtml
+++ b/spectrum_manager/src/html/header.shtml
@@ -11,6 +11,7 @@
     <script src="/js/jquery.js"></script>
     <script src="/js/jquery-ui.js"></script>
     <script src="/js/jquery.cookie.js"></script>
+    <script src="/js/config.js"></script>
     <script src="/js/app.js"></script>
     <title>Spectrum 2</title>
   </head>
diff --git a/spectrum_manager/src/html/js/app.js b/spectrum_manager/src/html/js/app.js
index dc601b79..ecc7f68a 100644
--- a/spectrum_manager/src/html/js/app.js
+++ b/spectrum_manager/src/html/js/app.js
@@ -214,7 +214,7 @@ function fill_users_register_form() {
 			"password": $("#password").val()
 		};
 
-		$.post("/api/v1/users/add", postdata, function(data) {
+		$.post(BaseLocation + "api/v1/users/add", postdata, function(data) {
 			if (data.error) {
 				$('#error').text(data.message);
 			}
diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp
index 3aac24fc..4aabf938 100644
--- a/spectrum_manager/src/server.cpp
+++ b/spectrum_manager/src/server.cpp
@@ -105,6 +105,14 @@ Server::Server(ManagerConfig *config, const std::string &config_file) {
 		footer.close();
 	}
 
+	std::ofstream output;
+	output.open(std::string(CONFIG_STRING(config, "service.data_dir") + "/js/config.js").c_str(), std::ios::out);
+	if (output.fail()) {
+		LOG4CXX_ERROR(logger, "Cannot open " << std::string(CONFIG_STRING(config, "service.data_dir") + "/js/config.js") << " for writing: " << strerror(errno));
+	}
+	output << "var BaseLocation = \"" << CONFIG_STRING(m_config, "service.base_location") << "\";\n";
+	output.close();
+
 	m_storageCfg = new Config();
 	m_storageCfg->load(config_file);
 	
@@ -235,6 +243,7 @@ bool Server::is_authorized(const struct mg_connection *conn, struct http_message
 		!mg_vcmp(&hm->uri, "/js/jquery.js") ||
 		!mg_vcmp(&hm->uri, "/js/jquery-ui.js") ||
 		!mg_vcmp(&hm->uri, "/js/jquery.cookie.js") ||
+		!mg_vcmp(&hm->uri, "/js/config.js") ||
 		!mg_vcmp(&hm->uri, "/js/app.js") ||
 		!mg_vcmp(&hm->uri, "/users/register.shtml") ||
 		!mg_vcmp(&hm->uri, "/api/v1/users/add") ||
diff --git a/tests/tests_output/localhost/vcard/client.dat b/tests/tests_output/localhost/vcard/client.dat
index a5b37957..96c1073d 100644
--- a/tests/tests_output/localhost/vcard/client.dat
+++ b/tests/tests_output/localhost/vcard/client.dat
@@ -20,8 +20,8 @@ return {
 		};
 	};
 	["attr"] = {
-		["version"] = "2.0";
 		["prodid"] = "-//HandGen//NONSGML vGen v1.0//EN";
+		["version"] = "2.0";
 		["xmlns"] = "vcard-temp";
 	};
 	["name"] = "vCard";