From 1e95f7a52fbafa8bc1943d996ad69d6d21d42d80 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 14 Jun 2021 16:56:03 +0200 Subject: [PATCH] fix syntax error occuring by merging --- .../src/cpp/JSONInterface/JsonUpdateUserInfos.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp index 53764b301..5aa137ce0 100644 --- a/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp +++ b/login_server/src/cpp/JSONInterface/JsonUpdateUserInfos.cpp @@ -144,7 +144,8 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params) jsonErrorsArray.add("User.disabled isn't a boolean or integer"); } } - else if ("User.language" == name && value.size() > 0) { + else if ("User.language" == name && value.size() > 0) + { std::string str_val = validateString(value, "User.language", jsonErrorsArray); if (str_val.size() > 0) { @@ -159,14 +160,13 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params) } } - else if ("User.password" == name && (ServerConfig::g_AllowUnsecureFlags & ServerConfig::UNSECURE_PASSWORD_REQUESTS) == ServerConfig::UNSECURE_PASSWORD_REQUESTS) { + else if ("User.password" == name && (ServerConfig::g_AllowUnsecureFlags & ServerConfig::UNSECURE_PASSWORD_REQUESTS) == ServerConfig::UNSECURE_PASSWORD_REQUESTS) + { std::string str_val = validateString(value, "User.password", jsonErrorsArray); - if (str_val.size() > 0) { + if (str_val.size() > 0) + { - if (!user->hasPassword() || isOldPasswordValid(updates, jsonErrorsArray)) - { - if (!user->hasPassword() || isOldPasswordValid(updates, jsonErrorsArray)) { NotificationList errors; @@ -193,7 +193,7 @@ Poco::JSON::Object* JsonUpdateUserInfos::handle(Poco::Dynamic::Var params) password_changed = true; break; // -1 = stored pubkey and private key didn't match - case -1: jsonErrorsArray.add("stored pubkey and private key didn't match"); break; + case -1: jsonErrorsArray.add("stored pubkey and private key didn't match"); break; } }