IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update email log, use not longer html string

Browse Source
This commit is contained in:
Dario 2020-07-30 15:35:04 +02:00
parent cce7b7d4a9
commit 946b951080
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpp/SingletonManager/EmailManager.cpp
View File

@ -60,7 +60,7 @@ void EmailManager::addEmail(model::Email* email) {
std::string log_message = "Email should be sended to: ";
auto email_user = email->getUser();
if (email_user && email_user->getModel()) {
log_message += email_user->getModel()->getNameWithEmailHtml();
log_message += email_user->getModel()->getNameWithEmail();
}
else {
log_message += "<missing>";
@ -138,7 +138,7 @@ int EmailManager::ThreadFunction()
std::string log_message = "Email sended to: ";
auto email_user = email->getUser();
if (user_model) {
log_message += email_user->getModel()->getNameWithEmailHtml();
log_message += email_user->getModel()->getNameWithEmail();
}
else {
log_message += "<missing>";

1
src/cpp/model/table/User.h
View File

@ -58,6 +58,7 @@ namespace model {
inline const std::string getFirstName() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mFirstName; }
inline const std::string getLastName() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mLastName; }
inline std::string getNameWithEmailHtml() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mFirstName + "&nbsp;" + mLastName + "&nbsp;&lt;" + mEmail + "&gt;"; }
inline std::string getNameWithEmail() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mFirstName + " " + mLastName + "<" + mEmail + ">"; }
inline const Poco::UInt64 getPasswordHashed() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); return mPasswordHashed; }
inline RoleType getRole() const { std::shared_lock<std::shared_mutex> _lock(mSharedMutex); if (mRole.isNull()) return ROLE_NONE; return static_cast<RoleType>(mRole.value()); }
inline const unsigned char* getPublicKey() const { if (mPublicKey.isNull()) return nullptr; return mPublicKey.value().content().data(); }