From: Tim Düsterhus Date: Thu, 2 Jun 2016 21:45:53 +0000 (+0200) Subject: Switch RegisterForm (needActivation) to new email API X-Git-Tag: 3.0.0_Beta_1~916^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5ce28e2325e50a425495d08e95e57b9ac758787;p=GitHub%2FWoltLab%2FWCF.git Switch RegisterForm (needActivation) to new email API --- diff --git a/com.woltlab.wcf/templates/email_html.tpl b/com.woltlab.wcf/templates/email_html.tpl index 796328871f..d6094dbb2b 100644 --- a/com.woltlab.wcf/templates/email_html.tpl +++ b/com.woltlab.wcf/templates/email_html.tpl @@ -1,19 +1,51 @@ + + + -
- - {if $__wcf->getStyleHandler()->getStyle()->getPageLogo()} - - {/if} - {event name='headerLogo'} - +
+ {@$content}
-
{@$content}
{hascontent} -
+
--
{content} - {@MAIL_SIGNATURE|language} + {@MAIL_SIGNATURE|language|nl2br} {if $mailbox|is_a:'wcf\system\email\UserMailbox'} {if MAIL_SIGNATURE|language}

{/if} This email was sent to you, because you registered on the {$mailbox->getUser()->registrationDate|plainTime} at {@PAGE_TITLE|language}.{/if} {* TODO: language item *} diff --git a/com.woltlab.wcf/templates/email_plaintext.tpl b/com.woltlab.wcf/templates/email_plaintext.tpl index ea467f66b6..f428196ae9 100644 --- a/com.woltlab.wcf/templates/email_plaintext.tpl +++ b/com.woltlab.wcf/templates/email_plaintext.tpl @@ -1,7 +1,7 @@ {@$content} -{hascontent} +{hascontent} {* this line ends with a space *} --- {* The Space is important, do not remove *} +-- {* this line ends with a space *} {content} {@MAIL_SIGNATURE|language} {if $mailbox|is_a:'wcf\system\email\UserMailbox'}{if MAIL_SIGNATURE|language}{* add newlines *} diff --git a/com.woltlab.wcf/templates/email_registerNeedActivation.tpl b/com.woltlab.wcf/templates/email_registerNeedActivation.tpl new file mode 100644 index 0000000000..13218b3215 --- /dev/null +++ b/com.woltlab.wcf/templates/email_registerNeedActivation.tpl @@ -0,0 +1,14 @@ +{if $mimeType === 'text/plain'} +{capture assign='content'}{lang}wcf.user.register.needActivation.mail.plaintext{/lang}{/capture} +{include file='email_plaintext'} +{else} + {capture assign='content'} +

{lang}wcf.user.register.needActivation.mail.html.headline{/lang}

