Pareil, mais en mieux

git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@48 9869982d-c50d-0410-be91-f2a2ec7c7c7b

diff --git a/banana/misc.inc.php b/banana/misc.inc.php
index 7e7a547..f57ed8e 100644 (file)
--- a/banana/misc.inc.php
+++ b/banana/misc.inc.php
@@ -190,7 +190,7 @@ function formatDisplayHeader($_header,$_text) {
             return $rsl;
 
         case "x-face":
-            return '<img src="xface.php?face='.base64_encode($_text).'"  alt="x-face" />';
+            return '<img src="xface.php?face='.urlencode(base64_encode($_text)).'"  alt="x-face" />';
         
         default:
             if (function_exists('hook_formatDisplayHeader')

diff --git a/examples/xface.php b/examples/xface.php
index 2a50f9f..16d0332 100644 (file)
--- a/examples/xface.php
+++ b/examples/xface.php
@@ -1,6 +1,6 @@
 <?php
 
 header('Content-Type: image/jpeg');
-passthru('echo '.escapeshellarg(base64_decode(str_replace(' ', '+', $_REQUEST['face']))).'|uncompface -X |convert xbm:- jpg:-');
+passthru('echo '.escapeshellarg(base64_decode($_REQUEST['face'])).'|uncompface -X |convert xbm:- jpg:-');
 
 ?>