haheute/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request #744 from nupplaphil/friendica-5879

Browse source 
Bugfixing for CurlResult
This commit is contained in:
Michael Vogel 2018-10-11 07:45:11 +02:00 committed by GitHub
parent ce2af45897 2e8d9ba39b
commit 30c1542893
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blogger/blogger.php
View file

@ -205,7 +205,7 @@ EOT;
logger('blogger: data: ' . $xml, LOGGER_DATA); logger('blogger: data: ' . $xml, LOGGER_DATA);
if ($bl_blog !== 'test') { 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); logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);

2
dwpost/dwpost.php
View file

@ -228,7 +228,7 @@ EOT;
logger('dwpost: data: ' . $xml, LOGGER_DATA); logger('dwpost: data: ' . $xml, LOGGER_DATA);
if ($dw_blog !== 'test') { 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); logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);

2
ijpost/ijpost.php
View file

@ -224,7 +224,7 @@ EOT;
logger('ijpost: data: ' . $xml, LOGGER_DATA); logger('ijpost: data: ' . $xml, LOGGER_DATA);
if ($ij_blog !== 'test') { 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); logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
} }

2
libertree/libertree.php
View file

@ -231,7 +231,7 @@ function libertree_send(&$a,&$b) {
// 'token' => $ltree_api_token // 'token' => $ltree_api_token
]; ];
$result = Network::post($ltree_blog, $params); $result = Network::post($ltree_blog, $params)->getBody();
logger('libertree: ' . $result); logger('libertree: ' . $result);
} }
} }

2
ljpost/ljpost.php
View file

@ -234,7 +234,7 @@ EOT;
logger('ljpost: data: ' . $xml, LOGGER_DATA); logger('ljpost: data: ' . $xml, LOGGER_DATA);
if ($lj_blog !== 'test') { 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); logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
} }

6
mastodoncustomemojis/mastodoncustomemojis.php
View file

@ -89,10 +89,10 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
$api_url = $api_base_url . '/api/v1/custom_emojis'; $api_url = $api_base_url . '/api/v1/custom_emojis';
$ret = Network::fetchUrlFull($api_url); $fetchResult = Network::fetchUrlFull($api_url);
if ($ret['success']) { if ($fetchResult->isSuccess()) {
$emojis_array = json_decode($ret['body'], true); $emojis_array = json_decode($fetchResult->getBody(), true);
if (is_array($emojis_array) && count($emojis_array)) { if (is_array($emojis_array) && count($emojis_array)) {
foreach ($emojis_array as $emoji) { foreach ($emojis_array as $emoji) {

6
openstreetmap/openstreetmap.php
View file

@ -129,9 +129,9 @@ function openstreetmap_get_coordinates($a, &$b)
$j = Cache::get($cachekey); $j = Cache::get($cachekey);
if (is_null($j)) { if (is_null($j)) {
$x = Network::curl($nomserver . $args); $curlResult = Network::curl($nomserver . $args);
if ($x['success']) { if ($curlResult->isSuccess()) {
$j = json_decode($x['body'], true); $j = json_decode($curlResult->getBody(), true);
Cache::set($cachekey, $j, CACHE_MONTH); Cache::set($cachekey, $j, CACHE_MONTH);
} }
} }

3
pumpio/pumpio.php
View file

@ -1691,8 +1691,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
function pumpio_reachable($url) function pumpio_reachable($url)
{ {
$data = Network::curl($url, false, $redirects, ['timeout'=>10]); return Network::curl($url, false, $redirects, ['timeout'=>10])->isSuccess();
return intval($data['return_code']) != 0;
} }
/* /*

2
wppost/wppost.php
View file

@ -315,7 +315,7 @@ EOT;
logger('wppost: data: ' . $xml, LOGGER_DATA); logger('wppost: data: ' . $xml, LOGGER_DATA);
if ($wp_blog !== 'test') { 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); logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
} }