diff --git a/src/cpp/HTTPInterface/ElopageWebhook.cpp b/src/cpp/HTTPInterface/ElopageWebhook.cpp index a592996a7..02cac9291 100644 --- a/src/cpp/HTTPInterface/ElopageWebhook.cpp +++ b/src/cpp/HTTPInterface/ElopageWebhook.cpp @@ -241,6 +241,13 @@ int HandleElopageRequestTask::run() mFirstName = mRequestData.get("payer[first_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 if (!validateInput()) { // 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 obigen Link in Dein Browserfenster." << 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; message->addContent(new Poco::Net::StringPartSource(ss.str())); diff --git a/src/cpp/model/Session.cpp b/src/cpp/model/Session.cpp index b9602a62c..9f1b2b8e7 100644 --- a/src/cpp/model/Session.cpp +++ b/src/cpp/model/Session.cpp @@ -4,6 +4,7 @@ #include "Poco/RegularExpression.h" #include "Poco/Net/StringPartSource.h" +#include "Poco/Net/MediaType.h" #include "../SingletonManager/SessionManager.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->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 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->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 obigen Link in Dein Browserfenster." << 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; diff --git a/src/cpp/tasks/SendEmailTask.cpp b/src/cpp/tasks/SendEmailTask.cpp index 2ed70a75e..25ec5a267 100644 --- a/src/cpp/tasks/SendEmailTask.cpp +++ b/src/cpp/tasks/SendEmailTask.cpp @@ -4,6 +4,8 @@ #include "../SingletonManager/ErrorManager.h" #include "../ServerConfig.h" +#include "Poco/Net/MediaType.h" + SendEmailTask::SendEmailTask(Poco::Net::MailMessage* mailMessage, UniLib::controller::CPUSheduler* cpuScheduler, size_t additionalTaskDependenceCount/* = 0*/) : UniLib::controller::CPUTask(cpuScheduler, additionalTaskDependenceCount+1), mMailMessage(mailMessage) { @@ -25,11 +27,14 @@ int SendEmailTask::run() if (strcmp(parent->getResourceType(), "PrepareEmailTask") != 0) { er->addError(new Error("SendEmailTask", "first parent isn't PrepareEmailTask")); + er->sendErrorsAsEmail(); return -1; } PrepareEmailTask* prepare = (PrepareEmailTask*)&(*parent); mMailMessage->setSender(ServerConfig::g_EmailAccount.sender); + if (prepare->send(mMailMessage)) { + er->sendErrorsAsEmail(); return -1; } //printf("[SendEmailTask] time: %s\n", timeUsed.string().data());