forked from friendica/friendica-addons
Merge pull request #744 from nupplaphil/friendica-5879
Bugfixing for CurlResult
This commit is contained in:
commit
30c1542893
9 changed files with 13 additions and 14 deletions
|
@ -205,7 +205,7 @@ EOT;
|
|||
logger('blogger: data: ' . $xml, LOGGER_DATA);
|
||||
|
||||
if ($bl_blog !== 'test') {
|
||||
$x = Network::post($bl_blog, $xml);
|
||||
$x = Network::post($bl_blog, $xml)->getBody();
|
||||
}
|
||||
|
||||
logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);
|
||||
|
|
|
@ -228,7 +228,7 @@ EOT;
|
|||
logger('dwpost: data: ' . $xml, LOGGER_DATA);
|
||||
|
||||
if ($dw_blog !== 'test') {
|
||||
$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
|
||||
$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
|
||||
}
|
||||
|
||||
logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
|
||||
|
|
|
@ -224,7 +224,7 @@ EOT;
|
|||
logger('ijpost: data: ' . $xml, LOGGER_DATA);
|
||||
|
||||
if ($ij_blog !== 'test') {
|
||||
$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]);
|
||||
$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
|
||||
}
|
||||
logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
|
||||
}
|
||||
|
|
|
@ -231,7 +231,7 @@ function libertree_send(&$a,&$b) {
|
|||
// 'token' => $ltree_api_token
|
||||
];
|
||||
|
||||
$result = Network::post($ltree_blog, $params);
|
||||
$result = Network::post($ltree_blog, $params)->getBody();
|
||||
logger('libertree: ' . $result);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -234,7 +234,7 @@ EOT;
|
|||
logger('ljpost: data: ' . $xml, LOGGER_DATA);
|
||||
|
||||
if ($lj_blog !== 'test') {
|
||||
$x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"]);
|
||||
$x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
|
||||
}
|
||||
logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
|
||||
}
|
||||
|
|
|
@ -89,10 +89,10 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
|
|||
|
||||
$api_url = $api_base_url . '/api/v1/custom_emojis';
|
||||
|
||||
$ret = Network::fetchUrlFull($api_url);
|
||||
$fetchResult = Network::fetchUrlFull($api_url);
|
||||
|
||||
if ($ret['success']) {
|
||||
$emojis_array = json_decode($ret['body'], true);
|
||||
if ($fetchResult->isSuccess()) {
|
||||
$emojis_array = json_decode($fetchResult->getBody(), true);
|
||||
|
||||
if (is_array($emojis_array) && count($emojis_array)) {
|
||||
foreach ($emojis_array as $emoji) {
|
||||
|
|
|
@ -129,9 +129,9 @@ function openstreetmap_get_coordinates($a, &$b)
|
|||
$j = Cache::get($cachekey);
|
||||
|
||||
if (is_null($j)) {
|
||||
$x = Network::curl($nomserver . $args);
|
||||
if ($x['success']) {
|
||||
$j = json_decode($x['body'], true);
|
||||
$curlResult = Network::curl($nomserver . $args);
|
||||
if ($curlResult->isSuccess()) {
|
||||
$j = json_decode($curlResult->getBody(), true);
|
||||
Cache::set($cachekey, $j, CACHE_MONTH);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1691,8 +1691,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
|
|||
|
||||
function pumpio_reachable($url)
|
||||
{
|
||||
$data = Network::curl($url, false, $redirects, ['timeout'=>10]);
|
||||
return intval($data['return_code']) != 0;
|
||||
return Network::curl($url, false, $redirects, ['timeout'=>10])->isSuccess();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -315,7 +315,7 @@ EOT;
|
|||
logger('wppost: data: ' . $xml, LOGGER_DATA);
|
||||
|
||||
if ($wp_blog !== 'test') {
|
||||
$x = Network::post($wp_blog, $xml);
|
||||
$x = Network::post($wp_blog, $xml)->getBody();
|
||||
}
|
||||
logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue