Turn epoch_to_gmdate() and str_to_gmdate() into static methods

diff --git a/rss_converter_dilbert.com.xsl b/rss_converter_dilbert.com.xsl
index c686407..7394b91 100644 (file)
--- a/rss_converter_dilbert.com.xsl
+++ b/rss_converter_dilbert.com.xsl
@@ -52,7 +52,7 @@
                 <xsl:value-of select="concat($BaseURL, $picture-element/@src)"/>
             </link>
             <pubDate>
-                <xsl:value-of select="php:functionString('str_to_gmdate', substring-after($picture-id, 'strip_enlarged_'))"/>
+                <xsl:value-of select="php:functionString('Tweeper::str_to_gmdate', substring-after($picture-id, 'strip_enlarged_'))"/>
             </pubDate>
             <description>
                 <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>

diff --git a/rss_converter_pump.io.xsl b/rss_converter_pump.io.xsl
index ef4b6e8..6b05d0c 100644 (file)
--- a/rss_converter_pump.io.xsl
+++ b/rss_converter_pump.io.xsl
@@ -38,7 +38,7 @@
                 <xsl:value-of select=".//p[@class='muted']/small/a/@href"/>
             </link>
             <pubDate>
-                <xsl:value-of select="php:functionString('str_to_gmdate', .//abbr[@class='easydate']/@title)"/>
+                <xsl:value-of select="php:functionString('Tweeper::str_to_gmdate', .//abbr[@class='easydate']/@title)"/>
             </pubDate>
             <description>
                 <xsl:value-of select="concat($user-name, ': ')"/>

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index 7f07ad7..96ecf04 100644 (file)
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -47,7 +47,7 @@
                 <xsl:value-of select="concat($twitterBaseURL, .//a[@class='details with-icn js-details']/@href)"/>
             </link>
             <pubDate>
-                <xsl:value-of select="php:functionString('epoch_to_gmdate', .//small[@class='time']//span/@data-time)"/>
+                <xsl:value-of select="php:functionString('Tweeper::epoch_to_gmdate', .//small[@class='time']//span/@data-time)"/>
             </pubDate>
             <description>
                 <xsl:value-of select="concat($screen-name, ': ')"/>

diff --git a/tweeper.php b/tweeper.php
index 6cdf8cf..74dc14f 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -22,17 +22,6 @@ date_default_timezone_set('UTC');
 
 define('USER_AGENT', 'Mozilla/5.0 (Windows NT 6.1; rv:22.0) Gecko/20130405 Firefox/22.0');
 
-function str_to_gmdate($date)
-{
-  $timestamp = strtotime($date);
-  return epoch_to_gmdate($timestamp);
-}
-
-function epoch_to_gmdate($timestamp)
-{
-  return gmdate('D, d M Y H:i:s', $timestamp) . ' GMT';
-}
-
 function get_url_info($url)
 {
   $ch = curl_init($url);
@@ -105,6 +94,17 @@ class Tweeper {
     $this->xsltProcessor->importStylesheet($xslDoc);
   }
 
+  public static function epoch_to_gmdate($timestamp)
+  {
+    return gmdate('D, d M Y H:i:s', $timestamp) . ' GMT';
+  }
+
+  public static function str_to_gmdate($date)
+  {
+    $timestamp = strtotime($date);
+    return Tweeper::epoch_to_gmdate($timestamp);
+  }
+
   private static function get_contents($uri) {
     # https://www.wjsams.com/c/docs/Wiki/Php-HowToSetUserAgentOnFileGetContents
     $opts = array(