X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/60ffa4f7f61cb8c815244644c633d84646d21104..21601a9299810f223341ff4bed4f9649f5ea0359:/tweeper.php?ds=sidebyside diff --git a/tweeper.php b/tweeper.php index 94ea05f..87efd60 100644 --- a/tweeper.php +++ b/tweeper.php @@ -89,6 +89,9 @@ class Tweeper { CURLOPT_USERAGENT => Tweeper::$userAgent, )); $contents = curl_exec($ch); + if (FALSE === $contents) { + trigger_error(curl_error($ch)); + } curl_close($ch); return $contents; @@ -111,6 +114,9 @@ class Tweeper { )); curl_exec($ch); $url_info = curl_getinfo($ch); + if (FALSE === $url_info) { + trigger_error(curl_error($ch)); + } curl_close($ch); return $url_info; @@ -121,7 +127,9 @@ class Tweeper { */ public static function generateEnclosure($url) { $supported_content_types = array( + "application/octet-stream", "application/ogg", + "application/pdf", "audio/aac", "audio/mp4", "audio/mpeg", @@ -310,6 +318,12 @@ class Tweeper { return NULL; } + $scheme = $url["scheme"]; + if (!in_array($scheme, array("http", "https"))) { + trigger_error("unsupported scheme: $scheme", E_USER_ERROR); + return NULL; + } + // Strip the leading www. to be more forgiving on input URLs. $host = preg_replace('/^www\./', '', $url["host"]); @@ -434,4 +448,8 @@ if (!isset($options['src_url'])) { } $tweeper = new Tweeper($options['generate_enclosure']); -echo $tweeper->tweep($options['src_url']); +$output = $tweeper->tweep($options['src_url']); +if (is_null($output)) { + exit(1); +} +echo $output;