Merge pull request #8037 from MrPetovan/bug/notices

[friendica.git] / src / Network / CurlResult.php

diff --git a/src/Network/CurlResult.php b/src/Network/CurlResult.php
index 998644a8765fb8501b2b64ae5a2f744e9c4d4d81..5b77c3963c7e69e7593107f0c69f8d6d5f2d7877 100644 (file)
--- a/src/Network/CurlResult.php
+++ b/src/Network/CurlResult.php
@@ -26,6 +26,11 @@ class CurlResult
         */
        private $header;
 
+       /**
+        * @var array the HTTP headers of the Curl call
+        */
+       private $header_fields;
+
        /**
         * @var boolean true (if HTTP 2xx result) or false
         */
@@ -129,6 +134,7 @@ class CurlResult
 
                $this->body = substr($result, strlen($header));
                $this->header = $header;
+               $this->header_fields = []; // Is filled on demand
        }
 
        private function checkSuccess()
@@ -161,7 +167,7 @@ class CurlResult
                }
 
                if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
-                       $redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+                       $redirect_parts = parse_url($this->info['redirect_url'] ?? '');
                        if (empty($redirect_parts)) {
                                $redirect_parts = [];
                        }
@@ -173,7 +179,7 @@ class CurlResult
                                }
                        }
 
-                       $parts = parse_url(defaults($this->info, 'url', ''));
+                       $parts = parse_url($this->info['url'] ?? '');
                        if (empty($parts)) {
                                $parts = [];
                        }
@@ -228,24 +234,63 @@ class CurlResult
         *
         * @param string $field optional header field. Return all fields if empty
         *
-        * @return string|bool the Curl headers, "false" when field isn't found
+        * @return string the Curl headers or the specified content of the header variable
         */
-       public function getHeader($field = '')
+       public function getHeader(string $field = '')
        {
                if (empty($field)) {
                        return $this->header;
                }
 
-               $lines = explode("\n", $this->header);
+               $field = strtolower(trim($field));
+
+               $headers = $this->getHeaderArray();
+
+               if (isset($headers[$field])) {
+                       return $headers[$field];
+               }
+
+               return '';
+       }
+
+       /**
+        * Check if a specified header exists
+        *
+        * @param string $field header field
+        *
+        * @return boolean "true" if header exists
+        */
+       public function inHeader(string $field)
+       {
+               $field = strtolower(trim($field));
+
+               $headers = $this->getHeaderArray();
+
+               return array_key_exists($field, $headers);
+       }
+
+       /**
+        * Returns the Curl headers as an associated array
+        *
+        * @return array associated header array
+        */
+       public function getHeaderArray()
+       {
+               if (!empty($this->header_fields)) {
+                       return $this->header_fields;
+               }
+
+               $this->header_fields = [];
+
+               $lines = explode("\n", trim($this->header));
                foreach ($lines as $line) {
                        $parts = explode(':', $line);
-                       $headerfield = array_shift($parts);
-                       if (strtolower(trim($field)) == strtolower(trim($headerfield))) {
-                               return implode(':', $parts);
-                       }
+                       $headerfield = strtolower(trim(array_shift($parts)));
+                       $headerdata = trim(implode(':', $parts));
+                       $this->header_fields[$headerfield] = $headerdata;
                }
 
-               return false;
+               return $this->header_fields;
        }
 
        /**