Resubmit all profiles on directory change

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 7385c94a031882244861574a397500836c354554..f9d35c52c34557d387f09eb490b23aa3358119b2 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -72,8 +72,9 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
        $a = get_app();
 
        $ch = @curl_init($url);
-       if(($redirects > 8) || (! $ch))
-               return false;
+       if(($redirects > 8) || (! $ch)) {
+               return $ret;
+       }
 
        @curl_setopt($ch, CURLOPT_HEADER, true);
 
@@ -118,7 +119,9 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 
        $check_cert = get_config('system','verifyssl');
        @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-       @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+       if ($check_cert) {
+               @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+       }
 
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
@@ -141,6 +144,8 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
                logger('fetch_url error fetching '.$url.': '.curl_error($ch), LOGGER_NORMAL);
        }
 
+       $ret['errno'] = curl_errno($ch);
+
        $base = $s;
        $curl_info = @curl_getinfo($ch);
 
@@ -265,7 +270,9 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 
        $check_cert = get_config('system','verifyssl');
        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-       curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+       if ($check_cert) {
+               @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+       }
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
                curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@@ -670,42 +677,71 @@ function fix_contact_ssl_policy(&$contact,$new_policy) {
        }
 }
 
-function original_url($url, $depth=1, $fetchbody = false) {
-
-       $a = get_app();
-
-       // Remove Analytics Data from Google and other tracking platforms
+/**
+ * @brief Remove Google Analytics and other tracking platforms params from URL
+ *
+ * @param string $url Any user-submitted URL that may contain tracking params
+ * @return string The same URL stripped of tracking parameters
+ */
+function strip_tracking_query_params($url)
+{
        $urldata = parse_url($url);
        if (is_string($urldata["query"])) {
                $query = $urldata["query"];
                parse_str($query, $querydata);
 
-               if (is_array($querydata))
-                       foreach ($querydata AS $param=>$value)
+               if (is_array($querydata)) {
+                       foreach ($querydata AS $param => $value) {
                                if (in_array($param, array("utm_source", "utm_medium", "utm_term", "utm_content", "utm_campaign",
                                                        "wt_mc", "pk_campaign", "pk_kwd", "mc_cid", "mc_eid",
                                                        "fb_action_ids", "fb_action_types", "fb_ref",
                                                        "awesm", "wtrid",
                                                        "woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term"))) {
 
-                                       $pair = $param."=".urlencode($value);
+                                       $pair = $param . "=" . urlencode($value);
                                        $url = str_replace($pair, "", $url);
 
                                        // Second try: if the url isn't encoded completely
-                                       $pair = $param."=".str_replace(" ", "+", $value);
+                                       $pair = $param . "=" . str_replace(" ", "+", $value);
                                        $url = str_replace($pair, "", $url);
 
                                        // Third try: Maybey the url isn't encoded at all
-                                       $pair = $param."=".$value;
+                                       $pair = $param . "=" . $value;
                                        $url = str_replace($pair, "", $url);
 
                                        $url = str_replace(array("?&", "&&"), array("?", ""), $url);
                                }
+                       }
+               }
 
-               if (substr($url, -1, 1) == "?")
+               if (substr($url, -1, 1) == "?") {
                        $url = substr($url, 0, -1);
+               }
        }
 
+       return $url;
+}
+
+/**
+ * @brief Returns the original URL of the provided URL
+ *
+ * This function strips tracking query params and follows redirections, either
+ * through HTTP code or meta refresh tags. Stops after 10 redirections.
+ *
+ * @todo Remove the $fetchbody parameter that generates an extraneous HEAD request
+ *
+ * @see ParseUrl::getSiteinfo
+ *
+ * @param string $url A user-submitted URL
+ * @param int $depth The current redirection recursion level (internal)
+ * @param bool $fetchbody Wether to fetch the body or not after the HEAD requests
+ * @return string A canonical URL
+ */
+function original_url($url, $depth = 1, $fetchbody = false) {
+       $a = get_app();
+
+       $url = strip_tracking_query_params($url);
+
        if ($depth > 10)
                return($url);