dont normalise OpenID URLs and fallback to https if no protocol is specified

diff --git a/mod/profile.php b/mod/profile.php
index bb45d1fec8591a0ab46bfc097e443a4a5354e384..e81cfd22c94878023c604fd4c80f6d2a02e32ec7 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -44,7 +44,7 @@ function profile_init(&$a) {
        if(x($a->profile,'openidserver'))
                $a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
        if(x($a->profile,'openid')) {
-               $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
+               $delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'https://' . $a->profile['openid']);
                $a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
        }
        // site block

diff --git a/mod/settings.php b/mod/settings.php
index 67f8d69a2ed94cd00dec023156cbcb8dfd5a8d53..7db196b0308c6dd112f135520ccef519e37c3c26 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -474,7 +474,7 @@ function settings_post(&$a) {
        $str_contact_deny  = perms2str($_POST['contact_deny']);
 
        $openidserver = $a->user['openidserver'];
-       $openid = normalise_openid($openid);
+       //$openid = normalise_openid($openid);
 
        // If openid has changed or if there's an openid but no openidserver, try and discover it.
 
@@ -1002,7 +1002,7 @@ function settings_content(&$a) {
                $openid_field = false;
        }
        else {
-               $openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."));
+               $openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url");
        }