wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103 from mmn/use_httpclient_fetcher_for_get_and_head

Browse Source 
Use GNU social HTTPClient to GET and HEAD (consistent HTTP config)
This commit is contained in:
Hannes Mannerheim 2015-02-07 16:16:44 +01:00
commit b405387987
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
actions/apiexternalusershow.php
View File

@ -52,14 +52,7 @@ class ApiExternalUserShowAction extends ApiPrivateAuthAction
if(strstr($profileurl, '/user/')) { if(strstr($profileurl, '/user/')) {
$redrected_profileurl = $this->getRedirectUrl($profileurl); $redrected_profileurl = $this->getRedirectUrl($profileurl);
if (!empty($redrected_profileurl)) {
// if there's multiple redirects the _first_ redirect is most likely to be the real profileurl
if(is_array($redrected_profileurl)) {
$profileurl = $redrected_profileurl[0];
}
// if only one redirect
elseif($redrected_profileurl !== false) {
$profileurl = $redrected_profileurl; $profileurl = $redrected_profileurl;
} }
@ -106,8 +99,10 @@ class ApiExternalUserShowAction extends ApiPrivateAuthAction
// get profile from external instance // get profile from external instance
$apicall = $instanceurl.'/api/users/show.json?id='.$username; $apicall = $instanceurl.'/api/users/show.json?id='.$username;
stream_context_set_default(array('http' => array('method' => 'GET'))); $client = new HTTPClient();
$this->profile->external = json_decode(file_get_contents($apicall)); $response = $client->get($apicall);
// json_decode returns null if it fails to decode
$this->profile->external = $response->isOk() ? json_decode($response->getBody()) : null;
return true; return true;
} }
@ -148,18 +143,12 @@ class ApiExternalUserShowAction extends ApiPrivateAuthAction
/** /**
* Get redirect(s) for an url * Get redirect(s) for an url
* *
* @return mixed Location URL if redirect, null if no Location header (through HTTP_Request2_Response getHeader())
*/ */
function getRedirectUrl ($url) { function getRedirectUrl ($url) {
stream_context_set_default(array( $client = new HTTPClient();
'http' => array( $response = $client->head($url);
'method' => 'HEAD' return $response->getHeader('Location'); // null if it isn't set
)
));
$headers = get_headers($url, 1);
if ($headers !== false && isset($headers['Location'])) {
return $headers['Location'];
}
return false;
} }