DigitaleAgentur___ALT
/
registration
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update# support instance name, shown in emails

This commit is contained in:
Pellaeon Lin 2015-11-18 00:34:39 +08:00
parent b4a189696c
commit 4ee1665db7
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appinfo/application.php
View File

@ -41,7 +41,8 @@ class Application extends App {
$c->query('PendingRegist'),
$c->query('UserManager'),
$c->query('Config'),
$c->query('GroupManager')
$c->query('GroupManager'),
$c->query('Defaults')
);
});
@ -91,6 +92,10 @@ class Application extends App {
return new PendingRegist($c->query('ServerContainer')->getDb(),
$c->query('ServerContainer')->getSecureRandom()->getMediumStrengthGenerator());
});
$container->registerService('Defaults', function(SimpleContainer $c) {
return new \OC_Defaults;
});
}

17
controller/registercontroller.php
View File

@ -32,10 +32,12 @@ class RegisterController extends Controller {
private $usermanager;
private $config;
private $groupmanager;
/** @var \OC_Defaults */
private $defaults;
protected $appName;
public function __construct($appName, IRequest $request, IMailer $mailer, IL10N $l10n, $urlgenerator,
$pendingreg, IUserManager $usermanager, IConfig $config, IGroupManager $groupmanager){
$pendingreg, IUserManager $usermanager, IConfig $config, IGroupManager $groupmanager, \OC_Defaults $defaults){
$this->mailer = $mailer;
$this->l10n = $l10n;
$this->urlgenerator = $urlgenerator;
@ -43,6 +45,7 @@ class RegisterController extends Controller {
$this->usermanager = $usermanager;
$this->config = $config;
$this->groupmanager = $groupmanager;
$this->defaults = $defaults;
$this->appName = $appName;
parent::__construct($appName, $request);
}
@ -250,15 +253,19 @@ class RegisterController extends Controller {
private function sendValidationEmail(string $token, string $to) {
$link = $this->urlgenerator->linkToRoute('registration.register.verifyToken', array('token' => $token));
$link = $this->urlgenerator->getAbsoluteURL($link);
$html_template = new TemplateResponse('registration', 'email_html', array('link' => $link), 'blank');
$template_var = [
'link' => $link,
'sitename' => $this->defaults->getName()
];
$html_template = new TemplateResponse('registration', 'email_html', $template_var, 'blank');
$html_part = $html_template->render();
$plaintext_template = new TemplateResponse('registration', 'email_plaintext', array('link' => $link), 'blank');
$plaintext_template = new TemplateResponse('registration', 'email_plaintext', $template_var, 'blank');
$plaintext_part = $plaintext_template->render();
$subject = $this->l10n->t('Verify your ownCloud registration request');
$subject = $this->l10n->t('Verify your %s registration request', [$this->defaults->getName()]);
$from = Util::getDefaultEmailAddress('register');
$message = $this->mailer->createMessage();
$message->setFrom([$from]);
$message->setFrom([$from => $this->defaults->getName()]);
$message->setTo([$to]);
$message->setSubject($subject);
$message->setPlainBody($plaintext_part);

2
templates/email_html.php
View File

@ -1,4 +1,4 @@
<?php
// TODO use OC_Default to get site name
echo $l->t('To create a new account on ownCloud, just click the following link:');
echo $l->t('To create a new account on %s, just click the following link:', [$_['sitename']]);
echo str_replace('{link}', $_['link'], '<br/><br/><a href="{link}">{link}</a>');

2
templates/email_plaintext.php
View File

@ -1,3 +1,3 @@
<?php
echo $l->t("To create a new account on ownCloud, just click the following link:");
echo $l->t("To create a new account on %s, just click the following link:", [$_['sitename']]);
echo str_replace('{link}', $_['link'], "\n\n{link}");