X-Git-Url: https://git.ao2.it/tweeper.git/blobdiff_plain/78ffdd0963e354dae561414aec7893336928ecc1..8084a3d5e37ce07a05510290fcd6952b53a4ce4c:/src/Tweeper.php?ds=sidebyside diff --git a/src/Tweeper.php b/src/Tweeper.php index 566decb..831f47d 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,7 +36,7 @@ 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}. @@ -249,10 +249,12 @@ 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"]); + $json = json_encode($data); return Tweeper::jsonToXml($json, 'instagram'); @@ -367,11 +369,11 @@ class Tweeper { } $output = $xsltProcessor->transformToXML($xmlDoc); - if (FALSE === $output) { trigger_error('XSL transformation failed.', E_USER_ERROR); return NULL; } + return $output; }