merge xmlrpc stuff, and put it in classes/

[platal.git] / modules / auth.php

diff --git a/modules/auth.php b/modules/auth.php
index b4e929e..e3571c0 100644 (file)
--- a/modules/auth.php
+++ b/modules/auth.php
@@ -37,25 +37,24 @@ class AuthModule extends PLModule
         );
     }
 
-    function chall(&$page)
+    function handler_chall(&$page)
     {
         $_SESSION["chall"] = uniqid(rand(), 1);
         echo $_SESSION["chall"] . "\n" . session_id();
         exit;
     }
 
-    function econf(&$page)
+    function handler_econf(&$page)
     {
         global $globals;
 
-        require_once 'platal/xmlrpc-client.inc.php';
         require_once 'lists.inc.php';
 
         $cle = $globals->core->econfiance;
 
-        if (Session::get('chall') && $_GET['PASS'] == md5(Session::get('chall').$cle)) {
+        if (S::v('chall') && $_GET['PASS'] == md5(S::v('chall').$cle)) {
 
-            $res  = $globals->xdb->query("SELECT password FROM auth_user_md5 WHERE user_id=10154");
+            $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");
@@ -73,7 +72,7 @@ class AuthModule extends PLModule
 
             $where = join(' OR ',$membres);
 
-            $all = $globals->xdb->iterRow(
+            $all = XDB::iterRow(
                     "SELECT  u.prenom,u.nom,a.alias
                        FROM  auth_user_md5 AS u
                  INNER JOIN  aliases       AS a ON ( u.user_id = a.id AND a.type!='homonyme' )
@@ -97,7 +96,7 @@ class AuthModule extends PLModule
         exit;
     }
 
-    function manageurs(&$page)
+    function handler_manageurs(&$page)
     {
         global $globals;
 
@@ -120,14 +119,12 @@ class AuthModule extends PLModule
 
     function handler_redirect(&$page)
     {
-        redirect(Env::get('dest', '/'));
+        http_redirect(Env::get('dest', '/'));
     }
 
     function handler_groupex(&$page)
     {
-        global $globals;
-
-        require_once dirname(__FILE__).'/auth/methods.inc.php';
+        require_once dirname(__FILE__).'/auth/auth.inc.php';
 
         $gpex_pass = $_GET["pass"];
         $gpex_url  = urldecode($_GET["url"]);
@@ -151,17 +148,17 @@ class AuthModule extends PLModule
         }
 
         /* on parcourt les entrees de groupes_auth */
-        $res = $globals->xdb->iterRow('select privkey,name,datafields from groupesx_auth');
+        $res = XDB::iterRow('select privkey,name,datafields from groupesx_auth');
 
         while (list($privkey,$name,$datafields) = $res->next()) {
             if (md5($gpex_challenge.$privkey) == $gpex_pass) {
                 $returl = $gpex_url.gpex_make_params($gpex_challenge,$privkey,$datafields);
-                redirect($returl);
+                http_redirect($returl);
             }
         }
 
         /* si on n'a pas trouvé, on renvoit sur x.org */
-        redirect('https://www.polytechnique.org/');
+        http_redirect('https://www.polytechnique.org/');
     }
 }