X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnetwork.php;h=11a0fffbe671a827c3e524e10ed0bc7b76def26c;hb=26d7cf1d6a03840bd6645ceb514ee92620a65485;hp=72d3ce626c14c473913785e963cc033e40d89f49;hpb=86cae070f2a048e553c545caec54be72c1c14da5;p=friendica.git
diff --git a/include/network.php b/include/network.php
index 72d3ce626c..11a0fffbe6 100644
--- a/include/network.php
+++ b/include/network.php
@@ -5,10 +5,11 @@
*/
use Friendica\App;
+use Friendica\Core\System;
use Friendica\Core\Config;
+use Friendica\Network\Probe;
require_once("include/xml.php");
-require_once('include/Probe.php');
/**
* @brief Curl wrapper
@@ -107,6 +108,11 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
@curl_setopt($ch, CURLOPT_RANGE, '0-' . $range);
}
+ // Without this setting it seems as if some webservers send compressed content
+ // This seems to confuse curl so that it shows this uncompressed.
+ /// @todo We could possibly set this value to "gzip" or something similar
+ curl_setopt($ch, CURLOPT_ENCODING, '');
+
if (x($opts, 'headers')) {
@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
}
@@ -144,6 +150,10 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
}
}
+ if (Config::get('system', 'ipv4_resolve', false)) {
+ curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+ }
+
if ($binary) {
@curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
}
@@ -172,7 +182,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
// allow for HTTP/2.x without fixing code
while (preg_match('/^HTTP\/[1-2].+? [1-5][0-9][0-9]/', $base)) {
- $chunk = substr($base, 0, strpos($base, "\r\n\r\n") + 4);
+ $chunk = substr($base, 0, strpos($base,"\r\n\r\n") + 4);
$header .= $chunk;
$base = substr($base, strlen($chunk));
}
@@ -187,7 +197,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
$newurl = $curl_info['redirect_url'];
- if (($new_location_info['path'] == '') AND ( $new_location_info['host'] != '')) {
+ if (($new_location_info['path'] == '') && ( $new_location_info['host'] != '')) {
$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
}
@@ -196,9 +206,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
$newurl = trim(array_pop($matches));
}
-
- if (strpos($newurl, '/') === 0) {
- $newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+ if (strpos($newurl,'/') === 0) {
+ $newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
}
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -221,8 +230,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (!$ret['success']) {
$ret['error'] = curl_error($ch);
$ret['debug'] = $curl_info;
- logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);
- logger('z_fetch_url: debug: ' . print_r($curl_info, true), LOGGER_DATA);
+ logger('z_fetch_url: error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG);
+ logger('z_fetch_url: debug: '.print_r($curl_info, true), LOGGER_DATA);
}
$ret['body'] = substr($s, strlen($header));
@@ -273,6 +282,10 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
+ if (Config::get('system', 'ipv4_resolve', false)) {
+ curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+ }
+
if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
} else {
@@ -342,7 +355,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
$newurl = trim(array_pop($matches));
if (strpos($newurl, '/') === 0) {
- $newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+ $newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
}
if (filter_var($newurl, FILTER_VALIDATE_URL)) {
@@ -373,14 +386,22 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
function xml_status($st, $message = '') {
- $xml_message = ((strlen($message)) ? "\t" . xmlify($message) . "\r\n" : '');
+ $result = array('status' => $st);
+
+ if ($message != '') {
+ $result['message'] = $message;
+ }
- if($st)
+ if ($st) {
logger('xml_status returning non_zero: ' . $st . " message=" . $message);
+ }
+
+ header("Content-type: text/xml");
+
+ $xmldata = array("result" => $result);
+
+ echo xml::from_array($xmldata, $xml);
- header( "Content-type: text/xml" );
- echo ''."\r\n";
- echo "\r\n\t$st\r\n$xml_message\r\n";
killme();
}
@@ -403,12 +424,12 @@ function xml_status($st, $message = '') {
*/
function http_status_exit($val, $description = array()) {
$err = '';
- if($val >= 400) {
+ if ($val >= 400) {
$err = 'Error';
if (!isset($description["title"]))
$description["title"] = $err." ".$val;
}
- if($val >= 200 && $val < 300)
+ if ($val >= 200 && $val < 300)
$err = 'OK';
logger('http_status_exit ' . $val);
@@ -434,20 +455,20 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it
*/
function validate_url(&$url) {
- if(get_config('system','disable_url_validation'))
+ if (get_config('system','disable_url_validation'))
return true;
// no naked subdomains (allow localhost for tests)
- if(strpos($url,'.') === false && strpos($url,'/localhost/') === false)
+ if (strpos($url,'.') === false && strpos($url,'/localhost/') === false)
return false;
- if(substr($url,0,4) != 'http')
+ if (substr($url,0,4) != 'http')
$url = 'http://' . $url;
/// @TODO Really supress function outcomes? Why not find them + debug them?
$h = @parse_url($url);
- if((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+ if ((is_array($h)) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
return true;
}
@@ -462,14 +483,14 @@ function validate_url(&$url) {
*/
function validate_email($addr) {
- if(get_config('system','disable_email_validation'))
+ if (get_config('system','disable_email_validation'))
return true;
- if(! strpos($addr,'@'))
+ if (! strpos($addr,'@'))
return false;
$h = substr($addr,strpos($addr,'@') + 1);
- if(($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
+ if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_PTR + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true;
}
return false;
@@ -502,7 +523,6 @@ function allowed_url($url) {
$host = strtolower($h['host']);
// always allow our own site
-
if ($host == strtolower($_SERVER['SERVER_NAME'])) {
return true;
}
@@ -563,24 +583,25 @@ function blocked_url($url) {
*/
function allowed_email($email) {
-
$domain = strtolower(substr($email,strpos($email,'@') + 1));
- if(! $domain)
+ if (! $domain) {
return false;
+ }
$str_allowed = get_config('system','allowed_email');
- if(! $str_allowed)
+ if (! $str_allowed) {
return true;
+ }
$found = false;
$fnmatch = function_exists('fnmatch');
$allowed = explode(',',$str_allowed);
- if(count($allowed)) {
- foreach($allowed as $a) {
+ if (count($allowed)) {
+ foreach ($allowed as $a) {
$pat = strtolower(trim($a));
- if(($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
+ if (($fnmatch && fnmatch($pat,$domain)) || ($pat == $domain)) {
$found = true;
break;
}
@@ -599,7 +620,7 @@ function avatar_img($email) {
call_hooks('avatar_lookup', $avatar);
if (! $avatar['success']) {
- $avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
+ $avatar['url'] = System::baseUrl() . '/images/person-175.jpg';
}
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
@@ -607,20 +628,15 @@ function avatar_img($email) {
}
-function parse_xml_string($s,$strict = true) {
+function parse_xml_string($s, $strict = true) {
+ // the "strict" parameter is deactivated
+
/// @todo Move this function to the xml class
- if($strict) {
- if(! strstr($s,'code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
}
@@ -648,7 +664,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
foreach ($matches as $mtch) {
logger('scale_external_image: ' . $mtch[1]);
- $hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
+ $hostname = str_replace('www.','',substr(System::baseUrl(),strpos(System::baseUrl(),'://')+3));
if (stristr($mtch[1],$hostname)) {
continue;
}
@@ -724,22 +740,10 @@ function fix_contact_ssl_policy(&$contact,$new_policy) {
}
if ($ssl_changed) {
- q("UPDATE `contact` SET
- `url` = '%s',
- `request` = '%s',
- `notify` = '%s',
- `poll` = '%s',
- `confirm` = '%s',
- `poco` = '%s'
- WHERE `id` = %d LIMIT 1",
- dbesc($contact['url']),
- dbesc($contact['request']),
- dbesc($contact['notify']),
- dbesc($contact['poll']),
- dbesc($contact['confirm']),
- dbesc($contact['poco']),
- intval($contact['id'])
- );
+ $fields = array('url' => $contact['url'], 'request' => $contact['request'],
+ 'notify' => $contact['notify'], 'poll' => $contact['poll'],
+ 'confirm' => $contact['confirm'], 'poco' => $contact['poco']);
+ dba::update('contact', $fields, array('id' => $contact['id']));
}
}
@@ -834,8 +838,8 @@ function original_url($url, $depth = 1, $fetchbody = false) {
if ($http_code == 0)
return($url);
- if ((($curl_info['http_code'] == "301") OR ($curl_info['http_code'] == "302"))
- AND (($curl_info['redirect_url'] != "") OR ($curl_info['location'] != ""))) {
+ if ((($curl_info['http_code'] == "301") || ($curl_info['http_code'] == "302"))
+ && (($curl_info['redirect_url'] != "") || ($curl_info['location'] != ""))) {
if ($curl_info['redirect_url'] != "")
return(original_url($curl_info['redirect_url'], ++$depth, $fetchbody));
else
@@ -851,7 +855,7 @@ function original_url($url, $depth = 1, $fetchbody = false) {
return($url);
// if it isn't a HTML file then exit
- if (($curl_info["content_type"] != "") AND !strstr(strtolower($curl_info["content_type"]),"html"))
+ if (($curl_info["content_type"] != "") && !strstr(strtolower($curl_info["content_type"]),"html"))
return($url);
$stamp1 = microtime(true);
@@ -945,7 +949,7 @@ function json_return_and_die($x) {
*/
function matching_url($url1, $url2) {
- if (($url1 == "") OR ($url2 == ""))
+ if (($url1 == "") || ($url2 == ""))
return "";
$url1 = normalise_link($url1);
@@ -954,7 +958,7 @@ function matching_url($url1, $url2) {
$parts1 = parse_url($url1);
$parts2 = parse_url($url2);
- if (!isset($parts1["host"]) OR !isset($parts2["host"]))
+ if (!isset($parts1["host"]) || !isset($parts2["host"]))
return "";
if ($parts1["scheme"] != $parts2["scheme"])
@@ -983,7 +987,7 @@ function matching_url($url1, $url2) {
if ($path1 == $path2)
$path .= $path1."/";
- } while (($path1 == $path2) AND ($i++ <= count($pathparts1)));
+ } while (($path1 == $path2) && ($i++ <= count($pathparts1)));
$match .= $path;