Changeset 3317Tweet

Timestamp:

11/07/08 09:57:44 (5 years ago)

Author:

bsittler

Message:

allow a filename exactly matching the uploaded filename; give a better
error message when this does not work

File:

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

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

@@ -31 +31 @@
 if(isset($_REQUEST['args']))
 {
-        $args = $_REQUEST['args'];
+        $args = trim($_REQUEST['args']);
         if(strlen($args))
         {
@@ -268 +268 @@
 function main()
 {
+        global $file, $filename;
         global $argc, $argv;
         global $stderr;
@@ -350 +351 @@
         }
 
-        global $file, $filename;
-
         if((! $file) && ($argc == 2) && ($argv[1] == 'logo-caca.png'))
         {
@@ -357 +356 @@
                 $argc = 1;
         }
-
-        if($argc > 1)
+        else if($filename && $file && ($argc == 2)
+                        &&
+                        (strtolower(basename($argv[1])) == strtolower(basename($filename))))
+        {
+                $argc = 1;
+        }
+
+        if($argc == 2)
+        {
+                $stderr .= sprintf("%s: image not found\n", $argv[1]);
+                return 1;
+        }
+
+        if($argc > 2)
         {
                 $stderr .= sprintf("%s: too many arguments\n", $argv[0]);