remove error logs and manage openid1 properly.

diff --git a/lib/actions.php b/lib/actions.php
index 40b1f7736d55db0aad988df0b475807bf0cb45d1..69ae0fb7d8e088cecf0155aebe9b1710a5d4920b 100755 (executable)
--- a/lib/actions.php
+++ b/lib/actions.php
@@ -23,8 +23,6 @@ function action_default()
 \r
     $request = $server->decodeRequest();\r
     \r
-    error_log("in action_default, request = ".print_r($request,true));\r
-\r
     if (!$request) {\r
         return ""; //about_render();\r
     }\r
@@ -34,27 +32,26 @@ function action_default()
     if (in_array($request->mode,\r
                  array('checkid_immediate', 'checkid_setup'))) {\r
                      \r
-        error_log("in action_default, about to run isTrusted");\r
-\r
-        if (isTrusted($request->identity, $request->trust_root, $request->return_to)) {\r
-            error_log("in action_default, yes, is trusted");\r
-            $response =& $request->answer(true);\r
+        \r
+        $identity = getLoggedInUser();\r
+        if (isTrusted($identity, $request->trust_root, $request->return_to)) {\r
+            if ($request->message->isOpenID1()) {\r
+                   $response =& $request->answer(true);\r
+           } else {\r
+                   $response =& $request->answer(true, false, getServerURL(), $identity);\r
+           }\r
         } else if ($request->immediate) {\r
-             error_log("in action_default, yes, immediate");\r
             $response =& $request->answer(false, getServerURL());\r
         } else {\r
             if (!getLoggedInUser()) {\r
-                 error_log("in action_default, calling login render");\r
                 #return login_render();\r
                 system_message(elgg_echo('openid_server:not_logged_in'));\r
                 return gatekeeper();\r
                 #return action_login();\r
             }\r
-             error_log("in action_default, calling trust render");\r
             return trust_render($request);\r
         }\r
-        error_log("in action_default, about to add sreg fields");\r
-               addSregFields(&$response);\r
+       addSregFields(&$response);\r
 \r
     } else {\r
         $response =& $server->handleRequest($request);\r
@@ -149,7 +146,6 @@ function action_trust()
     $info = getRequestInfo();\r
     $trusted = isset($_POST['trust']);\r
     if ($info && isset($_POST['remember'])) {\r
-        error_log("setTrustedSite0");\r
         $store->setTrustedSite($info->trust_root);\r
     }\r
     return doAuth($info, $trusted, true);\r