<?php
/***************************************************************************
- * Copyright (C) 2003-2007 Polytechnique.org *
+ * Copyright (C) 2003-2009 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
function __construct($id)
{
- parent::__construct('axletter/letter.tpl', 'ax.css', 'ax/show', 'axletter', 'axletter_ins');
+ parent::__construct('axletter/letter.mail.tpl', 'ax.css', 'ax/show', 'axletter', 'axletter_ins');
$this->_head = '<cher> <prenom>,';
if (!is_array($id)) {
WHERE id = {?} OR short_name = {?}", $id, $id);
}
if (!$res->numRows()) {
- $this->_id = null;
- return;
+ throw new MailNotFound();
}
$id = $res->fetchOneRow();
}
protected function getAllRecipients()
{
- return "SELECT ni.user_id, IF(ni.user_id = 0, ni.email, a.alias) AS alias,
+ global $globals;
+ return "SELECT ni.user_id, IF(ni.user_id = 0, NULL, u.hruid) AS hruid,
+ IF(ni.user_id = 0, ni.email, CONCAT(a.alias, '@{$globals->mail->domain}')) AS alias,
IF(ni.user_id = 0, ni.prenom, u.prenom) AS prenom,
IF(ni.user_id = 0, ni.nom, IF(u.nom_usage='', u.nom, u.nom_usage)) AS nom,
FIND_IN_SET('femme', IF(ni.user_id = 0, ni.flag, u.flags)) AS sexe,
LEFT JOIN aliases AS a ON(u.user_id=a.id AND FIND_IN_SET('bestalias',a.flags))
LEFT JOIN emails AS e ON(e.uid=u.user_id AND e.flags='active')
WHERE ni.last < {?} AND {$this->subscriptionWhere()}
- AND (e.email IS NOT NULL OR ni.user_id = 0)
+ AND (e.email IS NOT NULL OR FIND_IN_SET('googleapps', u.mail_storage) OR ni.user_id = 0)
GROUP BY u.user_id";
}
{
$res = XDB::query("SELECT IF(short_name IS NULL, id, short_name) as id, date, subject AS titre
FROM axletter
- WHERE NOT (FIND_IN_SET('new', bits))
+ WHERE NOT FIND_IN_SET('new', bits) AND NOT FIND_IN_SET('invalid', bits)
ORDER BY date DESC");
return $res->fetchAllAssoc();
}