From da594fa541a971437711ede944a8ac0ce328714f Mon Sep 17 00:00:00 2001 From: Dario Date: Fri, 25 Oct 2019 08:56:56 +0200 Subject: [PATCH] update email text, adding email check as separat field for json call from php --- src/cpp/model/Session.cpp | 4 +++- src/cpp/model/User.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index 4edbe043d..bd58c0337 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -198,7 +198,9 @@ bool Session::createUser(const std::string& first_name, const std::string& last_ ss << "Hallo " << first_name << " " << last_name << "," << std::endl << std::endl; ss << "Du oder jemand anderes hat sich soeben mit dieser E-Mail Adresse bei Gradido registriert. " << std::endl; ss << "Wenn du es warst, klicke bitte auf den Link: https://gradido2.dario-rekowski.de/account/checkEmail/" << mEmailVerificationCode << std::endl; - ss << "oder kopiere den Code: " << mEmailVerificationCode << " selbst dort hinein." << std::endl << std::endl; + //ss << "oder kopiere den Code: " << mEmailVerificationCode << " selbst dort hinein." << std::endl; + ss << "oder kopiere den obigen Link in Dein Browserfenster." << std::endl; + ss << std::endl; ss << "Mit freundlichen Grüße" << std::endl; ss << "Dario, Gradido Server Admin" << std::endl; diff --git a/src/cpp/model/User.cpp b/src/cpp/model/User.cpp index 1c6943bb9..862a65e3e 100644 --- a/src/cpp/model/User.cpp +++ b/src/cpp/model/User.cpp @@ -371,6 +371,7 @@ Poco::JSON::Object User::getJson() userObj.set("email", mEmail); userObj.set("public_hex", mPublicHex); userObj.set("state", userStateToString(mState)); + userObj.set("email_checked", mEmailChecked); unlock(); return userObj; }