X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/7ec1925e01b1aba945c76b240063751ec81973b6..b7350069c36900359b8f26c6e9794f614a40b20e:/tweeper.php?ds=sidebyside diff --git a/tweeper.php b/tweeper.php index 817452b..579aae1 100644 --- a/tweeper.php +++ b/tweeper.php @@ -156,9 +156,7 @@ class Tweeper { $enc->setAttribute('length', $url_info['download_content_length']); $enc->setAttribute('type', $url_info['content_type']); - $dom->appendChild($enc); - - return $dom->saveXML($enc); + return $enc; } /** @@ -196,32 +194,9 @@ 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 json to xml. + * 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 +236,7 @@ class Tweeper { return NULL; } - return $this->jsonToXml($matches[1], 'instagram'); + return Tweeper::jsonToXml($matches[1], 'instagram'); } /** @@ -282,7 +257,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)); @@ -302,6 +277,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) {