Changeset 90

Timestamp:

03/23/2009 08:46:31 PM (3 years ago)

Author:

amir

Message:

Fix for the base 64 encoding to be uri friendly , i.e. avoid +=/ .

Location:

trunk/WordPress/plugin/transposh

Files:

• parser.php (modified) (2 diffs)
• transposh.php (modified) (1 diff)

trunk/WordPress/plugin/transposh/parser.php

@@ -787 +787 @@
                 //Use base64 encoding to make that when the page is translated (i.e. update_translation) we
         //get back exactlly the same string without having the client decode/encode it in anyway.
-        $token = "token=\"" . base64_encode($original_text) . "\"";
+        $token = "token=\"" . base64_url_encode($original_text) . "\"";
 
         if($translated_text == NULL)
@@ -876 +876 @@
 
 }
+
+/**
+ * Encode a string as base 64 while avoiding characters which should be avoided 
+ * in uri, e.g. + is interpeted as a space.
+ */
+function base64_url_encode($input) {
+    return strtr(base64_encode($input), '+/=', '-_,');
+}
+
+/**
+ * Decode a string previously decoded with base64_url_encode
+ */
+function base64_url_decode($input) {
+    return base64_decode(strtr($input, '-_,', '+/='));
+}
+
 ?>

trunk/WordPress/plugin/transposh/transposh.php

@@ -415 +415 @@
 
     $ref=getenv('HTTP_REFERER');
-    $original =  base64_decode($_POST['token'], TRUE);
+    $original =  base64_url_decode($_POST['token']);
     $translation = $_POST['translation'];
     $lang = $_POST['lang'];