X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FNetwork.php;h=5cac96b79cdd0afb0beab0576378e49c6fe0edbe;hb=2e602afd3e1be80dc0e14db98ce0445c58d5231c;hp=0ac0f2aeb71b2b7ccd3865a057b770ee70cb87f8;hpb=d577ab98eb0f28f9f807795f54c87d80ef9c0dc2;p=friendica.git

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 0ac0f2aeb7..5cac96b79c 100644
--- 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;
 
@@ -94,7 +93,12 @@ class Network
 
 		$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));
+		}
 
 		$parts = parse_url($url);
 		$path_parts = explode('/', defaults($parts, 'path', ''));
@@ -121,7 +125,7 @@ class Network
 
 		@curl_setopt($ch, CURLOPT_HEADER, true);
 
-		if (x($opts, "cookiejar")) {
+		if (!empty($opts['cookiejar'])) {
 			curl_setopt($ch, CURLOPT_COOKIEJAR, $opts["cookiejar"]);
 			curl_setopt($ch, CURLOPT_COOKIEFILE, $opts["cookiejar"]);
 		}
@@ -130,7 +134,7 @@ class Network
 		//	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		//	@curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
 
-		if (x($opts, 'accept_content')) {
+		if (!empty($opts['accept_content'])) {
 			curl_setopt(
 				$ch,
 				CURLOPT_HTTPHEADER,
@@ -156,15 +160,15 @@ class Network
 		/// @todo  We could possibly set this value to "gzip" or something similar
 		curl_setopt($ch, CURLOPT_ENCODING, '');
 
-		if (x($opts, 'headers')) {
+		if (!empty($opts['headers'])) {
 			@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
 		}
 
-		if (x($opts, 'nobody')) {
+		if (!empty($opts['nobody'])) {
 			@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 		}
 
-		if (x($opts, 'timeout')) {
+		if (!empty($opts['timeout'])) {
 			@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 		} else {
 			$curl_time = Config::get('system', 'curl_timeout', 60);
@@ -251,7 +255,7 @@ class Network
 			return CurlResult::createErrorCurl($url);
 		}
 
-		$a = get_app();
+		$a = \get_app();
 		$ch = curl_init($url);
 
 		if (($redirects > 8) || (!$ch)) {
@@ -362,7 +366,7 @@ class Network
 		/// @TODO Really suppress 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) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
+		if (!empty($h['host']) && (@dns_get_record($h['host'], DNS_A + DNS_CNAME) || filter_var($h['host'], FILTER_VALIDATE_IP) )) {
 			return $url;
 		}
 
@@ -489,7 +493,7 @@ class Network
 		}
 
 		$str_allowed = Config::get('system', 'allowed_email', '');
-		if (!x($str_allowed)) {
+		if (empty($str_allowed)) {
 			return true;
 		}
 
@@ -528,7 +532,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';
@@ -604,7 +608,7 @@ class Network
 	 */
 	public static function finalUrl($url, $depth = 1, $fetchbody = false)
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		$url = self::stripTrackingQueryParams($url);