X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/78ffdd0963e354dae561414aec7893336928ecc1..01dfd03d97afd0d5d06a36af37d96892905340ad:/src/Tweeper.php diff --git a/src/Tweeper.php b/src/Tweeper.php index 566decb..cfa3812 100644 --- a/src/Tweeper.php +++ b/src/Tweeper.php @@ -6,7 +6,7 @@ namespace Tweeper; * @file * Tweeper - a Twitter to RSS web scraper. * - * Copyright (C) 2013-2016 Antonio Ospite + * Copyright (C) 2013-2018 Antonio Ospite * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,13 +36,21 @@ date_default_timezone_set('UTC'); */ class Tweeper { - private static $userAgent = "Mozilla/5.0 (Windows NT 6.1; rv:22.0) Gecko/20130405 Firefox/22.0"; + 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 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; } /** @@ -249,10 +257,16 @@ class Tweeper { return NULL; } + $data = json_decode($matches[1], $assoc = TRUE); + // The "qe" object contains elements which will result in invalid XML // element names, so remove it. - $data = json_decode($matches[1], $assoc = TRUE); 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'); @@ -313,6 +327,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; @@ -367,11 +382,11 @@ class Tweeper { } $output = $xsltProcessor->transformToXML($xmlDoc); - if (FALSE === $output) { trigger_error('XSL transformation failed.', E_USER_ERROR); return NULL; } + return $output; }