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 with explicit u8 the "grüßen" string

Browse Source
This commit is contained in:
Dario 2019-11-09 14:54:30 +01:00
parent 9d36f6eb3a
commit 190502445c
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/HTTPInterface/ElopageWebhook.cpp
View File

@ -241,6 +241,13 @@ int HandleElopageRequestTask::run()
mFirstName = mRequestData.get("payer[first_name]", ""); mFirstName = mRequestData.get("payer[first_name]", "");
mLastName = mRequestData.get("payer[last_name]", ""); mLastName = mRequestData.get("payer[last_name]", "");
printf("LastName: %s\n", mLastName.data());
for (int i = 0; i < mLastName.size(); i++) {
char c = mLastName.data()[i];
printf("%d ", c);
}
printf("\n\n");
// validate input // validate input
if (!validateInput()) { if (!validateInput()) {
// if input is invalid we can stop now // if input is invalid we can stop now
@ -301,7 +308,8 @@ int HandleElopageRequestTask::run()
//ss << "oder kopiere den Code: " << mEmailVerificationCode << " selbst dort hinein." << 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 << "oder kopiere den obigen Link in Dein Browserfenster." << std::endl;
ss << std::endl; ss << std::endl;
ss << "Mit freundlichen Grüße" << std::endl;
ss << "Mit freundlichen " << u8"Grüßen" << std::endl;
ss << "Dario, Gradido Server Admin" << std::endl; ss << "Dario, Gradido Server Admin" << std::endl;
message->addContent(new Poco::Net::StringPartSource(ss.str())); message->addContent(new Poco::Net::StringPartSource(ss.str()));

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

@ -4,6 +4,7 @@
#include "Poco/RegularExpression.h" #include "Poco/RegularExpression.h"
#include "Poco/Net/StringPartSource.h" #include "Poco/Net/StringPartSource.h"
#include "Poco/Net/MediaType.h"
#include "../SingletonManager/SessionManager.h" #include "../SingletonManager/SessionManager.h"
#include "../SingletonManager/ConnectionManager.h" #include "../SingletonManager/ConnectionManager.h"
@ -191,8 +192,18 @@ bool Session::createUser(const std::string& first_name, const std::string& last_
writeEmailVerification->setFinishCommand(new SessionStateUpdateCommand(SESSION_STATE_EMAIL_VERIFICATION_WRITTEN, this)); writeEmailVerification->setFinishCommand(new SessionStateUpdateCommand(SESSION_STATE_EMAIL_VERIFICATION_WRITTEN, this));
writeEmailVerification->scheduleTask(writeEmailVerification); writeEmailVerification->scheduleTask(writeEmailVerification);
printf("LastName: %s\n", last_name.data());
for (int i = 0; i < last_name.size(); i++) {
char c = last_name.data()[i];
printf("%d ", c);
}
printf("\n\n");
// depends on writeUser because need user_id, write email verification into db // depends on writeUser because need user_id, write email verification into db
auto message = new Poco::Net::MailMessage; auto message = new Poco::Net::MailMessage;
Poco::Net::MediaType mt("text", "plain");
mt.setParameter("charset", "utf-8");
message->setContentType(mt);
message->addRecipient(Poco::Net::MailRecipient(Poco::Net::MailRecipient::PRIMARY_RECIPIENT, email)); message->addRecipient(Poco::Net::MailRecipient(Poco::Net::MailRecipient::PRIMARY_RECIPIENT, email));
message->setSubject("Gradido: E-Mail Verification"); message->setSubject("Gradido: E-Mail Verification");
@ -203,7 +214,7 @@ bool Session::createUser(const std::string& first_name, const std::string& last_
//ss << "oder kopiere den Code: " << mEmailVerificationCode << " selbst dort hinein." << 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 << "oder kopiere den obigen Link in Dein Browserfenster." << std::endl;
ss << std::endl; ss << std::endl;
ss << "Mit freundlichen Grüße" << std::endl; ss << "Mit freundlichen " << u8"Grüßen" << std::endl;
ss << "Dario, Gradido Server Admin" << std::endl; ss << "Dario, Gradido Server Admin" << std::endl;

5
src/cpp/tasks/SendEmailTask.cpp
View File

@ -4,6 +4,8 @@
#include "../SingletonManager/ErrorManager.h" #include "../SingletonManager/ErrorManager.h"
#include "../ServerConfig.h" #include "../ServerConfig.h"
#include "Poco/Net/MediaType.h"
SendEmailTask::SendEmailTask(Poco::Net::MailMessage* mailMessage, UniLib::controller::CPUSheduler* cpuScheduler, size_t additionalTaskDependenceCount/* = 0*/) SendEmailTask::SendEmailTask(Poco::Net::MailMessage* mailMessage, UniLib::controller::CPUSheduler* cpuScheduler, size_t additionalTaskDependenceCount/* = 0*/)
: UniLib::controller::CPUTask(cpuScheduler, additionalTaskDependenceCount+1), mMailMessage(mailMessage) : UniLib::controller::CPUTask(cpuScheduler, additionalTaskDependenceCount+1), mMailMessage(mailMessage)
{ {
@ -25,11 +27,14 @@ int SendEmailTask::run()
if (strcmp(parent->getResourceType(), "PrepareEmailTask") != 0) { if (strcmp(parent->getResourceType(), "PrepareEmailTask") != 0) {
er->addError(new Error("SendEmailTask", "first parent isn't PrepareEmailTask")); er->addError(new Error("SendEmailTask", "first parent isn't PrepareEmailTask"));
er->sendErrorsAsEmail();
return -1; return -1;
} }
PrepareEmailTask* prepare = (PrepareEmailTask*)&(*parent); PrepareEmailTask* prepare = (PrepareEmailTask*)&(*parent);
mMailMessage->setSender(ServerConfig::g_EmailAccount.sender); mMailMessage->setSender(ServerConfig::g_EmailAccount.sender);
if (prepare->send(mMailMessage)) { if (prepare->send(mMailMessage)) {
er->sendErrorsAsEmail();
return -1; return -1;
} }
//printf("[SendEmailTask] time: %s\n", timeUsed.string().data()); //printf("[SendEmailTask] time: %s\n", timeUsed.string().data());