X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Flists.inc.php;h=d86b3f383ecb349d8c8984b8e641e4b44d8018fe;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=55fca23b6eee6f173db277a35fe59d5c87ae43d0;hpb=575dd9be519a557c47e1288eaa15b1e1446dd058;p=platal.git diff --git a/include/lists.inc.php b/include/lists.inc.php index 55fca23..d86b3f3 100644 --- a/include/lists.inc.php +++ b/include/lists.inc.php @@ -1,6 +1,6 @@ mail->domain : $fqdn; + $dom = is_null($fqdn) ? $globals->mail->domain : $fqdn; $url = "http://$uid:$pass@{$globals->lists->rpchost}:{$globals->lists->rpcport}/$dom"; $client = new xmlrpc_client($url); return $client; @@ -47,7 +47,7 @@ function list_sort_owners(&$members, $tri_promo = true) { foreach($members as $mem) { list($m, $dom) = explode('@',$mem); if ($dom == $globals->mail->domain || $dom == $globals->mail->domain2) { - $res = $globals->xdb->query('SELECT prenom,IF(nom_usage="", nom, nom_usage), promo + $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); @@ -58,7 +58,7 @@ function list_sort_owners(&$members, $tri_promo = true) { $membres[0][] = Array('l' => $mem); } } else { - $res = $globals->xdb->query('SELECT prenom, nom FROM groupex.membres WHERE email={?}', $mem); + $res = XDB::query('SELECT prenom, nom FROM groupex.membres WHERE email={?}', $mem); if (list($prenom, $nom) = $res->fetchOneRow()) { $key = $tri_promo ? 0 : strtoupper($nom{0}); $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem);