From: Antonio Ospite <ospite@studenti.unina.it>
Date: Sun, 11 Aug 2013 18:44:37 +0000 (+0200)
Subject: Make it optional to generate the <enclosure/> element
X-Git-Tag: v0.1~12^2~8
X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/f82b9f8a651307d7c6ba52c2d1d7da3dcc696189?ds=inline;hp=d38cac35c8e0aed0a223533bb54e46958c693212

Make it optional to generate the <enclosure/> element
---

diff --git a/rss_converter_twitter.com.xsl b/rss_converter_twitter.com.xsl
index 280342e..7f07ad7 100644
--- a/rss_converter_twitter.com.xsl
+++ b/rss_converter_twitter.com.xsl
@@ -23,6 +23,8 @@
     xmlns:php="http://php.net/xsl"
     xsl:extension-element-prefixes="php">
 
+    <xsl:param name="generateEnclosure"/>
+
     <xsl:output method="xml" indent="yes"/>
 
     <xsl:variable name="twitterBaseURL">
@@ -53,7 +55,9 @@
                 <xsl:copy-of select="$tweet-text/node()"/>
                 <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
             </description>
-            <xsl:apply-templates select="$tweet-text//a[@data-expanded-url]"/>
+            <xsl:if test="$generateEnclosure = 1">
+                <xsl:apply-templates select="$tweet-text//a[@data-expanded-url]"/>
+            </xsl:if>
         </item>
     </xsl:template>
 
diff --git a/tweeper.php b/tweeper.php
index 45bc786..bdba04d 100644
--- a/tweeper.php
+++ b/tweeper.php
@@ -88,7 +88,7 @@ function generate_enclosure($url)
 
 class Tweeper {
 
-  public function __construct($stylesheet) {
+  public function __construct($stylesheet, $generate_enclosure = FALSE) {
     $stylesheet_contents = $this->get_contents($stylesheet);
 
     $xslDoc = new DOMDocument();
@@ -96,6 +96,7 @@ class Tweeper {
 
     $this->xsltProcessor = new XSLTProcessor();
     $this->xsltProcessor->registerPHPFunctions();
+    $this->xsltProcessor->setParameter('', 'generateEnclosure', $generate_enclosure);
     $this->xsltProcessor->importStylesheet($xslDoc);
   }
 
@@ -135,23 +136,28 @@ class Tweeper {
 function usage($argv)
 {
   if (php_sapi_name() != 'cli')
-    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>");
+    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>&generate_enclosure=<0|1>");
   else
-    $usage = "{$argv[0]} [-h|--help] <src_url>\n";
+    $usage = "{$argv[0]} [-e|-h|--help] <src_url>\n";
 
   return "usage: $usage";
 }
 
 function parse_options_cli($argv, $argc)
 {
-  $options = array();
+  $options = array(
+    'generate_enclosure' => FALSE
+  );
 
   if ($argc < 2)
     return $options;
 
-  $cli_options = getopt("h", array("help"));
+  $cli_options = getopt("eh", array("help"));
   foreach ($cli_options as $opt => $val) {
     switch ($opt) {
+    case 'e':
+      $options['generate_enclosure'] = TRUE;
+      break;
     case 'h':
     case 'help':
       echo usage($argv);
@@ -168,11 +174,16 @@ function parse_options_cli($argv, $argc)
 
 function parse_options_query_string()
 {
-  $options = array();
+  $options = array(
+    'generate_enclosure' => FALSE
+  );
 
   if (isset($_GET['src_url']))
     $options['src_url'] = $_GET['src_url'];
 
+  if (isset($_GET['generate_enclosure']))
+    $options['generate_enclosure'] = $_GET['generate_enclosure'] == 1;
+
   return $options;
 }
 
@@ -193,5 +204,5 @@ $stylesheet = __DIR__ . "/rss_converter_" . $url["host"] . ".xsl";
 if (FALSE === file_exists($stylesheet))
   die("Conversion to RSS not supported: {$url["host"]}\n");
 
-$tweeper = new Tweeper($stylesheet);
+$tweeper = new Tweeper($stylesheet, $options['generate_enclosure']);
 echo $tweeper->tweep($options['src_url']);