Merge pull request #862 from nupplaphil/bugs/6917-php_warning

[various] Refactor url/fetchUrl parameter

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 99574f6..e4abc59 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -157,9 +157,8 @@ function mailstream_do_images($a, &$item, &$attachments) {
        preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
        preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
        foreach (array_merge($matches1[3], $matches2[1]) as $url) {
-               $redirects = 0;
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
-               $curlResult = Network::fetchUrlFull($url, true, $redirects, 0, null, $cookiejar);
+               $curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
                $attachments[$url] = [
                        'data' => $curlResult->getBody(),
                        'guid' => hash("crc32", $url),

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index a8106a7..c4093f2 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1629,7 +1629,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 function pumpio_reachable($url)
 {
-       return Network::curl($url, false, $redirects, ['timeout'=>10])->isSuccess();
+       return Network::curl($url, false, ['timeout' => 10])->isSuccess();
 }
 
 /*

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 5638a79..583eff8 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1483,7 +1483,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
                        } elseif ($oembed_data->type != "link") {
                                $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
                        } else {
-                               $img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
+                               $img_str = Network::fetchUrl($expanded_url, true, 4);
 
                                $tempfile = tempnam(get_temppath(), "cache");
                                file_put_contents($tempfile, $img_str);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 166c99e..4065691 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1184,7 +1184,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
                                } elseif ($oembed_data->type != 'link') {
                                        $body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
                                } else {
-                                       $img_str = Network::fetchUrl($final_url, true, $redirects, 4);
+                                       $img_str = Network::fetchUrl($final_url, true, 4);
 
                                        $tempfile = tempnam(get_temppath(), 'cache');
                                        file_put_contents($tempfile, $img_str);