Display mentioned users and in the comment box by default

[friendica.git] / src / Util / Network.php

diff --git a/src/Util/Network.php b/src/Util/Network.php
index ab0958d6423ffae00d37a1b46792401c42b61ac7..de4b45da9a35bcf7c60572b140af0c8ac13b17c6 100644 (file)
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -4,12 +4,11 @@
  */
 namespace Friendica\Util;
 
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Network\CurlResult;
-use Friendica\Util\Strings;
 use DOMDocument;
 use DomXPath;
 
@@ -32,6 +31,7 @@ class Network
         * @param string  $cookiejar      Path to cookie jar file
         *
         * @return string The fetched content
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchUrl($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '')
        {
@@ -56,6 +56,7 @@ class Network
         * @param string  $cookiejar      Path to cookie jar file
         *
         * @return CurlResult With all relevant information, 'body' contains the actual fetched content.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '')
        {
@@ -87,15 +88,20 @@ class Network
         *                           'header' => header array
         *
         * @return CurlResult
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function curl($url, $binary = false, &$redirects = 0, $opts = [])
        {
-               $ret = ['return_code' => 0, 'success' => false, 'header' => '', 'info' => '', 'body' => ''];
-
                $stamp1 = microtime(true);
 
-               $a = get_app();
+               $a = \get_app();
+
+               if (strlen($url) > 1000) {
+                       Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG);
+                       return CurlResult::createErrorCurl(substr($url, 0, 200));
+               }
 
+               $parts2 = [];
                $parts = parse_url($url);
                $path_parts = explode('/', defaults($parts, 'path', ''));
                foreach ($path_parts as $part) {
@@ -241,6 +247,7 @@ class Network
         * @param integer $timeout   The timeout in seconds, default system config value or 60 seconds
         *
         * @return CurlResult The content
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function post($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
        {
@@ -251,7 +258,7 @@ class Network
                        return CurlResult::createErrorCurl($url);
                }
 
-               $a = get_app();
+               $a = \get_app();
                $ch = curl_init($url);
 
                if (($redirects > 8) || (!$ch)) {
@@ -314,7 +321,6 @@ class Network
 
                $s = @curl_exec($ch);
 
-               $base = $s;
                $curl_info = curl_getinfo($ch);
 
                $curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
@@ -343,6 +349,7 @@ class Network
         *
         * @param string $url The URL to be validated
         * @return string|boolean The actual working URL, false else
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isUrlValid($url)
        {
@@ -374,6 +381,7 @@ class Network
         *
         * @param string $addr The email address
         * @return boolean True if it's a valid email address, false if it's not
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isEmailDomainValid($addr)
        {
@@ -405,6 +413,7 @@ class Network
         *
         * @param string $url URL which get tested
         * @return boolean True if url is allowed otherwise return false
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isUrlAllowed($url)
        {
@@ -450,6 +459,7 @@ class Network
         * @param string $url The url to check the domain from
         *
         * @return boolean
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isUrlBlocked($url)
        {
@@ -479,7 +489,8 @@ class Network
         *
         * @param  string $email email address
         * @return boolean False if not allowed, true if allowed
-        *    or if allowed list is not configured
+        *                       or if allowed list is not configured
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function isEmailDomainAllowed($email)
        {
@@ -528,7 +539,7 @@ class Network
                $avatar['url'] = '';
                $avatar['success'] = false;
 
-               Addon::callHooks('avatar_lookup', $avatar);
+               Hook::callAll('avatar_lookup', $avatar);
 
                if (! $avatar['success']) {
                        $avatar['url'] = System::baseUrl() . '/images/person-300.jpg';
@@ -593,18 +604,19 @@ class Network
         * 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
+        * @todo  Remove the $fetchbody parameter that generates an extraneous HEAD request
         *
-        * @see ParseUrl::getSiteinfo
+        * @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
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function finalUrl($url, $depth = 1, $fetchbody = false)
        {
-               $a = get_app();
+               $a = \get_app();
 
                $url = self::stripTrackingQueryParams($url);