Merge pull request #5294 from annando/use-gravity

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

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index ba9b7ec1467c3eedbd09d95a375a55a191421668..b267c610864326ed216d7e90e9ed64a70435bee7 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -16,7 +16,6 @@ use DOMXPath;
 use DOMDocument;
 
 require_once 'include/dba.php';
-require_once "include/network.php";
 
 /**
  * @brief Class with methods for extracting certain content from an url
@@ -51,19 +50,11 @@ class ParseUrl
                        return false;
                }
 
-               $r = q(
-                       "SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
-                       dbesc(normalise_link($url)),
-                       intval(!$no_guessing),
-                       intval($do_oembed)
+               $parsed_url = dba::selectFirst('parsed_url', ['content'],
+                       ['url' => normalise_link($url), 'guessing' => !$no_guessing, 'oembed' => $do_oembed]
                );
-
-               if ($r) {
-                       $data = $r[0]["content"];
-               }
-
-               if (!is_null($data)) {
-                       $data = unserialize($data);
+               if (!empty($parsed_url['content'])) {
+                       $data = unserialize($parsed_url['content']);
                        return $data;
                }
 
@@ -74,7 +65,8 @@ class ParseUrl
                        [
                                'url' => normalise_link($url), 'guessing' => !$no_guessing,
                                'oembed' => $do_oembed, 'content' => serialize($data),
-                               'created' => datetime_convert()],
+                               'created' => DateTimeFormat::utcNow()
+                       ],
                        true
                );
 
@@ -146,7 +138,7 @@ class ParseUrl
                $siteinfo["url"] = $url;
                $siteinfo["type"] = "link";
 
-               $data = Network::zFetchURL($url);
+               $data = Network::curl($url);
                if (!$data['success']) {
                        return($siteinfo);
                }