X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fauth.php;h=20098cb51f5d79240e85edb5840c9b3a16806c3f;hb=6544d0e1de719d31db03a7c7fddfe4c0301d9d6d;hp=afdf1c8bdf16994ad32692d60096b9f18b574957;hpb=8b00e0e0c6f303762f6740c853e7065b1471d245;p=platal.git

diff --git a/modules/auth.php b/modules/auth.php
index afdf1c8..20098cb 100644
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -24,7 +24,7 @@ class AuthModule extends PLModule
     function handlers()
     {
         return array(
-            'groupex/done-chall.php'
+            'groupex/donne-chall.php'
                                 => $this->make_hook('chall',      AUTH_PUBLIC),
             'groupex/export-econfiance.php'
                                 => $this->make_hook('econf',      AUTH_PUBLIC),
@@ -34,6 +34,7 @@ class AuthModule extends PLModule
 
             'auth-redirect.php' => $this->make_hook('redirect',   AUTH_COOKIE),
             'auth-groupex.php'  => $this->make_hook('groupex',    AUTH_COOKIE),
+            'admin/auth-groupes-x'         => $this->make_hook('admin_authgroupesx', AUTH_MDP, 'admin'),
         );
     }
 
@@ -48,9 +49,6 @@ class AuthModule extends PLModule
     {
         global $globals;
 
-        require_once 'platal/xmlrpc-client.inc.php';
-        require_once 'lists.inc.php';
-
         $cle = $globals->core->econfiance;
 
         if (S::v('chall') && $_GET['PASS'] == md5(S::v('chall').$cle)) {
@@ -58,8 +56,8 @@ class AuthModule extends PLModule
             $res  = XDB::query("SELECT password FROM auth_user_md5 WHERE user_id=10154");
             $pass = $res->fetchOneCell();
 
-            $client =& lists_xmlrpc(10154, $pass, "x-econfiance.polytechnique.org");
-            $members = $client->get_members('membres');
+            $list = new MMList(10154, $pass, "x-econfiance.polytechnique.org");
+            $members = $list->get_members('membres');
             if (is_array($members)) {
                 $membres = Array();
                 foreach($members[1] as $member) {
@@ -80,7 +78,7 @@ class AuthModule extends PLModule
                       WHERE  $where
                    ORDER BY  nom");
 
-            $res = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n\n<membres>\n\n";
+            $res = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n<membres>\n\n";
 
             while (list ($prenom1,$nom1,$email1) = $all->next()) {
                     $res .= "<membre>\n";
@@ -92,6 +90,7 @@ class AuthModule extends PLModule
 
             $res .= "</membres>\n\n";
 
+            header('Content-Type: text/xml; charset="UTF-8"');
             echo $res;
         }
         exit;
@@ -103,7 +102,7 @@ class AuthModule extends PLModule
 
         require_once 'webservices/manageurs.server.inc.php';
 
-        $ips = array_flip(explode(' ',$globals->manageurs->authorized_ips));
+        $ips = array_flip(explode(' ', $globals->manageurs->authorized_ips));
         if ($ips && isset($ips[$_SERVER['REMOTE_ADDR']])) {
             $server = xmlrpc_server_create();
 
@@ -116,16 +115,19 @@ class AuthModule extends PLModule
             print $response;
             xmlrpc_server_destroy($server);
         }
+
+        exit;
     }
 
     function handler_redirect(&$page)
     {
-        http_redirect(Env::get('dest', '/'));
+        http_redirect(Env::v('dest', '/'));
     }
 
     function handler_groupex(&$page)
     {
         require_once dirname(__FILE__).'/auth/auth.inc.php';
+        $page->assign('referer', true);
 
         $gpex_pass = $_GET["pass"];
         $gpex_url  = urldecode($_GET["url"]);
@@ -143,9 +145,9 @@ class AuthModule extends PLModule
         // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid
         if (!isset($_SESSION['suid'])) {
             $logger = (isset($_SESSION['log']) && $_SESSION['log']->uid == $uid)
-                      ? $_SESSION['log']
-                      : new DiogenesCoreLogger($uid);
-            $logger->log('connexion_auth_ext', $_SERVER['PHP_SELF']);
+                            ? $_SESSION['log'] : new CoreLogger($uid);
+            global $platal;
+            $logger->log('connexion_auth_ext', $platal->path);
         }
 
         /* on parcourt les entrees de groupes_auth */
@@ -161,6 +163,16 @@ class AuthModule extends PLModule
         /* si on n'a pas trouvé, on renvoit sur x.org */
         http_redirect('https://www.polytechnique.org/');
     }
+    function handler_admin_authgroupesx(&$page, $action = 'list', $id = null) {
+        $page->assign('xorg_title','Polytechnique.org - Administration - Auth groupes X');
+        $page->assign('title', 'Gestion de l\'authentification centralisée');
+        $table_editor = new PLTableEditor('admin/auth-groupes-x','groupesx_auth','id');
+        $table_editor->describe('name','nom',true);
+        $table_editor->describe('privkey','clé privée',false);
+        $table_editor->describe('datafields','champs renvoyés',true);
+        $table_editor->apply($page, $action, $id);
+    }  
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>