From ca3c45101e7d1faac2f19dea1f49fe4300fdd04e Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Sat, 27 Jan 2018 08:52:02 -0500 Subject: [PATCH 1/2] Network was moved to src update all function calls to use class, insert use statements and remove require_once statements --- blogger/blogger.php | 3 ++- buffer/buffer.php | 10 ++++------ curweather/curweather.php | 4 ++-- dwpost/dwpost.php | 7 ++++--- fortunate/fortunate.php | 20 ++++++++++--------- fromgplus/fromgplus.php | 16 +++++++-------- geocoordinates/geocoordinates.php | 3 ++- geonames/geonames.php | 5 +++-- ijpost/ijpost.php | 6 ++++-- jappixmini/jappixmini.php | 3 ++- leistungsschutzrecht/leistungsschutzrecht.php | 12 +++++------ libertree/libertree.php | 5 ++--- ljpost/ljpost.php | 7 ++++--- mailstream/mailstream.php | 3 ++- openstreetmap/openstreetmap.php | 3 ++- pumpio/pumpio.php | 3 ++- statusnet/statusnet.php | 19 +++++++++--------- twitter/twitter.php | 13 +++++------- wppost/wppost.php | 5 ++--- 19 files changed, 76 insertions(+), 71 deletions(-) diff --git a/blogger/blogger.php b/blogger/blogger.php index e9813dc2..7d1a3f4a 100644 --- 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::postURL($bl_blog, $xml); } logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG); diff --git a/buffer/buffer.php b/buffer/buffer.php index 0f05b5c6..3d02d55f 100644 --- 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::shortLink($post["url"]); // if (isset($post["image"])) - // $post["image"] = short_link($post["image"]); + // $post["image"] = Network::shortLink($post["image"]); // if (isset($post["preview"])) - // $post["preview"] = short_link($post["preview"]); + // $post["preview"] = Network::shortLink($post["preview"]); //} // Seems like a bug to me diff --git a/curweather/curweather.php b/curweather/curweather.php index 525b03d0..928b8bbe 100644 --- 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 c5063baa..92e34efc 100644 --- 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::postURL($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 4d87bffe..c51bf374 100644 --- a/fortunate/fortunate.php +++ b/fortunate/fortunate.php @@ -6,31 +6,33 @@ * Author: Mike Macgirvin */ 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'] .= '' . "\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 .= '
' . $s . '
'; } } - diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 94ff9834..36791310 100644 --- 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::originalURL($attachment->url); $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); break; case "article": $pagedata["type"] = "link"; - $pagedata["url"] = original_url($attachment->url); + $pagedata["url"] = Network::originalURL($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::originalURL($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::originalURL($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::originalURL($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 c96f40e0..a714d8f2 100644 --- 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 eb5a0c87..55098457 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -23,6 +23,7 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\Util\Network; function geonames_install() { @@ -111,12 +112,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 = Network::parseXmlString($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 c094eee9..fe072253 100644 --- 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::postURL($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 8b58ecb3..4f8f7ff3 100644 --- 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 f5cee117..b59abd7b 100644 --- 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 b1b75461..0054b5e5 100644 --- 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::postURL($ltree_blog, $params); logger('libertree: ' . $result); - } } - diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index a8c40a75..7ab748ea 100644 --- 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::postURL($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 18d0420d..fd5a58aa 100644 --- 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 930f1a4a..2bcf06f4 100644 --- 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::zFetchURL($nomserver . $args); if($x['success']) { $j = json_decode($x['body'],true); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index a9c7084d..0973559c 100644 --- 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::zFetchURL($url, false, $redirects, ['timeout'=>10]); return(intval($data['return_code']) != 0); } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index d74fd313..658b106d 100644 --- 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::shortLink($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::originalURL($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 6402b82d..45d11ce8 100644 --- 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::originalURL($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 f2f9b935..b371990a 100644 --- 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::postURL($wp_blog, $xml); } logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG); - } } From f1514063559930de791c0bff18a3f6ae4b455f7c Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Sat, 27 Jan 2018 11:23:04 -0500 Subject: [PATCH 2/2] Review updates update renamed and moved functions --- blogger/blogger.php | 2 +- buffer/buffer.php | 6 +++--- curweather/curweather.php | 2 +- dwpost/dwpost.php | 2 +- fortunate/fortunate.php | 2 +- fromgplus/fromgplus.php | 12 ++++++------ geocoordinates/geocoordinates.php | 2 +- geonames/geonames.php | 5 +++-- ijpost/ijpost.php | 2 +- jappixmini/jappixmini.php | 2 +- leistungsschutzrecht/leistungsschutzrecht.php | 4 ++-- libertree/libertree.php | 2 +- ljpost/ljpost.php | 2 +- mailstream/mailstream.php | 2 +- openstreetmap/openstreetmap.php | 2 +- pumpio/pumpio.php | 2 +- statusnet/statusnet.php | 14 +++++++------- twitter/twitter.php | 6 +++--- wppost/wppost.php | 2 +- 19 files changed, 37 insertions(+), 36 deletions(-) diff --git a/blogger/blogger.php b/blogger/blogger.php index 7d1a3f4a..7dfbcc4a 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -206,7 +206,7 @@ EOT; logger('blogger: data: ' . $xml, LOGGER_DATA); if ($bl_blog !== 'test') { - $x = Network::postURL($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 3d02d55f..bb1d8482 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -351,11 +351,11 @@ function buffer_send(App $a, &$b) //if ($includedlinks) { // if (isset($post["url"])) - // $post["url"] = Network::shortLink($post["url"]); + // $post["url"] = Network::shortenUrl($post["url"]); // if (isset($post["image"])) - // $post["image"] = Network::shortLink($post["image"]); + // $post["image"] = Network::shortenUrl($post["image"]); // if (isset($post["preview"])) - // $post["preview"] = Network::shortLink($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 928b8bbe..edf96c3e 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -32,7 +32,7 @@ function getWeather( $loc, $units='metric', $lang='en', $appid='', $cachetime=0) } } try { - $res = new SimpleXMLElement(Network::fetchURL($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 92e34efc..42b1770e 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -222,7 +222,7 @@ EOT; logger('dwpost: data: ' . $xml, LOGGER_DATA); if($dw_blog !== 'test') { - $x = Network::postURL($dw_blog, $xml, ["Content-Type: text/xml"]); + $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 c51bf374..8c15caa6 100644 --- a/fortunate/fortunate.php +++ b/fortunate/fortunate.php @@ -32,7 +32,7 @@ function fortunate_fetch(&$a, &$b) . $a->get_baseurl() . '/addon/fortunate/fortunate.css' . '" media="all" />' . "\r\n"; if (FORTUNATE_SERVER != 'hostname.com') { - $s = Network::fetchURL('http://' . FORTUNATE_SERVER . '/cookie.php?numlines=2&equal=1&rand=' . mt_rand()); + $s = Network::fetchUrl('http://' . FORTUNATE_SERVER . '/cookie.php?numlines=2&equal=1&rand=' . mt_rand()); $b .= '
' . $s . '
'; } } diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 36791310..0a2b6802 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -325,13 +325,13 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) { switch($attachment->objectType) { case "video": $pagedata["type"] = "video"; - $pagedata["url"] = Network::originalURL($attachment->url); + $pagedata["url"] = Network::finalUrl($attachment->url); $pagedata["title"] = fromgplus_html2bbcode($attachment->displayName); break; case "article": $pagedata["type"] = "link"; - $pagedata["url"] = Network::originalURL($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"] = Network::originalURL($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"] = Network::originalURL($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"] = Network::originalURL($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 = Network::fetchURL("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 a714d8f2..89ccd883 100644 --- a/geocoordinates/geocoordinates.php +++ b/geocoordinates/geocoordinates.php @@ -51,7 +51,7 @@ function geocoordinates_resolve_item(&$item) return; } - $s = Network::fetchURL("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 55098457..79e268e6 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -24,6 +24,7 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Util\Network; +use Friendica\Util\XML; function geonames_install() { @@ -112,12 +113,12 @@ function geonames_post_hook($a, &$item) { * */ - $s = Network::fetchURL('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 = Network::parseXmlString($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 fe072253..9d9f9112 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -221,7 +221,7 @@ EOT; logger('ijpost: data: ' . $xml, LOGGER_DATA); if($ij_blog !== 'test') { - $x = Network::postURL($ij_blog, $xml, ["Content-Type: text/xml"]); + $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 4f8f7ff3..23f99f17 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -659,7 +659,7 @@ function jappixmini_cron(App $a, $d) try { // send request - $answer_json = Network::fetchURL($url); + $answer_json = Network::fetchUrl($url); // parse answer $answer = json_decode($answer_json); diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index b59abd7b..04d3e556 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -70,7 +70,7 @@ function leistungsschutzrecht_fetchsites() { // This list works - but question is how current it is $url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt"; - $sitelist = Network::fetchURL($url); + $sitelist = Network::fetchUrl($url); $siteurls = explode(',', $sitelist); $whitelist = ['tagesschau.de', 'heute.de', 'wdr.de']; @@ -89,7 +89,7 @@ function leistungsschutzrecht_fetchsites() $url = "http://www.vg-media.de/lizenzen/digitale-verlegerische-angebote/wahrnehmungsberechtigte-digitale-verlegerische-angebote.html"; - $site = Network::fetchURL($url); + $site = Network::fetchUrl($url); $doc = new DOMDocument(); @$doc->loadHTML($site); diff --git a/libertree/libertree.php b/libertree/libertree.php index 0054b5e5..b48c9b18 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -230,7 +230,7 @@ function libertree_send(&$a,&$b) { // 'token' => $ltree_api_token ]; - $result = Network::postURL($ltree_blog, $params); + $result = Network::post($ltree_blog, $params); logger('libertree: ' . $result); } } diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index 7ab748ea..981162e8 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -235,7 +235,7 @@ EOT; logger('ljpost: data: ' . $xml, LOGGER_DATA); if ($lj_blog !== 'test') { - $x = Network::postURL($lj_blog, $xml, ["Content-Type: text/xml"]); + $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 fd5a58aa..4ff4c69d 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -156,7 +156,7 @@ function mailstream_do_images($a, &$item, &$attachments) { $redirects; $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); $attachments[$url] = [ - 'data' => Network::fetchURL($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 2bcf06f4..1a4a5571 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -116,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 = Network::zFetchURL($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 0973559c..6a7429ff 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1699,7 +1699,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) { function pumpio_reachable($url) { - $data = Network::zFetchURL($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 658b106d..eae1c1e4 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -235,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 = Network::fetchURL($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']); @@ -253,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 = Network::fetchURL($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']); @@ -263,7 +263,7 @@ function statusnet_settings_post(App $a, $post) } else { // the API path is not correct, maybe missing trailing / ? $apibase = $apibase . '/'; - $c = Network::fetchURL($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']); @@ -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" . Network::shortLink($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 = Network::fetchURL($image); + $img_str = Network::fetchUrl($image); $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); $postdata = ["status" => $msg, "media[]" => $tempfile]; @@ -1652,7 +1652,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false) logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG); - $expanded_url = Network::originalURL($match[1]); + $expanded_url = Network::finalUrl($match[1]); logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG); @@ -1676,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 = Network::fetchURL($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 45d11ce8..5168aa0e 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -544,7 +544,7 @@ function twitter_post_hook(App $a, &$b) // and now tweet it :-) if (strlen($msg) && ($image != "")) { - $img_str = Network::fetchURL($image); + $img_str = Network::fetchUrl($image); $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); @@ -1185,7 +1185,7 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur $plain = str_replace($url->url, '', $plain); if ($url->url && $url->expanded_url && $url->display_url) { - $expanded_url = Network::originalURL($url->expanded_url); + $expanded_url = Network::finalUrl($url->expanded_url); $oembed_data = OEmbed::fetchURL($expanded_url); @@ -1214,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 = Network::fetchURL($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 b371990a..85b73d3f 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -314,7 +314,7 @@ EOT; logger('wppost: data: ' . $xml, LOGGER_DATA); if ($wp_blog !== 'test') { - $x = Network::postURL($wp_blog, $xml); + $x = Network::post($wp_blog, $xml); } logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG); }