Changeset 3312Tweet

Timestamp:

11/07/08 09:33:03 (5 years ago)

Author:

bsittler

Message:

better argument handling, and allow logo-caca.png as a special file argument

File:

• libcaca/trunk/caca-php/examples/www/img2txt.php (modified) (7 diffs)

libcaca/trunk/caca-php/examples/www/img2txt.php

@@ -26 +26 @@
 
 $argv = array(basename($img2txt_php));
-$args = '';
+$file = isset($_FILES['file']) ? $_FILES['file']['tmp_name'] : NULL;
+$filename = isset($_FILES['file']) ? $_FILES['file']['name'] : NULL;
+$args = NULL;
 if(isset($_REQUEST['args']))
 {
         $args = $_REQUEST['args'];
-}
-$args=trim($args);
-if(strlen($args))
-{
-        foreach(explode(' ', $args) as $arg)
-        {
-                $argv[] = $arg;
+        if(strlen($args))
+        {
+                foreach(explode(' ', $args) as $arg)
+                {
+                        $argv[] = $arg;
+                }
         }
 }
@@ -224 +225 @@
         $stderr .= sprintf("Usage: %s [OPTIONS]... <IMAGE>\n", $argv[0]);
         $stderr .= sprintf("Convert IMAGE to any text based available format.\n");
-        $stderr .= sprintf("Example : %s -w 80 -f ansi ./caca.png\n\n", $argv[0]);
+        $stderr .= sprintf("Example : -W 80 -f html logo-caca.png\n\n", $argv[0]);
         $stderr .= sprintf("Options:\n");
         $stderr .= sprintf("  -h, --help\t\t\tThis help\n");
@@ -348 +349 @@
         }
 
+        global $file, $filename;
+
+        if((! $file) && ($argc == 2) && ($argv[1] == 'logo-caca.png'))
+        {
+                $file = 'logo-caca.png';
+                $argc = 1;
+        }
+
         if($argc > 1)
         {
@@ -354 +363 @@
                 return 1;
         }
-
-        $file = isset($_FILES['file']) ? $_FILES['file']['tmp_name'] : NULL;
-        $filename = isset($_FILES['file']) ? $_FILES['file']['name'] : NULL;
 
         if(! $file)
@@ -466 +472 @@
         return 0;
 }
-if(main() || strlen($stdout) || strlen($stderr))
+$ret = 1;
+if(isset($_REQUEST['args']) || $file)
+{
+        $ret = main();
+}
+if($ret || strlen($stdout) || strlen($stderr))
 {
         header('Content-Type: text/html; charset=UTF-8');
@@ -484 +495 @@
 <br />
 <label for="args">Options:</label>
-<input id="args" name="args" type="text" value="<?= htmlspecialchars($args) ?>" size="80" />
+<input id="args" name="args" type="text" value="<?= isset($_REQUEST['args']) ? htmlspecialchars($_REQUEST['args']) : '' ?>" size="80" />
 <br />
 <input type="submit" />
@@ -492 +503 @@
         if(strlen($stderr))
         {
-                ?><pre xml:space="preserve"><em><?= htmlspecialchars($stderr) ?></em></pre><?php
+                ?><pre xml:space="preserve"><em><?= preg_replace('!(logo-caca[.]png)!', '<a href="$1">$1</a>', htmlspecialchars($stderr)) ?></em></pre><?php
                         ;
         }
         if(strlen($stdout))
         {
-                ?><pre xml:space="preserve"><?= htmlspecialchars($stdout) ?></pre><?php
+                ?><pre xml:space="preserve"><?= preg_replace('!([&]lt;)([.a-zA-Z0-9]+[@][-.a-zA-Z0-9]+)([&]gt;)!', '$1<a href="mailto:$2">$2</a>$3', preg_replace('!(\s|^)(http://[-.:_/0-9a-zA-Z%?=&;#]+)(\s|$)!', '$1<a href="$2">$2</a>$3', htmlspecialchars($stdout))) ?></pre><?php
                         ;
         }