remove error logs and few fixes.

diff --git a/lib/session.php b/lib/session.php
index 25940b3bbf1fc1d124daaba911a090e0d0261d3d..f0f38f7c99d20b7706f88299a08e106399c0d427 100755 (executable)
--- a/lib/session.php
+++ b/lib/session.php
@@ -77,7 +77,6 @@ function getServer()
     global $CONFIG;\r
     static $server;\r
     $op_endpoint = getServerURL();\r
-    error_log("In getServer()");\r
     if (!isset($server)) {\r
         $server =& new Auth_OpenID_Server(getOpenIDServerStore(),$op_endpoint);\r
     }\r
@@ -131,7 +130,6 @@ function getRequestInfo()
 \r
 function setRequestInfo($info=null)\r
 {\r
-    error_log("in setRequestInfo");\r
     if (!isset($info)) {\r
         unset($_SESSION['openid_server_request']);\r
     } else {\r

diff --git a/openid_server_include.php b/openid_server_include.php
index ae3227659a1ab59efd475580092be55081825817..6fbd319c4daa60b189337488dfa4ec07e5fbfa82 100755 (executable)
--- a/openid_server_include.php
+++ b/openid_server_include.php
@@ -13,7 +13,7 @@ require_once 'Auth/OpenID.php';
 require_once 'Auth/OpenID/Interface.php';\r
 require_once 'Auth/OpenID/Consumer.php';\r
 try {\r
-                include_once "Auth/OpenID/HMACSHA1.php";\r
+ //               include_once "Auth/OpenID/HMACSHA1.php";\r
 } catch(Exception $e) {\r
                // new way :P\r
                 require_once "Auth/OpenID/HMAC.php";\r
@@ -68,7 +68,6 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
         }\r
         \r
         if (!$assocs || (count($assocs) == 0)) {\r
-            error_log("in getAssociations - cannot get associations for server url: $server_url, handle: $handle");\r
             return null;\r
         } else {\r
             $associations = array();\r
@@ -138,8 +137,6 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                $association_obj->access_id = 2;\r
                $association_obj->title = 'association';\r
                \r
-               error_log("in storeAssociation, attempting to save association with new handle: ".$association->handle);\r
-               \r
                if ($association_obj->save()) {         \r
                $association_obj->server_url = $server_url;\r
                $association_obj->handle = $association->handle;\r
@@ -147,7 +144,6 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
             $association_obj->issued = $association->issued;\r
             $association_obj->lifetime = $association->lifetime;\r
             $association_obj->assoc_type = $association->assoc_type;\r
-            error_log("in storeAssociation, saved association with new handle: ".$association->handle);\r
                return true;\r
                } else {\r
                return false;\r
@@ -201,7 +197,6 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
                if ($results) {\r
                foreach ($results as $site) {\r
                        $sites[] = $site->trust_root;\r
-               error_log("GET TRUST".$site->trust_root);\r
                }\r
                }\r
                return $sites;\r
@@ -249,7 +244,6 @@ class OpenIDServer_ElggStore extends Auth_OpenID_OpenIDStore {
        function setTrustedSite($trust_root) {\r
                $openid_url = getLoggedInUser();\r
                $site = new ElggObject();\r
-               error_log("SET TRUST-"."X".$trust_root->site_name."X".$trust_root->trust_root.":-:".$openid_url);\r
                $site->subtype = 'openid_server::trust_root';\r
                $site->owner_guid = 0;\r
                $site->title = 'association';\r

diff --git a/server.php b/server.php
index 8898126141f015087dff8c7ca217a3cbd54ba000..7ebe70dd4d6883dec7263635c26788c28af7d9fd 100755 (executable)
--- a/server.php
+++ b/server.php
@@ -4,36 +4,29 @@ require_once('openid_server_include.php');
 require_once 'lib/session.php';\r
 require_once 'lib/actions.php';\r
 \r
-error_log('translations: '.print_r($CONFIG->translations,true));\r
+if (elgg_get_viewtype() == 'xrds') {\r
+       echo elgg_view_page($title, $body);\r
+       exit(0);\r
+}\r
 \r
-error_log('in server.php - trying to get server $_SESSION = '.print_r($_SESSION,true));\r
 $store = getOpenIDServerStore();\r
 \r
 $server =& getServer();\r
 \r
-error_log('in server.php - trying to decode request, action='.getAction());\r
-\r
 $request = $server->decodeRequest();\r
-//error_log('in server.php - request:'.print_r($request,true));\r
 setRequestInfo($request);\r
-error_log('in server.php - after setRequestInfo');\r
+\r
 $action = getAction();\r
 if (!function_exists($action)) {\r
     $action = 'action_default';\r
 }\r
 \r
-error_log('in server.php - dispatching action '.$action);\r
-\r
 $resp = $action();\r
-\r
-writeResponse($resp);\r
-/*if (isloggedin()) {\r
-    error_log('in server.php - about to forward');\r
-    forward($CONFIG->wwwroot.'mod/openid_server/actions/trust.php');\r
+if (!empty($resp)) {\r
+       writeResponse($resp);\r
 } else {\r
-    error_log('in server.php - not logged in');\r
-    system_message(elgg_echo('openid_server:not_logged_in'));\r
-    forward();\r
-}*/\r
+       echo elgg_view_page($title, $body);\r
+        exit(0);\r
 \r
+}\r
 ?>\r

diff --git a/start.php b/start.php
index a00811ab9ea1aa2e439aa31e5400b861a650784b..b9a480b6e6b54a021228c09d2aa14c00be7d40c0 100755 (executable)
--- a/start.php
+++ b/start.php
@@ -10,25 +10,17 @@
  * @link http://elgg.com/\r
  */\r
  \r
- /*\r
- \r
- To do here:\r
- \r
- - put server link in profile page\r
- \r
-*/\r
-/*FIXME check if this extend is working or delete it*/\r
-//extend_view('page_elements/header_contents', 'page_elements/openid_linkrel');\r
-\r
-//set_include_path(get_include_path() . PATH_SEPARATOR . $CONFIG->path . 'mod/openid_server/');\r
 global $CONFIG;\r
-set_include_path($CONFIG->path . 'mod/openid_api/vendors/php-openid/' . PATH_SEPARATOR . $CONFIG->path . 'mod/openid_server/');\r
+if (get_include_path())\r
+       set_include_path(get_include_path() . PATH_SEPARATOR . $CONFIG->path . 'mod/openid_api/vendors/php-openid/' . PATH_SEPARATOR . $CONFIG->path . 'mod/openid_server/');\r
+else\r
+       set_include_path($CONFIG->path . 'mod/openid_api/vendors/php-openid/' . PATH_SEPARATOR . $CONFIG->path . 'mod/openid_server/');\r
 \r
 elgg_register_event_handler('init','system','openid_server_init',1);\r
 \r
 function openid_server_init() {\r
 \r
-        global $CONFIG;\r
+       global $CONFIG;\r
        elgg_register_event_handler('login','user','openid_server_handle_login');\r
        elgg_register_event_handler('logout','user','openid_server_handle_logout');\r
  \r
@@ -37,9 +29,10 @@ function openid_server_init() {
        $base = elgg_get_plugins_path() . 'openid_server/actions';\r
        elgg_register_action('openid_server/trust', "$base/trust.php", 'public');\r
 \r
-     //elgg_extend_view("metatags", "openid_server/metatags");\r
-     elgg_extend_view("page/elements/head", "openid_server/metatags");\r
-     elgg_extend_view("xrds/services", "openid_server/service");\r
+        elgg_extend_view("metatags", "openid_server/metatags");\r
+        elgg_extend_view("page/elements/head", "openid_server/metatags");\r
+        elgg_extend_view("xrds/services", "openid_server/service");\r
+        elgg_extend_view("profile/wrapper", "openid_server/profile");\r
 }\r
 \r
 \r

diff --git a/views/default/forms/openid_server/trust.php b/views/default/forms/openid_server/trust.php
index 3dac9b648cc5ceea4f5d35cb5023dcd25846520c..b9e4c3333f4d6e0d7dd63e4f1116b43d95cdcb79 100755 (executable)
--- a/views/default/forms/openid_server/trust.php
+++ b/views/default/forms/openid_server/trust.php
@@ -18,7 +18,7 @@
 $user = elgg_get_logged_in_user_entity();\r
 $openid_trust_root = elgg_extract('openid_trust_root', $vars);\r
 \r
-echo '<div>' . elgg_echo('openid_server:trust_question', array($openid_trust_root, elgg_get_site_entity()->name, $user->username));\r
+echo '<div>' . elgg_echo('openid_server:trust_question', array($openid_trust_root, elgg_get_site_entity()->name . ":" .  $user->username));\r
 \r
 /*echo '<div class="mll">'.elgg_view('input/checkbox', array(\r
        'name' => 'name',\r

diff --git a/views/default/openid_server/metatags.php b/views/default/openid_server/metatags.php
index 9b486568e662d32e87f30efb07c5707bd11531a2..422e3b74db65b63ae229cd3819f973e098ddcdae 100755 (executable)
--- a/views/default/openid_server/metatags.php
+++ b/views/default/openid_server/metatags.php
@@ -1,7 +1,7 @@
 <?php\r
 \r
        /**\r
-        * Adds metatags to identify OpenID server\r
+        * Adds metatags to identify OpenID server for openid 1.0\r
         * \r
         * @package ElggOpenID\r
         * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
@@ -12,5 +12,10 @@
         */\r
 \r
        global $CONFIG;\r
+       $owner = elgg_get_page_owner_entity();\r
+       if ($owner && elgg_get_context() == 'profile') {\r
 ?>\r
        <link rel="openid.server" href="<?php echo $CONFIG->wwwroot; ?>mod/openid_server/server.php" />\r
+<?php\r
+       }\r
+?>\r

diff --git a/views/default/openid_server/metatags.php.old b/views/default/openid_server/metatags.php.old
deleted file mode 100755 (executable)
index fddca8c..0000000
--- a/views/default/openid_server/metatags.php.old
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php\r
-\r
-       /**\r
-        * Adds metatags to identify OpenID server\r
-        * \r
-        * @package ElggOpenID\r
-        * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2\r
-        * @author Kevin Jardine <kevin@radagast.biz>\r
-        * @copyright Curverider Ltd 2008-2009\r
-        * @link http://elgg.org/\r
-        * \r
-        */\r
-\r
-?>\r
-\r
-<!-- \r
-\r
-why does this not work?\r
-\r
-<link rel="openid.server" href="<?php print $CONFIG->wwwroot; ?>mod/openid_server/server.php" />\r
-<link rel="openid2.provider" href="<?php print $CONFIG->wwwroot; ?>mod/openid_server/server.php" />\r
-\r
--->
\ No newline at end of file

diff --git a/views/xrds/openid_server/service.php b/views/xrds/openid_server/service.php
index 7daafbbede8b0f58935c522c4ed0a6a47eb758d1..269df5c2e80b3520321e28976e44e65c57da106f 100644 (file)
--- a/views/xrds/openid_server/service.php
+++ b/views/xrds/openid_server/service.php
@@ -1,9 +1,15 @@
 <?php
        /*
-       XRD info to identify do eaut email to profile mapping.
+       XRD info to identify do eaut email to profile mapping
+        and identify openid 2.0 server.
        */
 ?>
           <Service priority="0">
             <Type>http://specs.eaut.org/1.0/template</Type>
             <URI><?php echo $vars['url']; ?>profile/%7Busername%7D</URI>
           </Service>
+          <Service priority="10">
+            <Type>http://specs.openid.net/auth/2.0/server</Type>
+            <URI><?php echo $vars['url']; ?>mod/openid_server/server.php</URI>
+          </Service>
+