X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fopenid.php;h=15e7565f992571d3bee4bd427bc8d67c671eae82;hb=73f2bb48667fc29db93551f9b1681fe5b1918bc7;hp=6b8f031e19ebba317f0dde5e0ef5e77e26601549;hpb=d1e6167749fdad08c81e23d09e1bbbf76e3b989b;p=platal.git

diff --git a/modules/openid.php b/modules/openid.php
index 6b8f031..15e7565 100644
--- a/modules/openid.php
+++ b/modules/openid.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -70,7 +70,7 @@ class OpenidModule extends PLModule
         );
     }
 
-    function handler_openid(&$page, $login = null)
+    function handler_openid($page, $login = null)
     {
         $this->load('openid.inc.php');
         $requested_user = User::getSilent($login);
@@ -133,7 +133,7 @@ class OpenidModule extends PLModule
         pl_redirect('');
     }
 
-    function handler_melix(&$page, $login = null)
+    function handler_melix($page, $login = null)
     {
         $this->load('openid.inc.php');
 
@@ -148,7 +148,7 @@ class OpenidModule extends PLModule
         }
     }
 
-    function handler_xrds(&$page, $login = null)
+    function handler_xrds($page, $login = null)
     {
         $this->load('openid.inc.php');
         $requested_user = User::getSilent($login);
@@ -163,7 +163,7 @@ class OpenidModule extends PLModule
         }
     }
 
-    function handler_trust(&$page)
+    function handler_trust($page)
     {
         $this->load('openid.inc.php');
         $server = new OpenId();
@@ -197,32 +197,31 @@ class OpenidModule extends PLModule
 
         // Finally answers the request.
         if ($server->IsUserAuthorized($user) && $trusted) {
-            $server->AnswerRequest(
-                true, $user, Post::b('trust_sreg') ? $sreg_response : null);
+            $server->AnswerRequest(true, Post::b('trust_sreg') ? $sreg_response : null);
         } else {
             $server->AnswerRequest(false);
         }
     }
 
-    function handler_trusted(&$page, $action = 'list', $id = null)
+    function handler_trusted($page, $action = 'list', $id = null)
     {
         $page->setTitle('Sites tiers de confiance');
         $page->assign('title', 'Mes sites tiers de confiance pour OpenId');
-        $table_editor = new PLTableEditor('openid/trusted', 'openid_trusted', 'id');
-        $table_editor->set_where_clause('user_id = ' . XDB::escape(S::user()->id()));
-        $table_editor->vars['user_id']['display'] = false;
+        $table_editor = new PLTableEditor('openid/trusted', 'account_auth_openid', 'id');
+        $table_editor->set_where_clause(XDB::format('uid = {?}',  S::user()->id()));
+        $table_editor->vars['uid']['display'] = false;
         $table_editor->describe('url', 'site tiers', true);
         $page->assign('deleteonly', true);
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_admin_trusted(&$page, $action = 'list', $id = null)
+    function handler_admin_trusted($page, $action = 'list', $id = null)
     {
         $page->setTitle('Sites tiers de confiance');
         $page->assign('title', 'Sites tiers de confiance globaux pour OpenId');
-        $table_editor = new PLTableEditor('admin/openid/trusted', 'openid_trusted', 'id');
-        $table_editor->set_where_clause('user_id IS NULL');
-        $table_editor->vars['user_id']['display'] = false;
+        $table_editor = new PLTableEditor('admin/openid/trusted', 'account_auth_openid', 'id');
+        $table_editor->set_where_clause('uid IS NULL');
+        $table_editor->vars['uid']['display'] = false;
         $table_editor->describe('url', 'site tiers', true);
         $page->assign('readonly', true);
         $table_editor->apply($page, $action, $id);