X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FUtil%2FNetwork.php;h=255b3c8c4d3e1b8d1f41d1b8358b27251102a5d2;hb=f2ca3e5be44192c486e8e3af2a993e065ad40a7d;hp=00eaa80fa6f018045ddde723eae7b7382082ec06;hpb=ffbc6887977c34072e2a3043486a1b0e768a9844;p=friendica.git

diff --git a/src/Util/Network.php b/src/Util/Network.php
index 00eaa80fa6..255b3c8c4d 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -5,9 +5,10 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Addon;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Config;
-use Friendica\Network\Curl;
+use Friendica\Network\CurlResult;
 use DOMDocument;
 use DomXPath;
 
@@ -53,7 +54,7 @@ class Network
 	 * @param string  $accept_content supply Accept: header with 'accept_content' as the value
 	 * @param string  $cookiejar      Path to cookie jar file
 	 *
-	 * @return Curl With all relevant information, 'body' contains the actual fetched content.
+	 * @return CurlResult With all relevant information, 'body' contains the actual fetched content.
 	 */
 	public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = '')
 	{
@@ -83,7 +84,7 @@ class Network
 	 *                           'nobody' => only return the header
 	 *                           'cookiejar' => path to cookie jar file
 	 *
-	 * @return Curl
+	 * @return CurlResult
 	 */
 	public static function curl($url, $binary = false, &$redirects = 0, $opts = [])
 	{
@@ -106,14 +107,14 @@ class Network
 		$url = self::unparseURL($parts);
 
 		if (self::isUrlBlocked($url)) {
-			logger('domain of ' . $url . ' is blocked', LOGGER_DATA);
-			return Curl::createErrorCurl($url);
+			Logger::log('domain of ' . $url . ' is blocked', Logger::DATA);
+			return CurlResult::createErrorCurl($url);
 		}
 
 		$ch = @curl_init($url);
 
 		if (($redirects > 8) || (!$ch)) {
-			return Curl::createErrorCurl($url);
+			return CurlResult::createErrorCurl($url);
 		}
 
 		@curl_setopt($ch, CURLOPT_HEADER, true);
@@ -208,11 +209,11 @@ class Network
 			$curl_info = @curl_getinfo($ch);
 		}
 
-		$curlResponse = new Curl($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
+		$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
 
 		if ($curlResponse->isRedirectUrl()) {
 			$redirects++;
-			logger('curl: redirect ' . $url . ' to ' . $curlResponse->getRedirectUrl());
+			Logger::log('curl: redirect ' . $url . ' to ' . $curlResponse->getRedirectUrl());
 			@curl_close($ch);
 			return self::curl($curlResponse->getRedirectUrl(), $binary, $redirects, $opts);
 		}
@@ -233,25 +234,25 @@ class Network
 	 * @param integer $redirects Recursion counter for internal use - default = 0
 	 * @param integer $timeout   The timeout in seconds, default system config value or 60 seconds
 	 *
-	 * @return Curl The content
+	 * @return CurlResult The content
 	 */
 	public static function post($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
 	{
 		$stamp1 = microtime(true);
 
 		if (self::isUrlBlocked($url)) {
-			logger('post_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
-			return Curl::createErrorCurl($url);
+			Logger::log('post_url: domain of ' . $url . ' is blocked', Logger::DATA);
+			return CurlResult::createErrorCurl($url);
 		}
 
 		$a = get_app();
 		$ch = curl_init($url);
 
 		if (($redirects > 8) || (!$ch)) {
-			return Curl::createErrorCurl($url);
+			return CurlResult::createErrorCurl($url);
 		}
 
-		logger('post_url: start ' . $url, LOGGER_DATA);
+		Logger::log('post_url: start ' . $url, Logger::DATA);
 
 		curl_setopt($ch, CURLOPT_HEADER, true);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -310,11 +311,11 @@ class Network
 		$base = $s;
 		$curl_info = curl_getinfo($ch);
 
-		$curlResponse = new Curl($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
+		$curlResponse = new CurlResult($url, $s, $curl_info, curl_errno($ch), curl_error($ch));
 
 		if ($curlResponse->isRedirectUrl()) {
 			$redirects++;
-			logger('post_url: redirect ' . $url . ' to ' . $curlResponse->getRedirectUrl());
+			Logger::log('post_url: redirect ' . $url . ' to ' . $curlResponse->getRedirectUrl());
 			curl_close($ch);
 			return self::post($curlResponse->getRedirectUrl(), $params, $headers, $redirects, $timeout);
 		}
@@ -323,7 +324,7 @@ class Network
 
 		$a->saveTimestamp($stamp1, 'network');
 
-		logger('post_url: end ' . $url, LOGGER_DATA);
+		Logger::log('post_url: end ' . $url, Logger::DATA);
 
 		return $curlResponse;
 	}
@@ -516,7 +517,7 @@ class Network
 
 	public static function lookupAvatarByEmail($email)
 	{
-		$avatar['size'] = 175;
+		$avatar['size'] = 300;
 		$avatar['email'] = $email;
 		$avatar['url'] = '';
 		$avatar['success'] = false;
@@ -524,10 +525,10 @@ class Network
 		Addon::callHooks('avatar_lookup', $avatar);
 
 		if (! $avatar['success']) {
-			$avatar['url'] = System::baseUrl() . '/images/person-175.jpg';
+			$avatar['url'] = System::baseUrl() . '/images/person-300.jpg';
 		}
 
-		logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
+		Logger::log('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], Logger::DEBUG);
 		return $avatar['url'];
 	}