X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/88d4252117c451770a3a7b01322d8f34075b6379..6e513d255b204e746d194a0b1d1590751f31a9d0:/tweeper.php?ds=inline

diff --git a/tweeper.php b/tweeper.php
index f7d619e..94ea05f 100644
--- a/tweeper.php
+++ b/tweeper.php
@@ -132,17 +132,14 @@ class Tweeper {
       "audio/x-midi",
       "image/gif",
       "image/jpeg",
+      "image/png",
       "video/avi",
       "video/mp4",
       "video/mpeg",
       "video/ogg",
     );
 
-    // The RSS specification says that the enclosure element URL must be http.
-    // See http://sourceforge.net/p/feedvalidator/bugs/72/
-    $http_url = preg_replace("/^https/", "http", $url);
-
-    $url_info = Tweeper::getUrlInfo($http_url);
+    $url_info = Tweeper::getUrlInfo($url);
 
     $supported = in_array($url_info['content_type'], $supported_content_types);
     if (!$supported) {
@@ -150,21 +147,23 @@ class Tweeper {
       return '';
     }
 
-    $dom = new DomDocument();
+    // The RSS specification says that the enclosure element URL must be http.
+    // See http://sourceforge.net/p/feedvalidator/bugs/72/
+    $http_url = preg_replace("/^https/", "http", $url_info['url']);
+
+    $dom = new DOMDocument();
     $enc = $dom->createElement('enclosure');
-    $enc->setAttribute('url', $url_info['url']);
+    $enc->setAttribute('url', $http_url);
     $enc->setAttribute('length', $url_info['download_content_length']);
     $enc->setAttribute('type', $url_info['content_type']);
 
-    $dom->appendChild($enc);
-
-    return $dom->saveXML($enc);
+    return $enc;
   }
 
   /**
    * Mimic the message from libxml.c::php_libxml_ctx_error_level()
    */
-  private function logXmlError($error) {
+  private static function logXmlError($error) {
     $output = "";
 
     switch ($error->level) {
@@ -196,32 +195,9 @@ class Tweeper {
   }
 
   /**
-   * Load a stylesheet if the web site is supported.
+   * Convert json to XML.
    */
-  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);
-      return NULL;
-    }
-
-    $stylesheet_contents = $this->getUrlContents($stylesheet);
-
-    $xslDoc = new DOMDocument();
-    $xslDoc->loadXML($stylesheet_contents);
-
-    $xsltProcessor = new XSLTProcessor();
-    $xsltProcessor->registerPHPFunctions();
-    $xsltProcessor->setParameter('', 'generate-enclosure', $this->generate_enclosure);
-    $xsltProcessor->importStylesheet($xslDoc);
-
-    return $xsltProcessor;
-  }
-
-  /**
-   * Convert json to xml.
-   */
-  private function jsonToXml($json, $root_node_name) {
+  private static function jsonToXml($json, $root_node_name) {
     // Apparently the ObjectNormalizer used afterwards is not able to handle
     // the stdClass object created by json_decode() with the default setting
     // $assoc = false; so use $assoc = true.
@@ -261,7 +237,7 @@ class Tweeper {
       return NULL;
     }
 
-    return $this->jsonToXml($matches[1], 'instagram');
+    return Tweeper::jsonToXml($matches[1], 'instagram');
   }
 
   /**
@@ -282,7 +258,7 @@ class Tweeper {
     // Handle warnings and errors when loading invalid HTML.
     $xml_errors_value = libxml_use_internal_errors(TRUE);
 
-    // If there is a host-specific method to get the xml data, use it!
+    // If there is a host-specific method to get the XML data, use it!
     $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.');
     if (method_exists($this, $get_xml_host_method)) {
       $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html));
@@ -293,7 +269,7 @@ class Tweeper {
     }
 
     foreach (libxml_get_errors() as $xml_error) {
-      $this->logXmlError($xml_error);
+      Tweeper::logXmlError($xml_error);
     }
     libxml_clear_errors();
     libxml_use_internal_errors($xml_errors_value);
@@ -302,6 +278,29 @@ class Tweeper {
   }
 
   /**
+   * Load a stylesheet if the web site is supported.
+   */
+  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);
+      return NULL;
+    }
+
+    $stylesheet_contents = Tweeper::getUrlContents($stylesheet);
+
+    $xslDoc = new DOMDocument();
+    $xslDoc->loadXML($stylesheet_contents);
+
+    $xsltProcessor = new XSLTProcessor();
+    $xsltProcessor->registerPHPFunctions();
+    $xsltProcessor->setParameter('', 'generate-enclosure', $this->generate_enclosure);
+    $xsltProcessor->importStylesheet($xslDoc);
+
+    return $xsltProcessor;
+  }
+
+  /**
    * Convert the site content to RSS.
    */
   public function tweep($src_url) {
@@ -319,7 +318,7 @@ class Tweeper {
       return NULL;
     }
 
-    $html = $this->getUrlContents($src_url);
+    $html = Tweeper::getUrlContents($src_url);
     if (FALSE === $html) {
       return NULL;
     }