X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=js%2Fbase64.js;h=3fdc256ddb68dd778e6056f27feee79aeb850949;hp=f4775ae59ecce21947f7c918e401225ee974b9e1;hb=89c3c6ff37517012b5a799014c5a6d05d3e2e902;hpb=b51bb0c6d9385938eab21c70ed7ea631883260d0

diff --git a/js/base64.js b/js/base64.js
index f4775ae..3fdc256 100644
--- a/js/base64.js
+++ b/js/base64.js
@@ -1,6 +1,16 @@
 (function () {
 
-    var b64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    var encTable = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    var decTable = new Array(
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,
+        52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, -1,
+        -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+        -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1);
 
     Rakka.encodeBase64 = function (src) {
         var len = src.length;
@@ -11,26 +21,79 @@
             var c1 = src.charCodeAt(i++);
             
             if (i == len) {
-                ret += b64Chars.charAt(c1 >> 2);
-                ret += b64Chars.charAt((c1 & 0x03) << 4);
+                ret += encTable.charAt(c1 >> 2);
+                ret += encTable.charAt((c1 & 0x03) << 4);
                 ret += "==";
             }
             else {
                 var c2 = src.charCodeAt(i++);
 
                 if (i == len) {
-                    ret += b64Chars.charAt(c1 >> 2);
-                    ret += b64Chars.charAt(((c1 & 0x03) << 4) | ((c2 & 0xF0) >> 4));
-                    ret += b64Chars.charAt((c2 & 0x0F) << 2);
+                    ret += encTable.charAt(c1 >> 2);
+                    ret += encTable.charAt(((c1 & 0x03) << 4) | ((c2 & 0xF0) >> 4));
+                    ret += encTable.charAt((c2 & 0x0F) << 2);
                     ret += "=";
                 }
                 else {
                     var c3 = src.charCodeAt(i++);
 
-                    ret += b64Chars.charAt(c1 >> 2);
-                    ret += b64Chars.charAt(((c1 & 0x03) << 4) | ((c2 & 0xF0) >> 4));
-                    ret += b64Chars.charAt(((c2 & 0x0F) << 2) | ((c3 & 0xC0) >> 6));
-                    ret += b64Chars.charAt(c3 & 0x3F);
+                    ret += encTable.charAt(c1 >> 2);
+                    ret += encTable.charAt(((c1 & 0x03) << 4) | ((c2 & 0xF0) >> 4));
+                    ret += encTable.charAt(((c2 & 0x0F) << 2) | ((c3 & 0xC0) >> 6));
+                    ret += encTable.charAt(c3 & 0x3F);
+                }
+            }
+        }
+
+        return ret;
+    };
+
+    Rakka.decodeBase64 = function (src) {
+        var len = src.length;
+        var i   = 0;
+        var ret = "";
+
+        while (i < len) {
+            var c1;
+            do {
+                c1 = decTable[src.charCodeAt(i++)];
+            } while (i < len && c1 == -1);
+            
+            if (c1 != -1) {
+                var c2;
+                do {
+                    c2 = decTable[src.charCodeAt(i++)];
+                } while (i < len && c2 == -1);
+                
+                if (c2 != -1) {
+
+                    ret += String.fromCharCode((c1 << 2) | ((c2 & 0x30) >> 4));
+
+                    var c3;
+                    do {
+                        c3 = src.charCodeAt(i++);
+                        if (c3 == 61) {
+                            return ret;
+                        }
+                        c3 = decTable[c3];
+                    } while (i < len && c3 == -1);
+
+                    if (c3 != -1) {
+                        ret += String.fromCharCode(((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2));
+
+                        var c4;
+                        do {
+                            c4 = src.charCodeAt(i++);
+                            if (c4 == 61) {
+                                return ret;
+                            }
+                            c4 = decTable[c4];
+                        } while (i < len && c4 == -1);
+
+                        if (c4 != -1) {
+                            ret += String.fromCharCode(((c3 & 0x03) << 6) | c4);
+                        }
+                    }
                 }
             }
         }