+ {lang}wcf.user.register.needActivation.mail.html.intro{/lang} + + {lang}wcf.user.register.needActivation.mail.html.activate{/lang} + + {lang}wcf.user.register.needActivation.mail.html.outro{/lang} + {/capture} + {include file='email_html'} +{/if} diff --git a/wcfsetup/install/files/lib/data/style/Style.class.php b/wcfsetup/install/files/lib/data/style/Style.class.php index 0abcf35efc..dafa30e04a 100644 --- a/wcfsetup/install/files/lib/data/style/Style.class.php +++ b/wcfsetup/install/files/lib/data/style/Style.class.php @@ -71,17 +71,25 @@ class Style extends DatabaseObject { /** * Returns a specific style variable or null if not found. + * If $toHex is set to true the color defined by the variable + * will be converted to the hexadecimal notation (e.g. for use + * in emails) * * @param string $variableName + * @param boolean $toHex * @return string */ - public function getVariable($variableName) { + public function getVariable($variableName, $toHex = false) { if (isset($this->variables[$variableName])) { // check if variable is empty if ($this->variables[$variableName] == '~""') { return ''; } + if ($toHex && preg_match('/^rgba\((\d+), (\d+), (\d+), 1\)$/', $this->variables[$variableName], $matches)) { + return sprintf('#%02x%02x%02x', $matches[1], $matches[2], $matches[3]); + } + return $this->variables[$variableName]; } diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php index 9cd954f40b..28f9cd8e93 100644 --- a/wcfsetup/install/files/lib/form/RegisterForm.class.php +++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php @@ -15,7 +15,10 @@ use wcf\system\exception\PermissionDeniedException; use wcf\system\exception\SystemException; use wcf\system\exception\UserInputException; use wcf\system\language\LanguageFactory; -use wcf\system\mail\Mail; +use wcf\system\email\mime\MimePartFacade; +use wcf\system\email\mime\RecipientAwareTextMimePart; +use wcf\system\email\Email; +use wcf\system\email\UserMailbox; use wcf\system\request\LinkHandler; use wcf\system\user\authentication\UserAuthenticationFactory; use wcf\system\Regex; @@ -465,16 +468,19 @@ class RegisterForm extends UserAddForm { $this->message = 'wcf.user.register.success'; } else { - $mail = new Mail([$this->username => $this->email], - WCF::getLanguage()->getDynamicVariable('wcf.user.register.needActivation.mail.subject'), - WCF::getLanguage()->getDynamicVariable('wcf.user.register.needActivation.mail', ['user' => $user]) - ); - $mail->send(); - $this->message = 'wcf.user.register.needActivation'; + $email = new Email(); + $email->addRecipient(new UserMailbox(WCF::getUser())); + $email->setSubject(WCF::getLanguage()->getDynamicVariable('wcf.user.register.needActivation.mail.subject')); + $email->setBody(new MimePartFacade([ + new RecipientAwareTextMimePart('text/html', 'email_registerNeedActivation'), + new RecipientAwareTextMimePart('text/plain', 'email_registerNeedActivation') + ])); + $email->send(); + $this->message = 'wcf.user.register.success.needActivation'; } } else if (REGISTER_ACTIVATION_METHOD == 2) { - $this->message = 'wcf.user.register.awaitActivation'; + $this->message = 'wcf.user.register.success.awaitActivation'; } // notify admin diff --git a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php index b6455ecf4a..7bef27c3f8 100644 --- a/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php +++ b/wcfsetup/install/files/lib/system/email/mime/RecipientAwareTextMimePart.class.php @@ -69,7 +69,18 @@ class RecipientAwareTextMimePart extends TextMimePart implements IRecipientAware try { if ($this->mailbox) WCF::setLanguage($this->mailbox->getLanguage()->languageID); - return EmailTemplateEngine::getInstance()->fetch($this->template, $this->application, $this->getTemplateVariables(), true); + $result = EmailTemplateEngine::getInstance()->fetch($this->template, $this->application, $this->getTemplateVariables(), true); + + if ($this->mimeType === 'text/html') { + $emogrifier = new \Pelago\Emogrifier(); + $emogrifier->disableInvisibleNodeRemoval(); + + $emogrifier->setHtml($result); + + $result = $emogrifier->emogrify(); + } + + return $result; } finally { WCF::setLanguage($language->languageID); diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 8079efc83e..efe27d3828 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -3025,11 +3025,50 @@ Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}achte{else}achten Sie{/if} darauf, dass + + + Aktivierungsvorgang abschließen, um den vollen Funktionsumfang dieser Seite nutzen zu können.]]> - username}.
+ getUser()->username},]]> + vielen Dank für {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Registrierung auf der Website: {@PAGE_TITLE|language}. Bevor {if LANGUAGE_USE_INFORMAL_VARIANT}du dein{else}Sie Ihr{/if} +Benutzerkonto vollständig verwenden {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if} ist es notwendig, dass {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} einmalig die Gültigkeit Ihrer E-Mail-Adresse {if LANGUAGE_USE_INFORMAL_VARIANT}bestätigst{else}bestätigen{/if}:

]]> + + {if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Aktivierungscode lautet: {@$mailbox->getUser()->activationCode}.

+

Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} Probleme mit der Aktivierung Ihres Benutzerkontos {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}, dann {if LANGUAGE_USE_INFORMAL_VARIANT}wende dich{else}wenden Sie sich{/if} bitte an den Administrator +unter: {@MAIL_ADMIN_ADDRESS}. Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du dich{else}Sie sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}, +dann {if LANGUAGE_USE_INFORMAL_VARIANT}kannst du{else}können Sie{/if} diese E-Mail ignorieren.

]]> + getUser()->username}, + +vielen Dank für {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Registrierung auf der Website: {@PAGE_TITLE|language} [1]. +Bevor {if LANGUAGE_USE_INFORMAL_VARIANT}du dein{else}Sie Ihr{/if} Benutzerkonto vollständig verwenden {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if} ist es notwendig, +dass Sie einmalig durch Klicken des Folgenden Links die Gültigkeit {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} +E-Mail-Adresse {if LANGUAGE_USE_INFORMAL_VARIANT}bestätigst{else}bestätigen{/if}: + + {link controller='RegisterActivation' isEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->activationCode}{/link} {* this line ends with a space *} + +{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Aktivierungscode lautet: {@$mailbox->getUser()->activationCode} {* this line ends with a space *} + +Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} Probleme mit der Aktivierung Ihres Benutzerkontos {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}haben{/if}, dann {if LANGUAGE_USE_INFORMAL_VARIANT}wende +dich{else}wenden +Sie sich{/if} bitte an den Administrator unter: {@MAIL_ADMIN_ADDRESS}. Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du +dich{else}Sie +sich{/if} nicht bei uns registriert haben, dann {if LANGUAGE_USE_INFORMAL_VARIANT}kannst du{else}können Sie{/if} diese E-Mail ignorieren. + +[1] {link}{/link}]]> + + + username}. Ihre Registrierung ist hiermit vollständig abgeschlossen.]]> + username}.
Wir haben {if LANGUAGE_USE_INFORMAL_VARIANT}dir{else}Ihnen{/if} eine E-Mail an {$user->email} geschickt. Die E-Mail enthält einen Link, den {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} einmalig aufrufen {if LANGUAGE_USE_INFORMAL_VARIANT}musst{else}müssen{/if}, um die Gültigkeit {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} E-Mail-Adresse zu bestätigen und damit {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Registrierung abzuschließen.]]> - username}. {if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Benutzerdaten werden in Kürze von einem Administrator geprüft.
+ username}. {if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Benutzerdaten werden in Kürze von einem Administrator geprüft.
Sobald {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Benutzerkonto freigeschaltet ist, {if LANGUAGE_USE_INFORMAL_VARIANT}wirst du{else}werden Sie{/if} per E-Mail darüber in Kenntnis gesetzt.]]> + + + + + username} @@ -3039,30 +3078,8 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email} {if LANGUAGE_USE_INFORMAL_VARIANT}Du erreichst{else}Sie erreichen{/if} das Benutzerprofil des neuen Benutzers, indem {if LANGUAGE_USE_INFORMAL_VARIANT}du{else}Sie{/if} folgenden Link {if LANGUAGE_USE_INFORMAL_VARIANT}aufrufst{else}aufrufen{/if}: {link controller='User' object=$user isEmail=true}{/link} ]]> - - username}. {if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Registrierung ist hiermit vollständig abgeschlossen.]]> - username}, - -vielen Dank für {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Registrierung auf der Website: {@PAGE_TITLE|language}. -Bevor wir {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Registrierung aktivieren können, {if LANGUAGE_USE_INFORMAL_VARIANT}musst du{else}müssen Sie{/if} einmalig die Gültigkeit {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} E-Mail-Adresse bestätigen. - -Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}bestätige{else}bestätigen Sie{/if} die Gültigkeit {if LANGUAGE_USE_INFORMAL_VARIANT}deiner{else}Ihrer{/if} E-Mail-Adresse, indem {if LANGUAGE_USE_INFORMAL_VARIANT}du folgenden Link aufrufst{else}Sie folgenden Link aufrufen{/if}: -{link controller='RegisterActivation' isEmail=true}u={@$user->userID}&a={@$user->activationCode}{/link} - -**** Funktioniert der Link oben nicht? **** -Wenn der Link nicht funktioniert, {if LANGUAGE_USE_INFORMAL_VARIANT}solltest du{else}sollten Sie{/if} folgende Adresse in {if LANGUAGE_USE_INFORMAL_VARIANT}deinem{else}Ihrem{/if} Browser aufrufen: -{link controller='RegisterActivation' isEmail=true}{/link} - -Bitte {if LANGUAGE_USE_INFORMAL_VARIANT}achte{else}achten Sie{/if} darauf, dass keine Leerzeichen in der Adresse sind. -Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du den Link aufgerufen hast, musst du auf der erscheinenden Seite deinen{else}Sie den Link aufgerufen haben, müssen Sie auf der erscheinenden Seite Ihren{/if} Benutzernamen sowie den Aktivierungscode eingeben. - -{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Benutzername lautet: {@$user->username} -{if LANGUAGE_USE_INFORMAL_VARIANT}Dein{else}Ihr{/if} Aktivierungscode lautet: {@$user->activationCode} - -Wenn {if LANGUAGE_USE_INFORMAL_VARIANT}du Probleme mit der Aktivierung haben solltest, wende dich{else}Sie Probleme mit der Aktivierung haben, wenden Sie sich{/if} bitte an den Administrator: {@MAIL_ADMIN_ADDRESS} - -{if LANGUAGE_USE_INFORMAL_VARIANT}Solltest du dich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben, kannst du diese E-Mail ignorieren{else}Sollten Sie sich nicht auf der Website: {@PAGE_TITLE|language} angemeldet haben, können Sie diese E-Mail ignorieren{/if}. ]]> - Aktivierungsvorgang abschließen, um den vollen Funktionsumfang dieser Seite nutzen zu können.]]> + + Haftungsbeschränkung für eigene Inhalte diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 0b48a8fb94..bbe194aea3 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -3063,12 +3063,49 @@ If you cannot activate your email address or have any troubles following the ins + + + activation process first.]]> - username}.
+ getUser()->username},]]> + thank you for registering at: {@PAGE_TITLE|language}. Before you are able to use your +user account to it’s full extent it is required that you confirm validity of your email address once:

]]> + + Your activation code is: {@$mailbox->getUser()->activationCode}.

