[Evocms-plugins-commits] SF.net SVN: evocms-plugins:[814] openid_plugin/trunk/php-openid/Auth/OpenID

[<bl...@us...>]

Revision: 814
          http://evocms-plugins.svn.sourceforge.net/evocms-plugins/?rev=814&view=rev
Author:   blueyed
Date:     2008-08-25 21:39:40 +0000 (Mon, 25 Aug 2008)

Log Message:
-----------
Update php-openid library from upstream darcs repository

Modified Paths:
--------------
    openid_plugin/trunk/php-openid/Auth/OpenID/Consumer.php
    openid_plugin/trunk/php-openid/Auth/OpenID/Server.php

Modified: openid_plugin/trunk/php-openid/Auth/OpenID/Consumer.php
===================================================================
--- openid_plugin/trunk/php-openid/Auth/OpenID/Consumer.php	2008-08-24 02:23:42 UTC (rev 813)
+++ openid_plugin/trunk/php-openid/Auth/OpenID/Consumer.php	2008-08-25 21:39:40 UTC (rev 814)
@@ -711,7 +711,9 @@
             return $this->_completeInvalid($message, $endpoint);
         }
 
-        return new Auth_OpenID_SetupNeededResponse($endpoint);
+        $user_setup_url = $message->getArg(Auth_OpenID_OPENID2_NS,
+                                           'user_setup_url');
+        return new Auth_OpenID_SetupNeededResponse($endpoint, $user_setup_url);
     }
 
     /**

Modified: openid_plugin/trunk/php-openid/Auth/OpenID/Server.php
===================================================================
--- openid_plugin/trunk/php-openid/Auth/OpenID/Server.php	2008-08-24 02:23:42 UTC (rev 813)
+++ openid_plugin/trunk/php-openid/Auth/OpenID/Server.php	2008-08-25 21:39:40 UTC (rev 814)
@@ -765,12 +765,17 @@
 
     function Auth_OpenID_CheckIDRequest($identity, $return_to,
                                         $trust_root = null, $immediate = false,
-                                        $assoc_handle = null, $server = null)
+                                        $assoc_handle = null, $server = null,
+                                        $claimed_id = null)
     {
         $this->namespace = Auth_OpenID_OPENID2_NS;
         $this->assoc_handle = $assoc_handle;
         $this->identity = $identity;
-        $this->claimed_id = $identity;
+        if ($claimed_id === null) {
+            $this->claimed_id = $identity;
+        } else {
+            $this->claimed_id = $claimed_id;
+        }
         $this->return_to = $return_to;
         $this->trust_root = $trust_root;
         $this->server =& $server;
@@ -1098,7 +1103,8 @@
                                                 $this->trust_root,
                                                 false,
                                                 $this->assoc_handle,
-                                                $this->server);
+                                                $this->server,
+                                                $this->claimed_id);
                 $setup_request->message = $this->message;
 
                 $setup_url = $setup_request->encodeToURL($server_url);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.