Revert "Use last entry for Content-Type"

[friendica.git] / mod / parse_url.php

diff --git a/mod/parse_url.php b/mod/parse_url.php
index b40ddf1d71ec2e2cc3fd58a503f4d4da21de8640..39aae4a5a02a7dc594e397927d357f6d037d04e0 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -24,10 +24,11 @@
  */
 
 use Friendica\App;
+use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
-use Friendica\Util\Network;
+use Friendica\DI;
 use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
 
@@ -84,17 +85,18 @@ function parse_url_content(App $a)
        // Check if the URL is an image, video or audio file. If so format
        // the URL with the corresponding BBCode media tag
        // Fetch the header of the URL
-       $curlResponse = Network::curl($url, false, ['novalidate' => true, 'nobody' => true]);
+       $curlResponse = DI::httpRequest()->get($url, false, ['novalidate' => true, 'nobody' => true]);
 
        if ($curlResponse->isSuccess()) {
                // Convert the header fields into an array
                $hdrs = [];
-               $h = explode("\n", $curlResponse->getHeader());
+               $h = $curlResponse->getHeaders();
                foreach ($h as $l) {
-                       $header = array_map('trim', explode(':', trim($l), 2));
-                       if (count($header) == 2) {
-                               list($k, $v) = $header;
-                               $hdrs[$k] = $v;
+                       foreach ($l as $k => $v) {
+                               if (empty($hdrs[$k])) {
+                                       $hdrs[$k] = $v;
+                               }
+                               $hdrs[$k] .= " " . $v;
                        }
                }
                $type = null;
@@ -177,7 +179,7 @@ function parse_url_content(App $a)
        }
 
        // Format it as BBCode attachment
-       $info = add_page_info_data($siteinfo);
+       $info = "\n" . PageInfo::getFooterFromData($siteinfo);
 
        echo $info;