more simplifications

[platal.git] / include / lists.inc.php

diff --git a/include/lists.inc.php b/include/lists.inc.php
index a68d207..9857d3e 100644 (file)
--- a/include/lists.inc.php
+++ b/include/lists.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,7 +21,7 @@
 
 // {{{ import class definitions
 
-require_once 'platal/xmlrpc-client.inc.php';
+require_once dirname(__FILE__).'/../classes/XmlrpcClient.php';
 
 // }}}
 // {{{ function lists_xmlrpc
@@ -32,7 +32,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;
 }
 
@@ -47,21 +47,21 @@ 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);
             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);
             }
@@ -82,5 +82,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:
 ?>