X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/8084a3d5e37ce07a05510290fcd6952b53a4ce4c..4336e714ebb2cf1b07c59a4534b9d9acd244c6f9:/src/Tweeper.php?ds=inline

diff --git a/src/Tweeper.php b/src/Tweeper.php
index 831f47d..7318900 100644
--- a/src/Tweeper.php
+++ b/src/Tweeper.php
@@ -39,10 +39,18 @@ class Tweeper {
   private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:60.0) Gecko/20100101 Firefox/60.0";
 
   /**
-   * Constructor sets up {@link $generate_enclosure}.
+   * Create a new Tweeper object controlling optional settings.
+   *
+   * @param bool $generate_enclosure
+   *   Enables the creation of <enclosure/> elements (disabled by default).
+   * @param bool $show_usernames
+   *   Enables showing the username in front of the content for multi-user
+   *   sites (enabled by default). Only some stylesheets supports this
+   *   functionality (twitter, instagram, pump.io).
    */
-  public function __construct($generate_enclosure = FALSE) {
+  public function __construct($generate_enclosure = FALSE, $show_usernames = TRUE) {
     $this->generate_enclosure = $generate_enclosure;
+    $this->show_usernames = $show_usernames;
   }
 
   /**
@@ -94,7 +102,7 @@ class Tweeper {
     ));
     $contents = curl_exec($ch);
     if (FALSE === $contents) {
-      trigger_error(curl_error($ch));
+      trigger_error(curl_error($ch), E_USER_WARNING);
     }
     curl_close($ch);
 
@@ -116,10 +124,17 @@ class Tweeper {
       CURLOPT_SSL_VERIFYPEER => FALSE,
       CURLOPT_USERAGENT => Tweeper::$userAgent,
     ));
-    curl_exec($ch);
+
+    $ret = curl_exec($ch);
+    if (FALSE === $ret) {
+      trigger_error(curl_error($ch), E_USER_WARNING);
+      curl_close($ch);
+      return FALSE;
+    }
+
     $url_info = curl_getinfo($ch);
     if (FALSE === $url_info) {
-      trigger_error(curl_error($ch));
+      trigger_error(curl_error($ch), E_USER_WARNING);
     }
     curl_close($ch);
 
@@ -152,10 +167,14 @@ class Tweeper {
     );
 
     $url_info = Tweeper::getUrlInfo($url);
+    if (FALSE === $url_info) {
+      trigger_error("Failed to retrieve info for URL: " . $url, E_USER_WARNING);
+      return '';
+    }
 
     $supported = in_array($url_info['content_type'], $supported_content_types);
     if (!$supported) {
-      error_log("Unsupported enclosure content type \"" . $url_info['content_type'] . "\" for URL: " . $url_info['url']);
+      trigger_error("Unsupported enclosure content type \"" . $url_info['content_type'] . "\" for URL: " . $url_info['url'], E_USER_WARNING);
       return '';
     }
 
@@ -203,7 +222,7 @@ class Tweeper {
 
     $output .= " line $error->line";
 
-    error_log($output);
+    trigger_error($output, E_USER_WARNING);
   }
 
   /**
@@ -230,7 +249,7 @@ class Tweeper {
 
     $xml_data = $serializer->serialize($data, 'xml', $serializer_options);
     if (!$xml_data) {
-      trigger_error("Cannot serialize data", E_USER_ERROR);
+      trigger_error("Cannot serialize data", E_USER_WARNING);
       return NULL;
     }
 
@@ -245,7 +264,7 @@ class Tweeper {
     $json_match_expr = '/window._sharedData = (.*);/';
     $ret = preg_match($json_match_expr, $html, $matches);
     if ($ret !== 1) {
-      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_ERROR);
+      trigger_error("Cannot match expression: $json_match_expr\n", E_USER_WARNING);
       return NULL;
     }
 
@@ -255,6 +274,10 @@ class Tweeper {
     // element names, so remove it.
     unset($data["qe"]);
 
+    // The "knobs" object contains elements with undefined namespaces, so
+    // remove it to silence an error message.
+    unset($data["knobs"]);
+
     $json = json_encode($data);
 
     return Tweeper::jsonToXml($json, 'instagram');
@@ -303,11 +326,14 @@ class Tweeper {
   private function loadStylesheet($host) {
     $stylesheet = "file://" . __DIR__ . "/rss_converter_" . $host . ".xsl";
     if (FALSE === file_exists($stylesheet)) {
-      trigger_error("Conversion to RSS not supported for $host ($stylesheet not found)", E_USER_ERROR);
+      trigger_error("Conversion to RSS not supported for $host ($stylesheet not found)", E_USER_WARNING);
       return NULL;
     }
 
     $stylesheet_contents = Tweeper::getUrlContents($stylesheet);
+    if (FALSE === $stylesheet_contents) {
+      return NULL;
+    }
 
     $xslDoc = new DOMDocument();
     $xslDoc->loadXML($stylesheet_contents);
@@ -315,6 +341,7 @@ class Tweeper {
     $xsltProcessor = new XSLTProcessor();
     $xsltProcessor->registerPHPFunctions();
     $xsltProcessor->setParameter('', 'generate-enclosure', $this->generate_enclosure);
+    $xsltProcessor->setParameter('', 'show-usernames', $this->show_usernames);
     $xsltProcessor->importStylesheet($xslDoc);
 
     return $xsltProcessor;
@@ -326,14 +353,14 @@ class Tweeper {
   public function tweep($src_url, $host=NULL, $validate_scheme=TRUE) {
     $url = parse_url($src_url);
     if (FALSE === $url) {
-      trigger_error("Invalid URL: $src_url", E_USER_ERROR);
+      trigger_error("Invalid URL: $src_url", E_USER_WARNING);
       return NULL;
     }
 
     if (TRUE === $validate_scheme) {
       $scheme = $url["scheme"];
       if (!in_array($scheme, array("http", "https"))) {
-        trigger_error("unsupported scheme: $scheme", E_USER_ERROR);
+        trigger_error("unsupported scheme: $scheme", E_USER_WARNING);
         return NULL;
       }
     }
@@ -341,7 +368,7 @@ class Tweeper {
     // if the host is not given derive it from the URL
     if (NULL === $host) {
       if (empty($url["host"])) {
-        trigger_error("Invalid host in URL: $src_url", E_USER_ERROR);
+        trigger_error("Invalid host in URL: $src_url", E_USER_WARNING);
         return NULL;
       }
       // Strip the leading www. to be more forgiving on input URLs.
@@ -370,7 +397,7 @@ class Tweeper {
 
     $output = $xsltProcessor->transformToXML($xmlDoc);
     if (FALSE === $output) {
-      trigger_error('XSL transformation failed.', E_USER_ERROR);
+      trigger_error('XSL transformation failed.', E_USER_WARNING);
       return NULL;
     }