Log Helper::getRemoteFileContents() errors

freescout-help-desk · Jul 22, 2024 · efca2ac · efca2ac
1 parent 029e5c8
commit efca2ac
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/Misc/Helper.php b/app/Misc/Helper.php
@@ -1661,7 +1661,8 @@ public static function getRemoteFileContents($url)
 
             // 307 - Temporary Redirect.
             if (!preg_match("/(200|301|302|307)/", $headers[0])) {
-                return false;
+                throw new \Exception('HTTP Status Code: '.$headers[0], 1);
+                //return false;
             }
 
             $ch = curl_init();
@@ -1671,14 +1672,19 @@ public static function getRemoteFileContents($url)
             curl_setopt($ch, CURLOPT_TIMEOUT, 180);
             $contents = curl_exec($ch);
 
-            if (curl_errno($ch)) {
-                throw new \Exception(curl_errno($ch).' '.curl_error($ch), 1);
-            }
+            $curl_errno = curl_errno($ch);
 
-            curl_close($ch);
+            if ($curl_errno) {
+                throw new \Exception('Curl Error Number: '.$curl_errno, 1);
+            }
 
-            if (!$contents) {
-                return false;
+            if ($contents == '') {
+                $https_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+                curl_close($ch);
+                throw new \Exception('Empty Response. Curl Error Number: '.$curl_errno.'. Response Status Code: '.$https_status, 1);
+                //return false;
+            } else {
+                curl_close($ch);
             }
 
             return $contents;