Merge pull request #504 from zeroadam/feature/Network

Network was moved to src

diff --git a/blogger/blogger.php b/blogger/blogger.php
index e9813dc2ef8c00af85c695c9468d9f968981b466..7dfbcc4a2d526f6b9b9d1420fad33751896ea285 100644 (file)
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -8,6 +8,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 function blogger_install()
 {
@@ -205,7 +206,7 @@ EOT;
                logger('blogger: data: ' . $xml, LOGGER_DATA);
 
                if ($bl_blog !== 'test') {
-                       $x = post_url($bl_blog, $xml);
+                       $x = Network::post($bl_blog, $xml);
                }
 
                logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);

diff --git a/buffer/buffer.php b/buffer/buffer.php
index 0f05b5c6285434ead6bb703b4260d7d10cd0c0db..bb1d8482e5405d23a3b642bba7f74e8d3277a3f7 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -272,11 +272,9 @@ function buffer_send(App $a, &$b)
        $client_secret = Config::get("buffer", "client_secret");
        $access_token = PConfig::get($b['uid'], "buffer","access_token");
 
-       if($access_token) {
+       if ($access_token) {
                $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
 
-               require_once 'include/network.php';
-
                $profiles = $buffer->go('/profiles');
                if (is_array($profiles)) {
                        logger("Will send these parameter ".print_r($b, true), LOGGER_DEBUG);
@@ -353,11 +351,11 @@ function buffer_send(App $a, &$b)
 
                                //if ($includedlinks) {
                                //      if (isset($post["url"]))
-                               //              $post["url"] = short_link($post["url"]);
+                               //              $post["url"] = Network::shortenUrl($post["url"]);
                                //      if (isset($post["image"]))
-                               //              $post["image"] = short_link($post["image"]);
+                               //              $post["image"] = Network::shortenUrl($post["image"]);
                                //      if (isset($post["preview"]))
-                               //              $post["preview"] = short_link($post["preview"]);
+                               //              $post["preview"] = Network::shortenUrl($post["preview"]);
                                //}
 
                                // Seems like a bug to me

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 525b03d027ffca882563f28556d4627acfb3d052..edf96c3eb517947b21368406f016f99657c9bc5e 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -9,7 +9,6 @@
  *
  */
 
-require_once 'include/network.php';
 require_once 'mod/proxy.php';
 require_once 'include/text.php';
 
@@ -18,6 +17,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 //  get the weather data from OpenWeatherMap
 function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0) {
@@ -32,7 +32,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0)
        }
     }
     try {
-       $res = new SimpleXMLElement(fetch_url($url));
+       $res = new SimpleXMLElement(Network::fetchUrl($url));
     } catch (Exception $e) {
        info(L10n::t('Error fetching weather data.\nError was: '.$e->getMessage()));
        return false;

diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index c5063baaad93fa5b698d986eaa12d1148a79ed21..42b1770e56d05ef72203a4f9f68d73aa40595912 100644 (file)
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 function dwpost_install() {
        Addon::registerHook('post_local',           'addon/dwpost/dwpost.php', 'dwpost_post_local');
@@ -220,10 +221,10 @@ EOT;
 
                logger('dwpost: data: ' . $xml, LOGGER_DATA);
 
-               if($dw_blog !== 'test')
-                       $x = post_url($dw_blog,$xml,["Content-Type: text/xml"]);
+               if($dw_blog !== 'test') {
+                       $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"]);
+               }
                logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
-
        }
 }
 

diff --git a/fortunate/fortunate.php b/fortunate/fortunate.php
index 4d87bffe77eeadb42061bd4a43d47952d54e6902..8c15caa6d9a6df18732d8fb9aa6796f4a22f6159 100644 (file)
--- a/fortunate/fortunate.php
+++ b/fortunate/fortunate.php
@@ -6,31 +6,33 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 use Friendica\Core\Addon;
+use Friendica\Util\Network;
 
 // IMPORTANT: SET THIS to your fortunate server
 
