<?php
/***************************************************************************
- * Copyright (C) 2003-2006 Polytechnique.org *
+ * Copyright (C) 2003-2008 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
foreach($members as $mem) {
list($m, $dom) = explode('@',$mem);
if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) {
- $res = XDB::query('SELECT prenom,IF(nom_usage="", nom, nom_usage), promo
- FROM auth_user_md5 AS u
- INNER JOIN aliases AS a ON u.user_id = a.id
- WHERE a.alias = {?}', $m);
- if(list($prenom, $nom, $promo) = $res->fetchOneRow()) {
+ $res = XDB::query('SELECT prenom, IF(nom_usage="", nom, nom_usage), promo,
+ (e.uid IS NULL AND FIND_IN_SET("googleapps", u.mail_storage) = 0)
+ FROM auth_user_md5 AS u
+ INNER JOIN aliases AS a ON u.user_id = a.id
+ LEFT JOIN emails AS e ON (e.flags = "active" AND e.uid = u.user_id)
+ WHERE a.alias = {?}
+ GROUP BY u.user_id', $m);
+ if(list($prenom, $nom, $promo, $broken) = $res->fetchOneRow()) {
$key = $tri_promo ? $promo : strtoupper($nom{0});
- $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m, 'p' => (!$tri_promo ? $promo : null));
+ $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m, 'p' => (!$tri_promo ? $promo : null), 'b' => $broken);
} else {
- $membres[0][] = Array('l' => $mem);
+ $membres[0][] = Array('l' => $mem, 'b' => $broken);
}
} else {
$res = XDB::query('SELECT m2.uid,
IF(m2.origine="X", u.prenom, m1.prenom) AS prenom,
IF(m2.origine="X", u.nom, m1.nom) AS nom,
- IF(m2.origine="X", u.promo, "non-X") AS promo
+ IF(m2.origine="X", u.promo, "non-X") AS promo,
+ 0
FROM groupex.membres AS m1
LEFT JOIN groupex.membres AS m2 ON(m1.email=m2.email AND m2.asso_id={?})
LEFT JOIN auth_user_md5 AS u ON(m2.origine = "X" AND m2.uid = u.user_id)
WHERE m1.email={?}', $globals->asso('id'), $mem);
if (list($uid, $prenom, $nom, $promo) = $res->fetchOneRow()) {
- $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper($nom{0});
+ $key = $tri_promo ? ($promo != 'non-X' ? $promo : 0) : strtoupper(@$nom{0});
if ($tri_promo) {
$promo = null;
}
function _list_header_decode($charset, $c, $str) {
$s = ($c == 'Q' || $c == 'q') ? quoted_printable_decode($str) : base64_decode($str);
- $s = iconv($charset, 'iso-8859-15', $s);
+ $s = iconv($charset, 'UTF-8', $s);
return str_replace('_', ' ', $s);
}
function list_header_decode($value) {
+ if (!$value) {
+ return "[pas de sujet]";
+ }
$val = preg_replace('/(=\?[^?]*\?[BQbq]\?[^?]*\?=) (=\?[^?]*\?[BQbq]\?[^?]*\?=)/', '\1\2', $value);
return preg_replace('/=\?([^?]*)\?([BQbq])\?([^?]*)\?=/e', '_list_header_decode("\1", "\2", "\3")', $val);
}
// }}}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>