Avoid hexadecimal directory names where possible

diff --git a/maintenance/dumpHTML.inc b/maintenance/dumpHTML.inc
index ec9f710..250f8d5 100644 (file)
--- a/maintenance/dumpHTML.inc
+++ b/maintenance/dumpHTML.inc
@@ -616,7 +616,7 @@ ENDTEXT;
                                $dir .= '_';
                        } else {
                                $c = $chars[$i];
-                               if ( ord( $c ) >= 128 || ctype_alnum( $c ) ) {
+                               if ( ord( $c ) >= 128 || preg_match( '/[a-zA-Z0-9!#$%&()+,[\]^_`{}-]/', $c ) ) {
                                        if ( function_exists( 'mb_strtolower' ) ) {
                                                $dir .= mb_strtolower( $c );
                                        } else {

diff --git a/skins/htmldump/lookup.js b/skins/htmldump/lookup.js
index 92c06ce..469ee9a 100644 (file)
--- a/skins/htmldump/lookup.js
+++ b/skins/htmldump/lookup.js
@@ -56,10 +56,10 @@ function getHashedDirectory(pdbk, depth) {
                        c = dbk.charAt(i);
                        cc = dbk.charCodeAt(i);
                        
-                       if (cc >= 128 || /[a-zA-Z0-9]/.exec(c)) {
+                       if (cc >= 128 || /[a-zA-Z0-9!#$%&()+,[\]^_`{}-]/.exec(c)) {
                                dir += c.toLowerCase();
                        } else {
-                               dir += binl2hex([cc]);
+                               dir += binl2hex([cc]).substr(0,2).toUpperCase();
                        }
                }
        }