Changeset 6675 for OpenPNE/branches/work/ogawa/openid/webapp/modules/openid/page/auth.php

Timestamp:

Apr 20, 2008, 1:44:59 PM (13 years ago)

Author:

ogawa

Message:

#1762:2.0.1で動くよう修正

File:

• OpenPNE/branches/work/ogawa/openid/webapp/modules/openid/page/auth.php (modified) (3 diffs)

OpenPNE/branches/work/ogawa/openid/webapp/modules/openid/page/auth.php

@@ -1 +1 @@
 <?php
 /**
- * @copyright 2005-2007 OpenPNE Project
+ * @copyright 2005-2008 OpenPNE Project
  * @license   http://www.php.net/license/3_01.txt PHP License 3.01
  */
+
+require_once 'Auth/OpenID/Server.php';
+require_once 'Auth/OpenID/FileStore.php';
 
 class openid_page_auth extends OpenPNE_Action
@@ -11 +14 @@
         return false;
     }
-    
+
     function execute($requests)
     {
-        require_once 'Auth/OpenID.php';
-        require_once 'Auth/OpenID/Association.php';
-        require_once 'Auth/OpenID/HMACSHA1.php';
-        require_once 'Auth/OpenID/Consumer.php';
-        require_once 'Auth/OpenID/Server.php';
-        require_once 'Auth/OpenID/ServerRequest.php';
-        require_once 'Auth/OpenID/FileStore.php';
-        
-        $server =& new Auth_OpenID_Server(new Auth_OpenID_FileStore(OPENPNE_VAR_DIR . '/tmp'));
-        $request = $_REQUEST;
-        $request = Auth_OpenID::fixArgs($request);
-        $request = $server->decodeRequest($request);
-        
-        
-        if ($_REQUEST['openid_mode'] == "associate") {
-            if (in_array($request->mode,
-                         array('checkid_immediate', 'checkid_setup'))) {
+        $oserver =& new Auth_OpenID_Server(new Auth_OpenID_FileStore(OPENPNE_VAR_DIR . '/tmp'));
+        $request = $oserver->decodeRequest();
 
-                $response =& $request->answer(true);
-                $sreg = getSreg($request->identity);
-                if (is_array($sreg)) {
-                    foreach ($sreg as $k => $v) {
-                        $response->addField('sreg', $k, 
-                                            $v);
-                    }
-                }
-            } else {
-                $response =& $server->handleRequest($request);
+        $response = null;
+        if (in_array($request->mode, array('checkid_immediate', 'checkid_setup'))) {
+            if ($request->immediate) {
+                $response = $request->answer(false);
             }
-            $response =& $server->handleRequest($request);
-            $webresponse =& $server->encodeResponse($response);
-        
+        } else {
+            $response = $oserver->handleRequest($request);
+        }
+
+        if ($response) {
+            $webresponse = $oserver->encodeResponse($response);
+
             foreach ($webresponse->headers as $k => $v) {
                 header("$k: $v");
             }
-        
-            header(header_connection_close);
-            print $webresponse->body;
+            header('Connection: close');
+            echo $webresponse->body;
             exit;
         }
-        
+
         if ($auth = openpne_ext_search("openid/auth.inc")) {
             require_once $auth;
@@ -60 +45 @@
             require_once 'auth.inc';
         }
+
         if ($requests['id'] != $GLOBALS['AUTH']->uid()) {
-            $GLOBALS['AUTH']->logout();
-            $parts = explode('/', $_SERVER['SCRIPT_NAME']);
-            $_REQUEST['login_params'] = $_SERVER['QUERY_STRING'];
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                $_POST = array('login_params' => $_SERVER['QUERY_STRING']);
-            } else {
-                $_GET = array('login_params' => $_SERVER['QUERY_STRING']);
-            }
-            openpne_forward('ktai', 'page', "page_o_login");
-            exit;
+            exit('error');
         }
-        
+
         $_SESSION['request'] = serialize($request);
-        $this->set('id', $requests['id']);
         return 'success';
     }