-define ('FORTUNATE_SERVER', 'hostname.com');
+define('FORTUNATE_SERVER', 'hostname.com');
 
-function fortunate_install() {
+function fortunate_install()
+{
        Addon::registerHook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch');
-       if(FORTUNATE_SERVER == 'hostname.com' && is_site_admin()) {
+       if (FORTUNATE_SERVER == 'hostname.com' && is_site_admin()) {
                notice('Fortunate addon requires configuration. See README');
        }
 }
 
-function fortunate_uninstall() {
+function fortunate_uninstall()
+{
        Addon::unregisterHook('page_end', 'addon/fortunate/fortunate.php', 'fortunate_fetch');
 }
 
 
-function fortunate_fetch(&$a,&$b) {
-
+function fortunate_fetch(&$a, &$b)
+{
        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' 
                . $a->get_baseurl() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n";
 
-       if(FORTUNATE_SERVER != 'hostname.com') {
-               $s = fetch_url('http://' . FORTUNATE_SERVER . '/cookie.php?numlines=2&equal=1&rand=' . mt_rand());
+       if (FORTUNATE_SERVER != 'hostname.com') {
+               $s = Network::fetchUrl('http://' . FORTUNATE_SERVER . '/cookie.php?numlines=2&equal=1&rand=' . mt_rand());
                $b .= '<div class="fortunate">' . $s . '</div>';
        }
 }
-

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 94ff98340a391c23b70a7c556c0065321cca22e1..0a2b680227a05007af5773838abe1b0fb1cefbd5 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -14,6 +14,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Object\Image;
+use Friendica\Util\Network;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -313,8 +314,7 @@ function fromgplus_cleantext($text) {
 }
 
 function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
-       require_once("include/items.php");
-       require_once("include/network.php");
+       require_once 'include/items.php';
 
        $post = "";
        $quote = "";
@@ -325,13 +325,13 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                switch($attachment->objectType) {
                        case "video":
                                $pagedata["type"] = "video";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                break;
 
                        case "article":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
@@ -382,7 +382,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "photo-album":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
 
@@ -403,7 +403,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 
                        case "album":
                                $pagedata["type"] = "link";
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 
                                $thumb = $attachment->thumbnails[0];
@@ -416,7 +416,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
                                break;
 
                        case "audio":
-                               $pagedata["url"] = original_url($attachment->url);
+                               $pagedata["url"] = Network::finalUrl($attachment->url);
                                $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
                                $post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
                                break;
@@ -441,7 +441,7 @@ function fromgplus_fetch($a, $uid) {
        $account = PConfig::get($uid,'fromgplus','account');
        $key = Config::get('fromgplus','key');
 
-       $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
+       $result = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
        //$result = file_get_contents("google.txt");
        //file_put_contents("google.txt", $result);
 

diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index c96f40e00ab124ab10e0e84e796a9cb268c7a826..89ccd88396441eabeb1c679f8d876ca11d5fee27 100644 (file)
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -9,6 +9,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Util\Network;
 
 function geocoordinates_install()
 {
@@ -50,7 +51,7 @@ function geocoordinates_resolve_item(&$item)
                return;
        }
 
-       $s = fetch_url("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
+       $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
 
        if (!$s) {
                logger("API could not be queried", LOGGER_DEBUG);

diff --git a/geonames/geonames.php b/geonames/geonames.php
index eb5a0c87234fc194a3410d5fcd0c61be76fda9bc..79e268e6eeddb2d948953fa2b41d32e97636d6ca 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -23,6 +23,8 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 function geonames_install() {
 
@@ -111,12 +113,12 @@ function geonames_post_hook($a, &$item) {
         *
         */
 
-       $s = fetch_url('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+       $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
        if(! $s)
                return;
 
-       $xml = parse_xml_string($s);
+       $xml = XML::parseString($s);
 
        if($xml->geoname->name && $xml->geoname->countryName)
                $item['location'] = $xml->geoname->name . ', ' . $xml->geoname->countryName;

diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index c094eee960855a62390b6ec7aad87da50c4cc89c..9d9f9112087f80fd37272a9f008f68219e0b7127 100644 (file)
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 function ijpost_install() {
     Addon::registerHook('post_local',           'addon/ijpost/ijpost.php', 'ijpost_post_local');
@@ -219,8 +220,9 @@ EOT;
 
                logger('ijpost: data: ' . $xml, LOGGER_DATA);
 
-               if($ij_blog !== 'test')
-                       $x = post_url($ij_blog,$xml,["Content-Type: text/xml"]);
+               if($ij_blog !== 'test') {
+                       $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"]);
+               }
                logger('posted to insanejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 
        }

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 8b58ecb39ffd6884c860ba760e1d26b08201d2a8..23f99f17ad211fabf1278ce96d2d857e57fed0ec 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -68,6 +68,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Model\User;
+use Friendica\Util\Network;
 
 function jappixmini_install()
 {
@@ -658,7 +659,7 @@ function jappixmini_cron(App $a, $d)
 
                        try {
                                // send request
-                               $answer_json = fetch_url($url);
+                               $answer_json = Network::fetchUrl($url);
 
                                // parse answer
                                $answer = json_decode($answer_json);

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f5cee1170bba5d89a8e70ee58ec0ee23572cf44f..04d3e556d6bbba17babed29cec1b3e6e37266a17 100644 (file)
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -7,6 +7,7 @@
  */
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Util\Network;
 
 function leistungsschutzrecht_install() {
        Addon::registerHook('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron');
@@ -65,18 +66,17 @@ function leistungsschutzrecht_cuttext($text) {
        return $text;
 }
 
-function leistungsschutzrecht_fetchsites() {
-       require_once("include/network.php");
-
+function leistungsschutzrecht_fetchsites()
+{
        // This list works - but question is how current it is
        $url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt";
-       $sitelist = fetch_url($url);
+       $sitelist = Network::fetchUrl($url);
        $siteurls = explode(',', $sitelist);
 
        $whitelist = ['tagesschau.de', 'heute.de', 'wdr.de'];
 
        $sites = [];
-       foreach ($siteurls AS $site) {
+       foreach ($siteurls as $site) {
                if (!in_array($site, $whitelist)) {
                        $sites[$site] = $site;
                }
@@ -89,7 +89,7 @@ function leistungsschutzrecht_fetchsites() {
 
        $url = "http://www.vg-media.de/lizenzen/digitale-verlegerische-angebote/wahrnehmungsberechtigte-digitale-verlegerische-angebote.html";
 
-       $site = fetch_url($url);
+       $site = Network::fetchUrl($url);
 
        $doc = new DOMDocument();
        @$doc->loadHTML($site);

diff --git a/libertree/libertree.php b/libertree/libertree.php
index b1b7546154b6dd96c50bcfc07354039de4a52389..b48c9b188d90e83866e2e4db42ce7146a2448f7e 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -8,6 +8,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 function libertree_install() {
     Addon::registerHook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
@@ -229,9 +230,7 @@ function libertree_send(&$a,&$b) {
                //      'token' => $ltree_api_token
                ];
 
-               $result = post_url($ltree_blog,$params);
+               $result = Network::post($ltree_blog, $params);
                logger('libertree: ' . $result);
-
        }
 }
-

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index a8c40a75c0c6e29091827ab22605da899168f3e2..981162e8e33b9676e10a10eb73654ac1e79b414e 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -10,6 +10,7 @@
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Network;
 
 function ljpost_install() {
     Addon::registerHook('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
@@ -233,10 +234,10 @@ EOT;
 
                logger('ljpost: data: ' . $xml, LOGGER_DATA);
 
-               if($lj_blog !== 'test')
-                       $x = post_url($lj_blog,$xml,["Content-Type: text/xml"]);
+               if ($lj_blog !== 'test') {
+                       $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"]);
+               }
                logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
-
        }
 }
 

diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 18d0420d2776f178b6282f0655b68dfd8fc9f8e3..4ff4c69d7f4cfe74d56405d489334d98e8307573 100644 (file)
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -10,6 +10,7 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
+use Friendica\Util\Network;
 
 function mailstream_install() {
        Addon::registerHook('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
@@ -155,7 +156,7 @@ function mailstream_do_images($a, &$item, &$attachments) {
                $redirects;
                $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
                $attachments[$url] = [
-                       'data' => fetch_url($url, true, $redirects, 0, Null, $cookiejar),
+                       'data' => Network::fetchUrl($url, true, $redirects, 0, null, $cookiejar),
                        'guid' => hash("crc32", $url),
                        'filename' => basename($url),
                        'type' => $a->get_curl_content_type()];

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index 930f1a4ac228235864869261c7333175381c0046..1a4a55714f8fe4b76f08b37d4d530f9ffdd480c7 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -12,6 +12,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Util\Network;
 
 function openstreetmap_install()
 {
@@ -115,7 +116,7 @@ function openstreetmap_generate_named_map(&$a, &$b)
                $nomserver = 'http://nominatim.openstreetmap.org/search.php';
        $args = '?q=' . urlencode($b['location']) . '&format=json';
 
-       $x = z_fetch_url($nomserver . $args);
+       $x = Network::curl($nomserver . $args);
        if($x['success']) {
                $j = json_decode($x['body'],true);
 

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index a9c7084dc6d3780a1db2330501a9e32181c7afb8..6a7429ffb0d297d0fe13a58343622df59ce6be2a 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -16,6 +16,7 @@ use Friendica\Model\Group;
 use Friendica\Model\User;
 use Friendica\Model\Item;
 use Friendica\Model\Queue;
+use Friendica\Util\Network;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -1698,7 +1699,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 
 
 function pumpio_reachable($url) {
-       $data = z_fetch_url($url, false, $redirects, ['timeout'=>10]);
+       $data = Network::curl($url, false, $redirects, ['timeout'=>10]);
        return(intval($data['return_code']) != 0);
 }
 

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d74fd3134814147efa3d2fa17f29100304e2e135..eae1c1e4ccd8086a6101bae8abf3033fb718bc2f 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -57,6 +57,7 @@ use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Util\Network;
 
 class StatusNetOAuth extends TwitterOAuth
 {
@@ -234,7 +235,7 @@ function statusnet_settings_post(App $a, $post)
                        foreach ($globalsn as $asn) {
                                if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
                                        $apibase = $asn['apiurl'];
-                                       $c = fetch_url($apibase . 'statusnet/version.xml');
+                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
                                                PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
@@ -252,7 +253,7 @@ function statusnet_settings_post(App $a, $post)
                                //  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
                                //  resign quickly after this one try to fix the path ;-)
                                $apibase = $_POST['statusnet-baseapi'];
-                               $c = fetch_url($apibase . 'statusnet/version.xml');
+                               $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                if (strlen($c) > 0) {
                                        //  ok the API path is correct, let's save the settings
                                        PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -262,7 +263,7 @@ function statusnet_settings_post(App $a, $post)
                                } else {
                                        //  the API path is not correct, maybe missing trailing / ?
                                        $apibase = $apibase . '/';
-                                       $c = fetch_url($apibase . 'statusnet/version.xml');
+                                       $c = Network::fetchUrl($apibase . 'statusnet/version.xml');
                                        if (strlen($c) > 0) {
                                                //  ok the API path is now correct, let's save the settings
                                                PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
@@ -641,7 +642,6 @@ function statusnet_post_hook(App $a, &$b)
                PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
                $tempfile = "";
-               require_once "include/network.php";
                $msgarr = BBCode::toPlaintext($b, $max_char, true, 7);
                $msg = $msgarr["text"];
 
@@ -653,7 +653,7 @@ function statusnet_post_hook(App $a, &$b)
                if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
                        if ((strlen($msgarr["url"]) > 20) &&
                                ((strlen($msg . " \n" . $msgarr["url"]) > $max_char))) {
-                               $msg .= " \n" . short_link($msgarr["url"]);
+                               $msg .= " \n" . Network::shortenUrl($msgarr["url"]);
                        } else {
                                $msg .= " \n" . $msgarr["url"];
                        }
@@ -662,7 +662,7 @@ function statusnet_post_hook(App $a, &$b)
                }
 
                if ($image != "") {
-                       $img_str = fetch_url($image);
+                       $img_str = Network::fetchUrl($image);
                        $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
                        $postdata = ["status" => $msg, "media[]" => $tempfile];
@@ -1613,7 +1613,7 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
        if (is_array($items)) {
                $posts = array_reverse($items);
 
-               foreach ($posts AS $post) {
+               foreach ($posts as $post) {
                        $postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
 
                        if (trim($postarray['body']) == "") {
@@ -1635,7 +1635,6 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 function statusnet_convertmsg(App $a, $body, $no_tags = false)
 {
        require_once "include/items.php";
-       require_once "include/network.php";
 
        $body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
 
@@ -1653,7 +1652,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
 
                        logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
 
-                       $expanded_url = original_url($match[1]);
+                       $expanded_url = Network::finalUrl($match[1]);
 
                        logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
 
@@ -1677,7 +1676,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 = fetch_url($expanded_url, true, $redirects, 4);
+                               $img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
 
                                $tempfile = tempnam(get_temppath(), "cache");
                                file_put_contents($tempfile, $img_str);

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 6402b82d2a508fe748f84d3e0cb93460061cb2f9..5168aa0ecfda12c57df03abcb4ea64f2ffa13173 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -74,6 +74,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
 use Friendica\Object\Image;
+use Friendica\Util\Network;
 
 require_once 'include/enotify.php';
 
@@ -424,8 +425,6 @@ function twitter_action(App $a, $uid, $pid, $action)
 function twitter_post_hook(App $a, &$b)
 {
        // Post to Twitter
-       require_once "include/network.php";
-
        if (!PConfig::get($b["uid"], 'twitter', 'import')
                && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
                return;
@@ -545,7 +544,7 @@ function twitter_post_hook(App $a, &$b)
 
                // and now tweet it :-)
                if (strlen($msg) && ($image != "")) {
-                       $img_str = fetch_url($image);
+                       $img_str = Network::fetchUrl($image);
 
                        $tempfile = tempnam(get_temppath(), "cache");
                        file_put_contents($tempfile, $img_str);
@@ -1172,8 +1171,6 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 
 function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $picture)
 {
-       require_once "include/network.php";
-
        $tags = "";
 
        $plain = $body;
@@ -1184,11 +1181,11 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
                $footerlink = "";
                $footer = "";
 
-               foreach ($item->entities->urls AS $url) {
+               foreach ($item->entities->urls as $url) {
                        $plain = str_replace($url->url, '', $plain);
 
                        if ($url->url && $url->expanded_url && $url->display_url) {
-                               $expanded_url = original_url($url->expanded_url);
+                               $expanded_url = Network::finalUrl($url->expanded_url);
 
                                $oembed_data = OEmbed::fetchURL($expanded_url);
 
@@ -1217,7 +1214,7 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
                                } elseif ($oembed_data->type != "link") {
                                        $body = str_replace($url->url, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
                                } else {
-                                       $img_str = fetch_url($expanded_url, true, $redirects, 4);
+                                       $img_str = Network::fetchUrl($expanded_url, true, $redirects, 4);
 
                                        $tempfile = tempnam(get_temppath(), "cache");
                                        file_put_contents($tempfile, $img_str);

diff --git a/wppost/wppost.php b/wppost/wppost.php
index f2f9b93574eaa83fc936b79b6e627e4c0bb502d3..85b73d3f0b0de303205b858e49930c1df4bb0d7a 100644 (file)
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -313,10 +313,9 @@ EOT;
 
                logger('wppost: data: ' . $xml, LOGGER_DATA);
 
-               if($wp_blog !== 'test') {
-                       $x = post_url($wp_blog,$xml);
+               if ($wp_blog !== 'test') {
+                       $x = Network::post($wp_blog, $xml);
                }
                logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
-
        }
 }