NEWS: add release notes for the v1.4.1 release

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 84712f6..2d5017e 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -38,10 +38,10 @@ function is_cli() {
  */
 function usage($argv) {
   if (is_cli()) {
  */
 function usage($argv) {
   if (is_cli()) {

-    $usage = "{$argv[0]} [-e|-u <0|1>|-h|--help] <src_url>\n";
+    $usage = "{$argv[0]} [-e|-m <0|1>|-u <0|1>|-h|--help] <src_url>\n";

   }
   else {
   }
   else {

-    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>&generate_enclosure=<0|1>&show_usernames=<0|1>");
+    $usage = htmlentities("{$_SERVER['SCRIPT_NAME']}?src_url=<src_url>&generate_enclosure=<0|1>&show_usernames=<0|1>&show_multimedia=<0|1>");

   }
 
   return "usage: $usage";
   }
 
   return "usage: $usage";


@@ -54,19 +54,30 @@ function parse_options_cli($argv, $argc) {
   $options = array(
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
   $options = array(
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,

+    'show_multimedia' => TRUE,

   );
 
   if ($argc < 2) {
     return $options;
   }
 
   );
 
   if ($argc < 2) {
     return $options;
   }
 

-  $cli_options = getopt("eu:h", array("help"));
+  $cli_options = getopt("em:u:h", array("help"));

   foreach ($cli_options as $opt => $val) {
     switch ($opt) {
       case 'e':
         $options['generate_enclosure'] = TRUE;
         break;
 
   foreach ($cli_options as $opt => $val) {
     switch ($opt) {
       case 'e':
         $options['generate_enclosure'] = TRUE;
         break;
 

+      case 'm':
+        $ret = filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+        if (NULL === $ret) {
+          fwrite(STDERR, "Invalid argument for the -m option.\n");
+          fwrite(STDERR, usage($argv));
+          exit(1);
+        }
+        $options['show_multimedia'] = $val;
+        break;
+

       case 'u':
         $ret = filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
         if (NULL === $ret) {
       case 'u':
         $ret = filter_var($val, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
         if (NULL === $ret) {


@@ -102,6 +113,7 @@ function parse_options_query_string() {
   $options = array(
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,
   $options = array(
     'generate_enclosure' => FALSE,
     'show_usernames' => TRUE,

+    'show_multimedia' => TRUE,

   );
 
   if (isset($_GET['src_url'])) {
   );
 
   if (isset($_GET['src_url'])) {


@@ -112,6 +124,10 @@ function parse_options_query_string() {
     $options['generate_enclosure'] = $_GET['generate_enclosure'] == 1;
   }
 
     $options['generate_enclosure'] = $_GET['generate_enclosure'] == 1;
   }
 

+  if (isset($_GET['show_multimedia'])) {
+    $options['show_multimedia'] = $_GET['show_multimedia'] != 0;
+  }
+

   if (isset($_GET['show_usernames'])) {
     $options['show_usernames'] = $_GET['show_usernames'] != 0;
   }
   if (isset($_GET['show_usernames'])) {
     $options['show_usernames'] = $_GET['show_usernames'] != 0;
   }


@@ -133,7 +149,7 @@ if (!isset($options['src_url'])) {
   exit(1);
 }
 
   exit(1);
 }
 

-$tweeper = new Tweeper($options['generate_enclosure'], $options['show_usernames']);
+$tweeper = new Tweeper($options['generate_enclosure'], $options['show_usernames'], $options['show_multimedia']);

 $output = $tweeper->tweep($options['src_url']);
 if (is_null($output)) {
   exit(1);
 $output = $tweeper->tweep($options['src_url']);
 if (is_null($output)) {
   exit(1);