diff --git a/src/cpp/HTTPInterface/CheckEmailPage.cpp b/src/cpp/HTTPInterface/CheckEmailPage.cpp index 29b426732..aef03f98f 100644 --- a/src/cpp/HTTPInterface/CheckEmailPage.cpp +++ b/src/cpp/HTTPInterface/CheckEmailPage.cpp @@ -9,7 +9,7 @@ #include "../SingletonManager/SessionManager.h" #include "../SingletonManager/LanguageManager.h" - +#include "../SingletonManager/EmailManager.h" enum PageState { MAIL_NOT_SEND, @@ -40,6 +40,7 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: const char* pageName = "Email Verification"; auto lm = LanguageManager::getInstance(); + auto em = EmailManager::getInstance(); auto lang = chooseLanguage(request); auto langCatalog = lm->getFreeCatalog(lang); @@ -140,20 +141,20 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " \n"; responseStream << "\t\t\t\t\n"; responseStream << "\t\t\t\t \n"; responseStream << "\t\t\t\t\"logo\"\n"; responseStream << "\t\t\t\n"; @@ -165,25 +166,25 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " "; -#line 83 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 84 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( getErrorsHtml() ); responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; @@ -192,12 +193,12 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; @@ -205,75 +206,78 @@ void CheckEmailPage::handleRequest(Poco::Net::HTTPServerRequest& request, Poco:: responseStream << "
\n"; responseStream << "
\n"; responseStream << "\t\t\t\t"; -#line 105 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" if(EMAIL_ACTIVATED == state) { responseStream << "\n"; responseStream << "\t\t\t\t\t

"; -#line 106 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( langCatalog->gettext("Deine E-Mail wurde erfolgreich bestätigt. Du kannst nun Gradidos versenden.") ); responseStream << "

\n"; responseStream << "\t\t\t\t\t
"; -#line 107 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( langCatalog->gettext("Zur Startseite") ); responseStream << "\n"; responseStream << "\t\t\t\t"; -#line 108 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 109 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" } else { responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " gettext("Email Verification Code")); responseStream << "\" "; -#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" if(verificationCode) { responseStream << "value=\""; -#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( verificationCode ); responseStream << "\" "; -#line 112 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 113 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" } responseStream << ">\n"; responseStream << "
\n"; responseStream << " \n"; responseStream << "
\n"; responseStream << " \n"; responseStream << " \n"; responseStream << "

\n"; responseStream << "\t\t\t\t"; -#line 122 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( langCatalog->gettext("Funktioniert dein E-Mail Verification Code nicht?")); responseStream << "
\n"; responseStream << "\t\t\t\t"; -#line 123 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( langCatalog->gettext("Schicke uns eine E-Mail und wir kümmern uns darum: ")); responseStream << "
\n"; - responseStream << " getAdminReceiver()); + responseStream << "?subject=Invalid E-Mail Verification Code&body=Hallo Dario,%0D%0A%0D%0Amein E-Mail Verification-Code: "; +#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( verificationCode ); responseStream << " funktioniert nicht,%0D%0Akannst du das prüfen?%0D%0A%0D%0AMit freundlichen Grüßen%0D%0A\">"; -#line 124 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 125 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" responseStream << ( langCatalog->gettext("E-Mail an Support schicken")); responseStream << "\n"; responseStream << "\t\t\t

\n"; responseStream << "\t\t\t "; -#line 126 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" +#line 127 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\checkEmail.cpsp" } responseStream << "\n"; responseStream << "
\n"; responseStream << "
\n"; diff --git a/src/cpsp/checkEmail.cpsp b/src/cpsp/checkEmail.cpsp index 19383676c..7a7922e60 100644 --- a/src/cpsp/checkEmail.cpsp +++ b/src/cpsp/checkEmail.cpsp @@ -7,7 +7,7 @@ <%! #include "../SingletonManager/SessionManager.h" #include "../SingletonManager/LanguageManager.h" - +#include "../SingletonManager/EmailManager.h" enum PageState { MAIL_NOT_SEND, @@ -19,6 +19,7 @@ enum PageState <%% const char* pageName = "Email Verification"; auto lm = LanguageManager::getInstance(); + auto em = EmailManager::getInstance(); auto lang = chooseLanguage(request); auto langCatalog = lm->getFreeCatalog(lang); @@ -121,7 +122,7 @@ enum PageState

<%= langCatalog->gettext("Funktioniert dein E-Mail Verification Code nicht?")%>
<%= langCatalog->gettext("Schicke uns eine E-Mail und wir kümmern uns darum: ")%>
- <%= langCatalog->gettext("E-Mail an Support schicken")%> + <%= langCatalog->gettext("E-Mail an Support schicken")%>

<% } %>