X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Flists.inc.php;h=d11c94f29ff24f1b292953a4281db1cfc2dc6dd2;hb=7192cdc512c54b21c71c9fc879a5ce39716ffa75;hp=844d0de833344442c0a33df14d61a5e0e08dc7e1;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git diff --git a/include/lists.inc.php b/include/lists.inc.php index 844d0de..d11c94f 100644 --- a/include/lists.inc.php +++ b/include/lists.inc.php @@ -19,11 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -// {{{ import class definitions - -require_once 'platal/xmlrpc-client.inc.php'; - -// }}} // {{{ function lists_xmlrpc function &lists_xmlrpc($uid, $pass, $fqdn=null) @@ -32,7 +27,7 @@ function &lists_xmlrpc($uid, $pass, $fqdn=null) $dom = is_null($fqdn) ? $globals->mail->domain : $fqdn; $url = "http://$uid:$pass@{$globals->lists->rpchost}:{$globals->lists->rpcport}/$dom"; - $client = new xmlrpc_client($url); + $client = new XmlrpcClient($url); return $client; } @@ -43,31 +38,31 @@ function list_sort_owners(&$members, $tri_promo = true) { global $globals; $membres = Array(); - + 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); if(list($prenom, $nom, $promo) = $res->fetchOneRow()) { $key = $tri_promo ? $promo : strtoupper($nom{0}); - $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m); + $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $m, 'p' => (!$tri_promo ? $promo : null)); } else { $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); + $membres[$key][$nom.$m] = Array('n' => "$prenom $nom", 'l' => $mem, 'p' => (!$tri_promo ? 'non-X' : null)); } else { $membres[0][] = Array('l' => $mem); } } } - + ksort($membres); foreach($membres as $key=>$val) ksort($membres[$key]); return $membres; @@ -82,5 +77,19 @@ function list_sort_members(&$members, $tri_promo = true) { } // }}} +// {{{ function list_header_decode + +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); + return str_replace('_', ' ', $s); +} + +function list_header_decode($value) { + $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: ?>