From 8bddd94ea8efd2dc41d3fa35353a85ec5299a711 Mon Sep 17 00:00:00 2001
From: Adrian Lang <dokuwiki@adrianlang.de>
Date: Tue, 26 Oct 2010 22:10:23 +0200
Subject: [PATCH] Fix SafeFN-encoded file names

SafeFN encoding now always end the encoding block by appending a dot at the end of the file name. This is necessary since the file name may get an extension which is not encoded.
---
 _test/cases/inc/safefn.test.php | 6 ++++--
 inc/SafeFN.class.php            | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_test/cases/inc/safefn.test.php b/_test/cases/inc/safefn.test.php
index fb0d812d7..b93914bf8 100644
--- a/_test/cases/inc/safefn.test.php
+++ b/_test/cases/inc/safefn.test.php
@@ -10,6 +10,8 @@ class safeFN_test extends UnitTestCase {
     function test1(){
         // we test multiple cases here - format: string, repl, additional, test
         $tests   = array();
+        $tests[] = array('äa.txt', '%5g.a.txt');
+        $tests[] = array('ä.', '%5g..');
         $tests[] = array('asciistring','asciistring');
         $tests[] = array('ascii-_/.string','ascii-_/.string');
         $tests[] = array('AName','%x%1a.ame');
@@ -18,8 +20,8 @@ class safeFN_test extends UnitTestCase {
         $tests[] = array('Aß∂ƒName','%x%5b%6oy%aa%1a.ame');
         $tests[] = array('A%ß-∂_.ƒName','%x%%5b.-%6oy._.%aa%1a.ame');
         $tests[] = array('A%%ß-∂_.ƒName','%x%%%5b.-%6oy._.%aa%1a.ame');
-        $tests[] = array('데이터도 함께 복원됩니다. 강력한','%zf4%13dg%15ao%zhg%0%164o%yig%0%11at%138w%zk9%zag%zb8..%0%xyt%10cl%164c');
-        $tests[] = array('совместимая','%td%ta%sy%t8%t1%td%te%t4%t8%sw%tr');
+        $tests[] = array('데이터도 함께 복원됩니다. 강력한','%zf4%13dg%15ao%zhg%0%164o%yig%0%11at%138w%zk9%zag%zb8..%0%xyt%10cl%164c.');
+        $tests[] = array('совместимая','%td%ta%sy%t8%t1%td%te%t4%t8%sw%tr.');
         $tests[] = array('нехватка_файлового_пространства_на_сервере_p0-squid.some.domain.1270211897.txt.gz','%t9%t1%th%sy%sw%te%t6%sw._%tg%sw%t5%t7%ta%sy%ta%sz%ta._%tb%tc%ta%td%te%tc%sw%t9%td%te%sy%sw._%t9%sw._%td%t1%tc%sy%t1%tc%t1._p0-squid.some.domain.1270211897.txt.gz');
 
         foreach($tests as $test){
diff --git a/inc/SafeFN.class.php b/inc/SafeFN.class.php
index b6e477fab..ac6698a63 100644
--- a/inc/SafeFN.class.php
+++ b/inc/SafeFN.class.php
@@ -114,6 +114,7 @@ class SafeFN {
                 $converted = true;
             }
         }
+        if($converted) $safe .= self::$post_indicator;
         return $safe;
     }
 
-- 
GitLab