+

If you have troubles confirming your email address, please contact the administrator at: +{@MAIL_ADMIN_ADDRESS}. Please ignore this email if +you did not register an account with us.

]]> + getUser()->username}, + +thank your for registering at: {@PAGE_TITLE|language} [1]. Before you are +able to user your user account to it's full extent it is required that you +confirm the validity of your email address once: + + {link controller='RegisterActivation' isEmail=true}u={@$mailbox->getUser()->userID}&a={@$mailbox->getUser()->activationCode}{/link} {* this line ends with a space *} + +Your activation code is: {@$mailbox->getUser()->activationCode} {* this line ends with a space *} + +If you have troubles confirming your email address, please contect the +administrator at: {@MAIL_ADMIN_ADDRESS}. Please ignore this email if you did +not register with us. + +[1] {link}{/link}]]> + + + username}.
+Your registration is now completed.]]> + username}.
An email was sent to “{$user->email}” containing a one-time link to verify your account and ultimately completing your registration.]]> - username}.
+ username}.
Your account is awaiting approval from an administrator.
A notification will be sent once your account has been approved.]]> + + + + + username} @@ -3078,29 +3115,9 @@ Email address used: {@$user->email} Open the link below to access the user profile: {link controller='User' object=$user isEmail=true}{/link} ]]> - - username}.
-Your registration is now completed.]]> - username}, - -thank you for registering on our website: {@PAGE_TITLE|language}. It is required to open the link below in order to verify your email address. - -{link controller='RegisterActivation' isEmail=true}u={@$user->userID}&a={@$user->activationCode}{/link} - -**** Unable to click or open the link above? **** -Please open the link below in your browser: -{link controller='RegisterActivation' isEmail=true}{/link} - -Once prompted provide the details as shown below: - -Your username: {@$user->username} -Activation Code: {@$user->activationCode} - -If you cannot open the link or have troubles following the instructions, please contact the administrator: {@MAIL_ADMIN_ADDRESS} - -You can safely ignore this email if you did not register with the website: {@PAGE_TITLE|language}.]]> - activation process first.]]> - + + + Limitation of liability for internal content

The content of our website has been compiled with meticulous care and to the best of our knowledge. However, we cannot assume any liability for the up-to-dateness, completeness or accuracy of any of the pages.