From: Sébastien SAUVAGE <sebsauvage@sebsauvage.net>
Date: Fri, 29 Nov 2013 21:01:08 +0000 (-0800)
Subject: Merge pull request #145 from Alkarex/patch-1
X-Git-Tag: v0.0.42beta~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=ab0638edb0b23e404e05c88c1029b98ad4dd9613;hp=53da201749f8f362323ef278bf338f1d9f7a925a;p=github%2Fshaarli%2FShaarli.git

Merge pull request #145 from Alkarex/patch-1

smallHash: simplified and improved performance
---

diff --git a/index.php b/index.php
index 884b2afd..acc3fe49 100644
--- a/index.php
+++ b/index.php
@@ -221,7 +221,7 @@ function nl2br_escaped($html)
     return str_replace('>','&gt;',str_replace('<','&lt;',nl2br($html)));
 }
 
-/* Returns the small hash of a string
+/* Returns the small hash of a string, using RFC 4648 base64url format
    eg. smallHash('20111006_131924') --> yZH23w
    Small hashes:
      - are unique (well, as unique as crc32, at last)
@@ -233,10 +233,7 @@ function nl2br_escaped($html)
 function smallHash($text)
 {
     $t = rtrim(base64_encode(hash('crc32',$text,true)),'=');
-    $t = str_replace('+','-',$t); // Get rid of characters which need encoding in URLs.
-    $t = str_replace('/','_',$t);
-    $t = str_replace('=','@',$t);
-    return $t;
+    return strtr($t, '+/', '-_');
 }
 
 // In a string, converts urls to clickable links.