Bugfixing for CurlResult

diff --git a/blogger/blogger.php b/blogger/blogger.php
index e747c3a6b5ba98ea64f3b957eb0a94e5356eeb16..00563c3adb1ee94ef476530029e75833f1aca14d 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -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);

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index f6f266347a52400fd0cc1128f3c32f5f02748a6d..bc8959fc36aa16e87c7ccb305fca512e6f22db71 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -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);

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 5d24509e374854629126fcbe40580d34d16717c6..3dcfb31fe52264582cbb84cb2d32f3f1c65aec91 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -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);
        }

diff --git a/libertree/libertree.php b/libertree/libertree.php
index c6e3f9f1ef3cc6aca62b78cb3f6017a24065cd21..aa4c48b713dcd96d3a07ccc8e5a49ee48dbd6d48 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -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);
        }
 }

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index 61c96b7dbf1a70eaf7557e0030046081518f0299..dfc1387b07a6dadceee0b40c57f2bcfa1fd206e0 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -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);
        }

diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 5636af64d918f3745bf0556d37c4d6166be129f8..7df3111298e5787396ee9d46be9c85bf797571c1 100644 (file)
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -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) {

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 839483607cc0f566dab07ad6a6c887d760f2d4fb..0420591eb95b414fc8288afd344c9f07fb2f8e21 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -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);
                }
        }

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 4529ccd2df8fec5b22bc889647e9cc77ec761b3e..2bb52331570094f8a76529818cc6b5415e568ee6 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -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();
 }
 
 /*

diff --git a/wppost/wppost.php b/wppost/wppost.php
index d3e219498300e757df16c1675ca444c45ea38f2b..76d928a2c7f30055b5b1abb2da5c1c83cc9071a8 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -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);
        }