aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rwxr-xr-xviews/default/forms/openid_server/trust.php2
-rwxr-xr-xviews/default/openid_server/metatags.php7
-rwxr-xr-xviews/default/openid_server/metatags.php.old23
3 files changed, 7 insertions, 25 deletions
diff --git a/views/default/forms/openid_server/trust.php b/views/default/forms/openid_server/trust.php
index 3dac9b648..b9e4c3333 100755
--- 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();
$openid_trust_root = elgg_extract('openid_trust_root', $vars);
-echo '<div>' . elgg_echo('openid_server:trust_question', array($openid_trust_root, elgg_get_site_entity()->name, $user->username));
+echo '<div>' . elgg_echo('openid_server:trust_question', array($openid_trust_root, elgg_get_site_entity()->name . ":" . $user->username));
/*echo '<div class="mll">'.elgg_view('input/checkbox', array(
'name' => 'name',
diff --git a/views/default/openid_server/metatags.php b/views/default/openid_server/metatags.php
index 9b486568e..422e3b74d 100755
--- a/views/default/openid_server/metatags.php
+++ b/views/default/openid_server/metatags.php
@@ -1,7 +1,7 @@
<?php
/**
- * Adds metatags to identify OpenID server
+ * Adds metatags to identify OpenID server for openid 1.0
*
* @package ElggOpenID
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
@@ -12,5 +12,10 @@
*/
global $CONFIG;
+ $owner = elgg_get_page_owner_entity();
+ if ($owner && elgg_get_context() == 'profile') {
?>
<link rel="openid.server" href="<?php echo $CONFIG->wwwroot; ?>mod/openid_server/server.php" />
+<?php
+ }
+?>
diff --git a/views/default/openid_server/metatags.php.old b/views/default/openid_server/metatags.php.old
deleted file mode 100755
index fddca8ceb..000000000
--- a/views/default/openid_server/metatags.php.old
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
- /**
- * Adds metatags to identify OpenID server
- *
- * @package ElggOpenID
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Kevin Jardine <kevin@radagast.biz>
- * @copyright Curverider Ltd 2008-2009
- * @link http://elgg.org/
- *
- */
-
-?>
-
-<!--
-
-why does this not work?
-
-<link rel="openid.server" href="<?php print $CONFIG->wwwroot; ?>mod/openid_server/server.php" />
-<link rel="openid2.provider" href="<?php print $CONFIG->wwwroot; ?>mod/openid_server/server.php" />
-
---> \ No newline at end of file