Merge pull request #3874 from tobiasd/20171009-checkversion

[friendica.git] / library / openid.php

diff --git a/library/openid.php b/library/openid.php
index 7c88c02d82a6a94d38d2f18055ce34144a95a1ce..7e5873bdbd7a53bd555f228d27ffb90fc45943ff 100644 (file)
--- a/library/openid.php
+++ b/library/openid.php
@@ -276,7 +276,7 @@ class LightOpenID
 
     protected function request($url, $method='GET', $params=array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode')) {
+        if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);
@@ -348,8 +348,8 @@ class LightOpenID
                     }
 
                     if (isset($headers['content-type'])
-                        && strpos($headers['content-type'], 'application/xrds+xml') !== false
-                    ) {
+                        && ((strpos($headers['content-type'], 'application/xrds+xml') !== false
+                    ) || (strpos($headers['content-type'], 'text/xml') !== false))) {
                         # Found an XRDS document, now let's find the server, and optionally delegate.
                         $content = $this->request($url, 'GET');
 
@@ -375,7 +375,7 @@ class LightOpenID
                                 $server = $server[1];
                                 if (isset($delegate[2])) $this->identity = trim($delegate[2]);
                                 $this->version = 2;
-
+#logger('Server: ' . $server);
                                 $this->server = $server;
                                 return $server;
                             }
@@ -419,7 +419,7 @@ class LightOpenID
             }
 
             if (!$content) $content = $this->request($url, 'GET');
-
+logger('openid' . $content);
             # At this point, the YADIS Discovery has failed, so we'll switch
             # to openid2 HTML discovery, then fallback to openid 1.1 discovery.
             $server   = $this->htmlTag($content, 'link', 'rel', 'openid2.provider', 'href');