Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 6ead21acf9a8c0b5da2669f2c3d0e60af6569fe7..7d8cf36118a0363444edbebeca1eeb1647554ba6 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -4,10 +4,11 @@
  * @file include/network.php
  */
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Network\Probe;
 
 require_once("include/xml.php");
-require_once('include/Probe.php');
 
 /**
  * @brief Curl wrapper
@@ -171,7 +172,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));
        }
@@ -195,9 +196,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)) {
@@ -341,7 +341,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)) {
@@ -374,7 +374,7 @@ function xml_status($st, $message = '') {
 
        $xml_message = ((strlen($message)) ? "\t<message>" . xmlify($message) . "</message>\r\n" : '');
 
-       if($st)
+       if ($st)
                logger('xml_status returning non_zero: ' . $st . " message=" . $message);
 
        header( "Content-type: text/xml" );
@@ -402,12 +402,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);
@@ -433,20 +433,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;
        }
 
@@ -461,14 +461,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;
@@ -491,7 +491,7 @@ function allowed_url($url) {
                return false;
        }
 
-       $str_allowed = get_config('system', 'allowed_sites');
+       $str_allowed = Config::get('system', 'allowed_sites');
        if (! $str_allowed) {
                return true;
        }
@@ -501,7 +501,6 @@ function allowed_url($url) {
        $host = strtolower($h['host']);
 
        // always allow our own site
-
        if ($host == strtolower($_SERVER['SERVER_NAME'])) {
                return true;
        }
@@ -535,7 +534,7 @@ function blocked_url($url) {
                return true;
        }
 
-       $domain_blocklist = get_config('system', 'blocklist', array());
+       $domain_blocklist = Config::get('system', 'blocklist', array());
        if (! $domain_blocklist) {
                return false;
        }
@@ -562,24 +561,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;
                        }
@@ -608,8 +608,8 @@ function avatar_img($email) {
 
 function parse_xml_string($s,$strict = true) {
        /// @todo Move this function to the xml class
-       if($strict) {
-               if(! strstr($s,'<?xml'))
+       if ($strict) {
+               if (! strstr($s,'<?xml'))
                        return false;
                $s2 = substr($s,strpos($s,'<?xml'));
        }
@@ -723,22 +723,7 @@ 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'])
-               );
+               dba::update('contact', $contact, array('id' => $contact['id']));
        }
 }