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

change code style

Browse Source
This commit is contained in:
einhornimmond 2021-03-03 14:48:13 +01:00 committed by Ulf Gebhardt
parent f4a67b476d
commit c1e82dda94
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 175 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,15 +59,18 @@ void EmailManager::addEmail(model::Email* email) {
if (mDisableEmail) {
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();
Poco::AutoPtr<model::table::User> email_model;
if (email_user) {
email_model = email_user->getModel();
log_message += email_model->getNameWithEmailHtml();
}
else {
if (email_model.isNull()) {
log_message += "<missing>";
}
log_message += ", type: ";
log_message += model::Email::emailTypeString(email->getType());
mEmailLog.log(log_message);
delete email;
return;
}
@ -115,13 +118,12 @@ int EmailManager::ThreadFunction()
Poco::Net::MailMessage mailMessage;
mailMessage.setSender(mEmailAccount.sender);
Languages lang_code = ServerConfig::g_default_locale;
if (email->getUser()) {
Poco::AutoPtr<model::table::User> userModel = email->getUser()->getModel();
auto email_user = email->getUser();
if (email_user) {
Poco::AutoPtr<model::table::User> userModel = email_user->getModel();
if (!userModel.isNull()) {
userModel->lock("EmailManager::ThreadFunction");
lang_code = LanguageManager::languageFromString(userModel->getLanguageKey());
userModel->unlock();
if (lang_code > LANG_COUNT) lang_code = ServerConfig::g_default_locale;
}
}
@ -132,11 +134,10 @@ int EmailManager::ThreadFunction()
mailClientSession.sendMessage(mailMessage);
// add for debugging
if (email->getUser()) {
if (email_user) {
//printf("send email to %s\n", user_model->getEmail().data());
auto user_model = email->getUser()->getModel();
auto user_model = email_user->getModel();
std::string log_message = "Email sended to: ";
auto email_user = email->getUser();
if (user_model) {
log_message += email_user->getModel()->getNameWithEmailHtml();
}

6
src/cpp/model/Session.cpp
View File

@ -145,8 +145,8 @@ Poco::AutoPtr<controller::EmailVerificationCode> Session::getEmailVerificationCo
bool Session::adminCreateUser(const std::string& first_name, const std::string& last_name, const std::string& email, int group_id, const std::string &baseUrl)
{
Profiler usedTime;
if (mNewUser->getModel()->getRole() != model::table::ROLE_ADMIN) {
auto user_model = mNewUser->getModel();
if (user_model->getRole() != model::table::ROLE_ADMIN) {
addError(new Error(gettext("Benutzer"), gettext("Eingeloggter Benutzer ist kein Admin")), false);
return false;
}
@ -167,7 +167,7 @@ bool Session::adminCreateUser(const std::string& first_name, const std::string&
// check if user with that email already exist
if (mNewUser->getModel()->isExistInDB("email", email)) {
if (user_model->isExistInDB("email", email)) {
addError(new Error(gettext("E-Mail"), gettext("F&uuml;r diese E-Mail Adresse gibt es bereits einen Account")), false);
return false;
}