Skip to content

Commit

Permalink
Review updates
Browse files Browse the repository at this point in the history 
update renamed and moved functions
  • Loading branch information
@zeroadam
zeroadam committed Jan 27, 2018
1 parent ca3c451 commit f151406
Show file tree
Hide file tree
Showing 19 changed files with 37 additions and 36 deletions.
2 changes: 1 addition & 1 deletion blogger/blogger.php
View file
Expand Up @@ -206,7 +206,7 @@ function blogger_send(&$a, &$b)
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);
Expand Down
6 changes: 3 additions & 3 deletions buffer/buffer.php
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion curweather/curweather.php
View file
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion dwpost/dwpost.php
View file
Expand Up @@ -222,7 +222,7 @@ function dwpost_send(&$a,&$b) {
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);
}
Expand Down
2 changes: 1 addition & 1 deletion fortunate/fortunate.php
View file
Expand Up @@ -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 .= '<div class="fortunate">' . $s . '</div>';
}
}
12 changes: 6 additions & 6 deletions fromgplus/fromgplus.php
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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";

Expand All @@ -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];
Expand All @@ -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;
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion geocoordinates/geocoordinates.php
View file
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions geonames/geonames.php
View file
Expand Up @@ -24,6 +24,7 @@
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Util\Network;
use Friendica\Util\XML;

function geonames_install() {

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ijpost/ijpost.php
View file
Expand Up @@ -221,7 +221,7 @@ function ijpost_send(&$a,&$b) {
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);

Expand Down
2 changes: 1 addition & 1 deletion jappixmini/jappixmini.php
View file
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions leistungsschutzrecht/leistungsschutzrecht.php
View file
Expand Up @@ -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'];
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion libertree/libertree.php
View file
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion ljpost/ljpost.php
View file
Expand Up @@ -235,7 +235,7 @@ function ljpost_send(&$a,&$b) {
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);
}
Expand Down
2 changes: 1 addition & 1 deletion mailstream/mailstream.php
View file
Expand Up @@ -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()];
Expand Down
2 changes: 1 addition & 1 deletion openstreetmap/openstreetmap.php
View file
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion pumpio/pumpio.php
View file
Expand Up @@ -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);
}

Expand Down
14 changes: 7 additions & 7 deletions statusnet/statusnet.php
View file
Expand Up @@ -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']);
Expand All @@ -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']);
Expand All @@ -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']);
Expand Down Expand Up @@ -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"];
}
Expand All @@ -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];
Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions twitter/twitter.php
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion wppost/wppost.php
View file
Expand Up @@ -314,7 +314,7 @@ function wppost_send(&$a,&$b) {
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);
}
Expand Down

0 comments on commit f151406

Please sign in to comment.