diff --git a/src/cpp/HTTPInterface/LoginPage.cpp b/src/cpp/HTTPInterface/LoginPage.cpp index a7ba4b4cf..9a068c60d 100644 --- a/src/cpp/HTTPInterface/LoginPage.cpp +++ b/src/cpp/HTTPInterface/LoginPage.cpp @@ -59,7 +59,7 @@ void LoginPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco::Net:: return; case USER_NO_PRIVATE_KEY: case USER_COMPLETE: - response.redirect(ServerConfig::g_serverPath + "/"); + response.redirect(ServerConfig::g_php_serverPath + "/"); return; } diff --git a/src/cpp/JSONInterface/JsonGetLogin.cpp b/src/cpp/JSONInterface/JsonGetLogin.cpp index bb41ff299..a35af6d3d 100644 --- a/src/cpp/JSONInterface/JsonGetLogin.cpp +++ b/src/cpp/JSONInterface/JsonGetLogin.cpp @@ -61,7 +61,7 @@ Poco::JSON::Object* JsonGetLogin::handle(Poco::Dynamic::Var params) return result; } result->set("state", "success"); - result->set("clientIP", session->getClientIp()); + result->set("clientIP", session->getClientIp().toString()); result->set("user", user->getJson()); return result; } diff --git a/src/cpp/ServerConfig.cpp b/src/cpp/ServerConfig.cpp index e914e5466..f356a4191 100644 --- a/src/cpp/ServerConfig.cpp +++ b/src/cpp/ServerConfig.cpp @@ -38,6 +38,7 @@ namespace ServerConfig { EmailAccount g_EmailAccount; int g_SessionTimeout = SESSION_TIMEOUT_DEFAULT; std::string g_serverPath; + std::string g_php_serverPath; bool loadMnemonicWordLists() { @@ -90,6 +91,7 @@ namespace ServerConfig { DISASM_FALSERET; g_SessionTimeout = cfg.getInt("session.timeout", SESSION_TIMEOUT_DEFAULT); g_serverPath = cfg.getString("loginServer.path", ""); + g_php_serverPath = cfg.getString("phpServer.url", ""); return true; } diff --git a/src/cpp/ServerConfig.h b/src/cpp/ServerConfig.h index f8dd5cf4b..8026422bc 100644 --- a/src/cpp/ServerConfig.h +++ b/src/cpp/ServerConfig.h @@ -34,6 +34,7 @@ namespace ServerConfig { extern EmailAccount g_EmailAccount; extern int g_SessionTimeout; extern std::string g_serverPath; + extern std::string g_php_serverPath; bool loadMnemonicWordLists(); diff --git a/src/cpsp/login.cpsp b/src/cpsp/login.cpsp index 0373fd765..d7fca3b36 100644 --- a/src/cpsp/login.cpsp +++ b/src/cpsp/login.cpsp @@ -46,7 +46,7 @@ return; case USER_NO_PRIVATE_KEY: case USER_COMPLETE: - response.redirect(ServerConfig::g_serverPath + "/"); + response.redirect(ServerConfig::g_php_serverPath + "/"); return; }