<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2013 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
'sexe' => $user->isFemale(),
'mail' => $email,
'to' => '"' . $user->fullName() . '" <' . $email . '>',
- 'forlife_email' => $user->login() . '@' . $globals->mail->domain,
- 'forlife_email2' => $user->login() . '@' . $globals->mail->domain2,
+ 'forlife_email' => $user->forlifeEmail(),
+ 'forlife_email2' => $user->forlifeEmailAlternate()
);
}
$this->type, $this->data, $this->personal_notes);
$this->engine->process($this->user);
if ($valid) {
- require_once 'validations.inc.php';
$sender = User::getSilent($this->sender);
$valid = new MarkReq($sender, $this->user['user'], $this->user['mail'],
$this->from == 'user', $this->type, $this->data, $this->personal_notes);
}
}
- static public function relance(PlUser &$user, $nbx = -1)
+ static public function relance(PlUser $user, $nbx = -1)
{
global $globals;
$mymail->assign('baseurl', $globals->baseurl);
$mymail->assign('lins_id', $hash);
$mymail->assign('lemail', $email);
- $mymail->assign('subj', $alias.'@'.$globals->mail->domain);
+ $mymail->assign('subj', ucfirst($globals->mail->domain) . ' : ' . $alias);
$mymail->send();
XDB::execute('UPDATE register_pending
SET hash={?}, password={?}, relance=NOW()
return $this->personal_notes;
}
- protected function prepareText(PlPage &$page, array $user)
+ protected function prepareText(PlPage $page, array $user)
{
$page->assign('intro', $this->getIntro());
$page->assign('u', $user);
public function process(array $user)
{
- return XDB::execute("REPLACE INTO register_subs (uid, type, sub, domain)
- VALUES ({?}, 'list', {?}, {?})",
- $user['id'], $this->name, $this->domain);
+ return XDB::execute("INSERT IGNORE INTO register_subs (uid, type, sub, domain)
+ VALUES ({?}, 'list', {?}, {?})",
+ $user['id'], $this->name, $this->domain);
}
}
public function process(array $user)
{
- return XDB::execute("REPLACE INTO register_subs (uid, type, sub, domain)
- VALUES ({?}, 'group', {?}, '')",
- $user['id'], $this->group);
+ return XDB::execute("INSERT IGNORE INTO register_subs (uid, type, sub, domain)
+ VALUES ({?}, 'group', {?}, '')",
+ $user['id'], $this->group);
}
}