projects
/
tweeper.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use more accurate names for the date conversion functions
[tweeper.git]
/
tweeper.php
diff --git
a/tweeper.php
b/tweeper.php
index
736b5b3
..
3e250b7
100644
(file)
--- a/
tweeper.php
+++ b/
tweeper.php
@@
-32,7
+32,7
@@
date_default_timezone_set('UTC');
*/
class Tweeper {
*/
class Tweeper {
- private static $
USER_AGENT
= "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; rv:22.0) Gecko/20130405 Firefox/22.0";
/**
* Constructor sets up {@link $generate_enclosure}.
/**
* Constructor sets up {@link $generate_enclosure}.
@@
-44,30
+44,30
@@
class Tweeper {
/**
* Convert numeric Epoch to the date format expected in a RSS document.
*/
/**
* Convert numeric Epoch to the date format expected in a RSS document.
*/
- public static function epoch
_to_gmd
ate($timestamp) {
+ public static function epoch
ToRssD
ate($timestamp) {
if (!is_numeric($timestamp) || is_nan($timestamp)) {
$timestamp = 0;
}
if (!is_numeric($timestamp) || is_nan($timestamp)) {
$timestamp = 0;
}
- return gmdate(
'D, d M Y H:i:s', $timestamp) . ' GMT'
;
+ return gmdate(
DATE_RSS, $timestamp)
;
}
/**
* Convert generic date string to the date format expected in a RSS document.
*/
}
/**
* Convert generic date string to the date format expected in a RSS document.
*/
- public static function str
_to_gmd
ate($date) {
+ public static function str
ToRssD
ate($date) {
$timestamp = strtotime($date);
if (FALSE === $timestamp) {
$timestamp = 0;
}
$timestamp = strtotime($date);
if (FALSE === $timestamp) {
$timestamp = 0;
}
- return Tweeper::epoch
_to_gmd
ate($timestamp);
+ return Tweeper::epoch
ToRssD
ate($timestamp);
}
/**
* Get the contents from a URL.
*/
}
/**
* Get the contents from a URL.
*/
- private static function get
_c
ontents($url) {
+ private static function get
UrlC
ontents($url) {
$ch = curl_init($url);
curl_setopt_array($ch, array(
CURLOPT_HEADER => FALSE,
$ch = curl_init($url);
curl_setopt_array($ch, array(
CURLOPT_HEADER => FALSE,
@@
-77,7
+77,7
@@
class Tweeper {
CURLOPT_SSL_VERIFYHOST => FALSE,
CURLOPT_SSL_VERIFYPEER => FALSE,
CURLOPT_HTTPHEADER => array('Accept-language: en'),
CURLOPT_SSL_VERIFYHOST => FALSE,
CURLOPT_SSL_VERIFYPEER => FALSE,
CURLOPT_HTTPHEADER => array('Accept-language: en'),
- CURLOPT_USERAGENT => Tweeper::$
USER_AGENT
,
+ CURLOPT_USERAGENT => Tweeper::$
userAgent
,
));
$contents = curl_exec($ch);
curl_close($ch);
));
$contents = curl_exec($ch);
curl_close($ch);
@@
-88,7
+88,7
@@
class Tweeper {
/**
* Get the headers from a URL.
*/
/**
* Get the headers from a URL.
*/
- private static function get
_i
nfo($url) {
+ private static function get
UrlI
nfo($url) {
$ch = curl_init($url);
curl_setopt_array($ch, array(
CURLOPT_HEADER => TRUE,
$ch = curl_init($url);
curl_setopt_array($ch, array(
CURLOPT_HEADER => TRUE,
@@
-98,7
+98,7
@@
class Tweeper {
CURLOPT_RETURNTRANSFER => TRUE,
CURLOPT_SSL_VERIFYHOST => FALSE,
CURLOPT_SSL_VERIFYPEER => FALSE,
CURLOPT_RETURNTRANSFER => TRUE,
CURLOPT_SSL_VERIFYHOST => FALSE,
CURLOPT_SSL_VERIFYPEER => FALSE,
- CURLOPT_USERAGENT => Tweeper::$
USER_AGENT
,
+ CURLOPT_USERAGENT => Tweeper::$
userAgent
,
));
curl_exec($ch);
$url_info = curl_getinfo($ch);
));
curl_exec($ch);
$url_info = curl_getinfo($ch);
@@
-110,7
+110,7
@@
class Tweeper {
/**
* Generate an RSS <enclosure/> element.
*/
/**
* Generate an RSS <enclosure/> element.
*/
- public static function generate
_e
nclosure($url) {
+ public static function generate
E
nclosure($url) {
$supported_content_types = array(
"application/ogg",
"audio/aac",
$supported_content_types = array(
"application/ogg",
"audio/aac",
@@
-133,7
+133,7
@@
class Tweeper {
// See http://sourceforge.net/p/feedvalidator/bugs/72/
$http_url = preg_replace("/^https/", "http", $url);
// See http://sourceforge.net/p/feedvalidator/bugs/72/
$http_url = preg_replace("/^https/", "http", $url);
- $url_info = Tweeper::get
_i
nfo($http_url);
+ $url_info = Tweeper::get
UrlI
nfo($http_url);
$supported = in_array($url_info['content_type'], $supported_content_types);
if (!$supported) {
$supported = in_array($url_info['content_type'], $supported_content_types);
if (!$supported) {
@@
-155,7
+155,7
@@
class Tweeper {
/**
* Mimic the message from libxml.c::php_libxml_ctx_error_level()
*/
/**
* Mimic the message from libxml.c::php_libxml_ctx_error_level()
*/
- private function log
_xml_e
rror($error) {
+ private function log
XmlE
rror($error) {
$output = "";
switch ($error->level) {
$output = "";
switch ($error->level) {
@@
-189,21
+189,21
@@
class Tweeper {
/**
* Load a stylesheet if the web site is supported.
*/
/**
* Load a stylesheet if the web site is supported.
*/
- private function load
_s
tylesheet($host) {
+ private function load
S
tylesheet($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 = "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->get
_c
ontents($stylesheet);
+ $stylesheet_contents = $this->get
UrlC
ontents($stylesheet);
$xslDoc = new DOMDocument();
$xslDoc->loadXML($stylesheet_contents);
$xsltProcessor = new XSLTProcessor();
$xsltProcessor->registerPHPFunctions();
$xslDoc = new DOMDocument();
$xslDoc->loadXML($stylesheet_contents);
$xsltProcessor = new XSLTProcessor();
$xsltProcessor->registerPHPFunctions();
- $xsltProcessor->setParameter('', 'generate
E
nclosure', $this->generate_enclosure);
+ $xsltProcessor->setParameter('', 'generate
-e
nclosure', $this->generate_enclosure);
$xsltProcessor->importStylesheet($xslDoc);
return $xsltProcessor;
$xsltProcessor->importStylesheet($xslDoc);
return $xsltProcessor;
@@
-212,7
+212,7
@@
class Tweeper {
/**
* Convert json to xml.
*/
/**
* Convert json to xml.
*/
- private function json
_to_x
ml($json, $root_node_name) {
+ private function json
ToX
ml($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.
// 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.
@@
-252,7
+252,7
@@
class Tweeper {
return NULL;
}
return NULL;
}
- return $this->json
_to_x
ml($matches[1], 'instagram');
+ return $this->json
ToX
ml($matches[1], 'instagram');
}
/**
}
/**
@@
-267,7
+267,7
@@
class Tweeper {
/**
* Convert the HTML retrieved from the site to XML.
*/
/**
* Convert the HTML retrieved from the site to XML.
*/
- private function html
_to_x
ml($html, $host) {
+ private function html
ToX
ml($html, $host) {
$xmlDoc = new DOMDocument();
// Handle warnings and errors when loading invalid HTML.
$xmlDoc = new DOMDocument();
// Handle warnings and errors when loading invalid HTML.
@@
-284,7
+284,7
@@
class Tweeper {
}
foreach (libxml_get_errors() as $xml_error) {
}
foreach (libxml_get_errors() as $xml_error) {
- $this->log
_xml_e
rror($xml_error);
+ $this->log
XmlE
rror($xml_error);
}
libxml_clear_errors();
libxml_use_internal_errors($xml_errors_value);
}
libxml_clear_errors();
libxml_use_internal_errors($xml_errors_value);
@@
-305,12
+305,12
@@
class Tweeper {
// Strip the leading www. to be more forgiving on input URLs.
$host = preg_replace('/^www\./', '', $url["host"]);
// Strip the leading www. to be more forgiving on input URLs.
$host = preg_replace('/^www\./', '', $url["host"]);
- $xsltProcessor = $this->load
_s
tylesheet($host);
+ $xsltProcessor = $this->load
S
tylesheet($host);
if (NULL === $xsltProcessor) {
return NULL;
}
if (NULL === $xsltProcessor) {
return NULL;
}
- $html = $this->get
_c
ontents($src_url);
+ $html = $this->get
UrlC
ontents($src_url);
if (FALSE === $html) {
return NULL;
}
if (FALSE === $html) {
return NULL;
}
@@
-320,7
+320,7
@@
class Tweeper {
$html = call_user_func_array(array($this, $preprocess_html_host_method), array($html));
}
$html = call_user_func_array(array($this, $preprocess_html_host_method), array($html));
}
- $xmlDoc = $this->html
_to_x
ml($html, $host);
+ $xmlDoc = $this->html
ToX
ml($html, $host);
if (NULL === $xmlDoc) {
return NULL;
}
if (NULL === $xmlDoc) {
return NULL;
}