diff options
| -rw-r--r-- | inc/utf8.php | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/inc/utf8.php b/inc/utf8.php index 3e5f5decd..80b85637b 100644 --- a/inc/utf8.php +++ b/inc/utf8.php @@ -11,10 +11,19 @@ * * Slashes are not encoded * + * When the second parameter is true the string will + * be encoded only if non ASCII characters are detected - + * This makes it safe to run it multiple times on the + * same string (default is true) + * * @author Andreas Gohr <andi@splitbrain.org> + * @see urlencode */ -function utf8_encodeFN($file){ - $file = rawurlencode($file); +function utf8_encodeFN($file,$safe=true){ + if($safe && preg_match('#^[a-zA-Z0-9/_\-.%]+$#',$file)){ + return $file; + } + $file = urlencode($file); $file = str_replace('%2F','/',$file); return $file; } @@ -22,10 +31,13 @@ function utf8_encodeFN($file){ /** * URL-Decode a filename * + * This is just a wrapper around urldecode + * * @author Andreas Gohr <andi@splitbrain.org> + * @see urldecode */ function utf8_decodeFN($file){ - $file = rawurldecode($file); + $file = urldecode($file); return $file; } @@ -52,7 +64,6 @@ function utf8_check($Str) { return true; } - /** * This is a unicode aware replacement for strlen() * |