X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=src%2FParseUrl.php;h=9e46281ec91a73ec6d159be72dc84068c91aaeb1;hb=98c2cdb49acd24ed277883a793465d0bae4919c8;hp=217ca25d9f05b6757eb53bfab7dfd44ad54b3df6;hpb=2ad162f991fdd32122b029398b9ab9e8801c0462;p=friendica.git

diff --git a/src/ParseUrl.php b/src/ParseUrl.php
index 217ca25d9f..9e46281ec9 100644
--- a/src/ParseUrl.php
+++ b/src/ParseUrl.php
@@ -6,15 +6,15 @@
 namespace Friendica;
 
 use Friendica\Core\Config;
+use Friendica\Object\Image;
+use Friendica\Util\XML;
 
-use xml;
 use dba;
-
-use DomXPath;
+use DOMXPath;
 use DOMDocument;
 
+require_once 'include/dba.php';
 require_once "include/network.php";
-require_once "include/Photo.php";
 require_once "include/oembed.php";
 
 /**
@@ -25,10 +25,10 @@ class ParseUrl
 	/**
 	 * @brief Search for chached embeddable data of an url otherwise fetch it
 	 *
-	 * @param type $url         The url of the page which should be scraped
-	 * @param type $no_guessing If true the parse doens't search for
+	 * @param string $url         The url of the page which should be scraped
+	 * @param bool $no_guessing If true the parse doens't search for
 	 *                          preview pictures
-	 * @param type $do_oembed   The false option is used by the function fetch_oembed()
+	 * @param bool $do_oembed   The false option is used by the function fetch_oembed()
 	 *                          to avoid endless loops
 	 *
 	 * @return array which contains needed data for embedding
@@ -89,12 +89,12 @@ class ParseUrl
 	 * like \<title\>Awesome Title\</title\> or
 	 * \<meta name="description" content="An awesome description"\>
 	 *
-	 * @param type $url         The url of the page which should be scraped
-	 * @param type $no_guessing If true the parse doens't search for
+	 * @param string $url         The url of the page which should be scraped
+	 * @param bool $no_guessing If true the parse doens't search for
 	 *                          preview pictures
-	 * @param type $do_oembed   The false option is used by the function fetch_oembed()
+	 * @param bool $do_oembed   The false option is used by the function fetch_oembed()
 	 *                          to avoid endless loops
-	 * @param type $count       Internal counter to avoid endless loops
+	 * @param int $count       Internal counter to avoid endless loops
 	 *
 	 * @return array which contains needed data for embedding
 	 *    string 'url' => The url of the parsed page
@@ -204,19 +204,19 @@ class ParseUrl
 		$doc = new DOMDocument();
 		@$doc->loadHTML($body);
 
-		xml::deleteNode($doc, "style");
-		xml::deleteNode($doc, "script");
-		xml::deleteNode($doc, "option");
-		xml::deleteNode($doc, "h1");
-		xml::deleteNode($doc, "h2");
-		xml::deleteNode($doc, "h3");
-		xml::deleteNode($doc, "h4");
-		xml::deleteNode($doc, "h5");
-		xml::deleteNode($doc, "h6");
-		xml::deleteNode($doc, "ol");
-		xml::deleteNode($doc, "ul");
+		XML::deleteNode($doc, "style");
+		XML::deleteNode($doc, "script");
+		XML::deleteNode($doc, "option");
+		XML::deleteNode($doc, "h1");
+		XML::deleteNode($doc, "h2");
+		XML::deleteNode($doc, "h3");
+		XML::deleteNode($doc, "h4");
+		XML::deleteNode($doc, "h5");
+		XML::deleteNode($doc, "h6");
+		XML::deleteNode($doc, "ol");
+		XML::deleteNode($doc, "ul");
 
-		$xpath = new DomXPath($doc);
+		$xpath = new DOMXPath($doc);
 
 		$list = $xpath->query("//meta[@content]");
 		foreach ($list as $node) {
@@ -354,7 +354,7 @@ class ParseUrl
 				}
 
 				$src = self::completeUrl($attr["src"], $url);
-				$photodata = get_photo_info($src);
+				$photodata = Image::getInfoFromURL($src);
 
 				if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
 					if ($photodata[0] > 300) {
@@ -375,7 +375,7 @@ class ParseUrl
 
 			unset($siteinfo["image"]);
 
-			$photodata = get_photo_info($src);
+			$photodata = Image::getInfoFromURL($src);
 
 			if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
 				$siteinfo["images"][] = array("src" => $src,
@@ -455,6 +455,7 @@ class ParseUrl
 	 *
 	 * @param string $tag The pure tag name
 	 * @param int    $k   Counter for internal use
+	 * @return void
 	 */
 	private static function arrAddHashes(&$tag, $k)
 	{