// }}}
// {{{ constructor
- public function __construct($_uid, $_alias, $_raison, $_public, $_stamp=0)
+ public function __construct(User &$_user, $_alias, $_raison, $_public, $_stamp=0)
{
global $globals;
- parent::__construct($_uid, true, 'alias', $_stamp);
+ parent::__construct($_user, true, 'alias', $_stamp);
$this->alias = $_alias.'@'.$globals->mail->alias_dom;
$this->raison = $_raison;
$this->public = $_public;
SELECT v.alias
FROM virtual_redirect AS vr
INNER JOIN virtual AS v ON (v.vid=vr.vid AND v.alias LIKE '%@{$globals->mail->alias_dom}')
- WHERE vr.redirect={?} OR vr.redirect={?}",
- "{$this->forlife}@{$globals->mail->domain}", "{$this->forlife}@{$globals->mail->domain2}");
+ WHERE vr.redirect = {?} OR vr.redirect = {?}",
+ $this->user->forlifeEmail(),
+ // TODO: remove this über-ugly hack. The issue is that you need
+ // to remove all @m4x.org addresses in virtual_redirect first.
+ $this->user->login() . '@' . $globals->mail->domain2);
$this->old = $res->fetchOneCell();
- if (empty($this->old)) { unset($this->old); }
+ if (empty($this->old)) {
+ unset($this->old);
+ }
}
// }}}
static public function get_request($uid)
{
- return parent::get_typed_request($uid,'alias');
+ return parent::get_typed_request($uid, 'alias');
}
// }}}
protected function _mail_body($isok)
{
if ($isok) {
- return " L'adresse mail {$this->alias} que tu avais demandée vient d'être créée, tu peux désormais l'utiliser à ta convenance.".(($this->public == 'public')?" A ta demande, cette adresse apparaît maintenant sur ta fiche.":"");
+ return " L'adresse email {$this->alias} que tu avais demandée vient d'être créée, tu peux désormais l'utiliser à ta convenance.".(($this->public == 'public')?" A ta demande, cette adresse apparaît maintenant sur ta fiche.":"");
} else {
return " La demande que tu avais faite pour l'alias {$this->alias} a été refusée.";
}
public function commit ()
{
XDB::execute("UPDATE auth_user_quick SET emails_alias_pub = {?} WHERE user_id = {?}",
- $this->public, $this->uid);
+ $this->public, $this->user->id());
if ($this->old) {
- return XDB::execute('UPDATE virtual SET alias={?} WHERE alias={?}',
+ return XDB::execute("UPDATE virtual SET alias = {?} WHERE alias = {?}",
$this->alias, $this->old);
} else {
- XDB::execute('INSERT INTO virtual SET alias={?},type="user"', $this->alias);
+ XDB::execute("INSERT INTO virtual SET alias = {?},type='user'", $this->alias);
$vid = XDB::insertId();
- $dom = $this->shorter_domain();
- return XDB::query('INSERT INTO virtual_redirect (vid,redirect) VALUES ({?}, {?})',
- $vid, $this->forlife.'@'.$dom);
+ return XDB::query("INSERT INTO virtual_redirect (vid,redirect) VALUES ({?}, {?})",
+ $vid, $this->user->forlifeEmail());
}
}