X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Flists.inc.php;h=d11c94f29ff24f1b292953a4281db1cfc2dc6dd2;hb=7192cdc512c54b21c71c9fc879a5ce39716ffa75;hp=15f0d673395380a0c607b1cbf85d303348641a7f;hpb=27cb2301e3ba633ca355d1b5b5815d28ff8d84e8;p=platal.git

diff --git a/include/lists.inc.php b/include/lists.inc.php
index 15f0d67..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 dirname(__FILE__).'/../classes/XmlrpcClient.php';
-
-// }}}
 // {{{ function lists_xmlrpc
 
 function &lists_xmlrpc($uid, $pass, $fqdn=null)
@@ -43,7 +38,7 @@ 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) {
@@ -53,7 +48,7 @@ function list_sort_owners(&$members, $tri_promo = true) {
                                           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);
             }
@@ -61,13 +56,13 @@ function list_sort_owners(&$members, $tri_promo = true) {
             $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:
 ?>