diff --git a/api/js/jquery/jquery.base64.js b/api/js/jquery/jquery.base64.js deleted file mode 100644 index 763b08fa41..0000000000 --- a/api/js/jquery/jquery.base64.js +++ /dev/null @@ -1,142 +0,0 @@ - - /** - * jQuery BASE64 functions - * - * - * Encodes the given data with base64. - * String $.base64Encode ( String str ) - *
- * Decodes a base64 encoded data. - * String $.base64Decode ( String str ) - *
- * - * Encodes and Decodes the given data in base64. - * This encoding is designed to make binary data survive transport through transport layers that are not 8-bit clean, such as mail bodies. - * Base64-encoded data takes about 33% more space than the original data. - * This javascript code is used to encode / decode data using base64 (this encoding is designed to make binary data survive transport through transport layers that are not 8-bit clean). Script is fully compatible with UTF-8 encoding. You can use base64 encoded data as simple encryption mechanism. - * If you plan using UTF-8 encoding in your project don't forget to set the page encoding to UTF-8 (Content-Type meta tag). - * This function orginally get from the WebToolkit and rewrite for using as the jQuery plugin. - * - * Example - * Code - * - * $.base64Encode("I'm Persian."); - * - * Result - * - * "SSdtIFBlcnNpYW4u" - * - * Code - * - * $.base64Decode("SSdtIFBlcnNpYW4u"); - * - * Result - * - * "I'm Persian." - * - * - * @alias Muhammad Hussein Fattahizadeh < muhammad [AT] semnanweb [DOT] com > - * @link http://www.semnanweb.com/jquery-plugin/base64.html - * @see http://www.webtoolkit.info/ - * @license http://www.gnu.org/licenses/gpl.html [GNU General Public License] - * @param {jQuery} {base64Encode:function(input)) - * @param {jQuery} {base64Decode:function(input)) - * @return string - */ - - (function($){ - - var keyString = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - - var uTF8Encode = function(string) { - string = string.replace(/\x0d\x0a/g, "\x0a"); - var output = ""; - for (var n = 0; n < string.length; n++) { - var c = string.charCodeAt(n); - if (c < 128) { - output += String.fromCharCode(c); - } else if ((c > 127) && (c < 2048)) { - output += String.fromCharCode((c >> 6) | 192); - output += String.fromCharCode((c & 63) | 128); - } else { - output += String.fromCharCode((c >> 12) | 224); - output += String.fromCharCode(((c >> 6) & 63) | 128); - output += String.fromCharCode((c & 63) | 128); - } - } - return output; - }; - - var uTF8Decode = function(input) { - var string = ""; - var i = 0; - var c = c1 = c2 = 0; - while ( i < input.length ) { - c = input.charCodeAt(i); - if (c < 128) { - string += String.fromCharCode(c); - i++; - } else if ((c > 191) && (c < 224)) { - c2 = input.charCodeAt(i+1); - string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); - i += 2; - } else { - c2 = input.charCodeAt(i+1); - c3 = input.charCodeAt(i+2); - string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); - i += 3; - } - } - return string; - } - - $.extend({ - base64Encode: function(input) { - var output = ""; - var chr1, chr2, chr3, enc1, enc2, enc3, enc4; - var i = 0; - input = uTF8Encode(input); - while (i < input.length) { - chr1 = input.charCodeAt(i++); - chr2 = input.charCodeAt(i++); - chr3 = input.charCodeAt(i++); - enc1 = chr1 >> 2; - enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); - enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); - enc4 = chr3 & 63; - if (isNaN(chr2)) { - enc3 = enc4 = 64; - } else if (isNaN(chr3)) { - enc4 = 64; - } - output = output + keyString.charAt(enc1) + keyString.charAt(enc2) + keyString.charAt(enc3) + keyString.charAt(enc4); - } - return output; - }, - base64Decode: function(input) { - var output = ""; - var chr1, chr2, chr3; - var enc1, enc2, enc3, enc4; - var i = 0; - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); - while (i < input.length) { - enc1 = keyString.indexOf(input.charAt(i++)); - enc2 = keyString.indexOf(input.charAt(i++)); - enc3 = keyString.indexOf(input.charAt(i++)); - enc4 = keyString.indexOf(input.charAt(i++)); - chr1 = (enc1 << 2) | (enc2 >> 4); - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); - chr3 = ((enc3 & 3) << 6) | enc4; - output = output + String.fromCharCode(chr1); - if (enc3 != 64) { - output = output + String.fromCharCode(chr2); - } - if (enc4 != 64) { - output = output + String.fromCharCode(chr3); - } - } - output = uTF8Decode(output); - return output; - } - }); - })(jQuery); \ No newline at end of file diff --git a/mail/js/app.js b/mail/js/app.js index ff0faf9a70..f196c2fb5d 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -9,7 +9,6 @@ */ /*egw:uses - /api/js/jquery/jquery.base64.js; */ import {AppJS} from "../../api/js/jsapi/app_base.js"; @@ -19,7 +18,6 @@ import {et2_button} from "../../api/js/etemplate/et2_widget_button"; import {egw_getObjectManager} from '../../api/js/egw_action/egw_action.js'; import {egwIsMobile} from "../../api/js/egw_action/egw_action_common.js"; /* required dependency, commented out because no module, but egw:uses is no longer parsed -import "../../api/js/jquery/jquery.base64.js"; */ /** @@ -2186,7 +2184,7 @@ app.classes.mail = AppJS.extend( else { message = this.mail_splitRowId(_msg['msg'][0]); - if (message[3]) _foldernode = displayname = jQuery.base64Decode(message[3]); + if (message[3]) _foldernode = displayname = jQuery.atob(message[3]); } // Tell server @@ -4514,7 +4512,7 @@ app.classes.mail = AppJS.extend( { var mailbox = _senders[0].id.split('::'); var folder = mailbox[1] || 'INBOX', acc_id = mailbox[0]; - this.egw.open_link('mail.mail_acl.edit&mailbox='+ jQuery.base64Encode(folder)+'&acc_id='+acc_id, '_blank', '640x480'); + this.egw.open_link('mail.mail_acl.edit&mailbox='+ btoa(folder)+'&acc_id='+acc_id, '_blank', '640x480'); }, /** diff --git a/mail/js/preview.js b/mail/js/preview.js index 337b8827bb..2c9f0a68fd 100644 --- a/mail/js/preview.js +++ b/mail/js/preview.js @@ -9,7 +9,6 @@ */ /*egw:uses - /api/js/jquery/jquery.base64.js; */ jQuery(function() @@ -19,7 +18,7 @@ jQuery(function() // active mailto: links with mail compose if (this.href.substr(0, 7) == 'mailto:') { - top.egw.open(null, 'mail', 'add', {send_to: jQuery.base64Encode(this.href.substr(7).replace('%40', '@'))}); + top.egw.open(null, 'mail', 'add', {send_to: btoa(this.href.substr(7).replace('%40', '@'))}); return false; // cant do event.stopImediatePropagation() in on! }