From 4548a0aa90cd3b3a0034178609f74bca5b0eccd3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 4 Dec 2015 18:02:47 +0100
Subject: [PATCH] Remove OC_Util::getUrlContent and replace by proper usage of
 public interfaces

---
 lib/private/apphelper.php |  8 +++++++-
 lib/private/util.php      | 23 +++++------------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/lib/private/apphelper.php b/lib/private/apphelper.php
index 9084d2b8ab4..478787b21d8 100644
--- a/lib/private/apphelper.php
+++ b/lib/private/apphelper.php
@@ -36,6 +36,12 @@ class AppHelper implements \OCP\IHelper {
 	 * @deprecated 8.1.0 Use \OCP\IServerContainer::getHTTPClientService
 	 */
 	public function getUrlContent($url) {
-		return \OC_Util::getUrlContent($url);
+		try {
+			$client = \OC::$server->getHTTPClientService()->newClient();
+			$response = $client->get($url);
+			return $response->getBody();
+		} catch (\Exception $e) {
+			return false;
+		}
 	}
 }
diff --git a/lib/private/util.php b/lib/private/util.php
index ac42b96de2d..2038f3bfa2a 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1237,7 +1237,11 @@ class OC_Util {
 
 		// accessing the file via http
 		$url = OC_Helper::makeURLAbsolute(OC::$WEBROOT . '/data' . $fileName);
-		$content = self::getUrlContent($url);
+		try {
+			$content = \OC::$server->getHTTPClientService()->newClient()->get($url)->getBody();
+		} catch (\Exception $e) {
+			$content = false;
+		}
 
 		// cleanup
 		@unlink($testFile);
@@ -1312,23 +1316,6 @@ class OC_Util {
 		return \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate($length, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
 	}
 
-	/**
-	 * Get URL content
-	 * @param string $url Url to get content
-	 * @throws Exception If the URL does not start with http:// or https://
-	 * @return string of the response or false on error
-	 * This function get the content of a page via curl, if curl is enabled.
-	 * If not, file_get_contents is used.
-	 * @deprecated Use \OC::$server->getHTTPClientService()->newClient()->get($url);
-	 */
-	public static function getUrlContent($url) {
-		try {
-			return \OC::$server->getHTTPHelper()->getUrlContent($url);
-		} catch (\Exception $e) {
-			throw $e;
-		}
-	}
-
 	/**
 	 * Checks whether the server is running on Windows
 	 *
-- 
2.39.5