2010-01-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* godmode/reporting/visual_console_builder.editor.js: Label parameter is now coded 
	in base 64 format when pgraph.php page is requested. 
	
	* godmode/reporting/visual_console_builder.editor.php: Added a javascript include.

	* include/javascript/encode_decode_base64.js: Added new javascript function for base 64 encoding/decoding.  

	Fixes bug #3152661, #3147119



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3740 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,14 @@
+2010-01-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* godmode/reporting/visual_console_builder.editor.js: Label parameter is now coded 
+	in base 64 format when pgraph.php page is requested. 
+	
+	* godmode/reporting/visual_console_builder.editor.php: Added a javascript include.
+
+	* include/javascript/encode_decode_base64.js: Added new javascript function for base 64 encoding/decoding.  
+
+	Fixes bug #3152661, #3147119
+
 2011-01-13  Junichi Satoh  <junichi@rworks.jp>
 
 	* include/help/ja/help_create_agent.php,

pandora_console/godmode/reporting/visual_console_builder.editor.js

@@ -474,8 +474,8 @@ function getModuleGraph(id_data) {
 			period = data['period'];
 		}
 	});
-	
+	// Base64.encode function is in /include/javascript/encode_decode_base64.js 
-	var img = 'include/fgraph.php?tipo=sparse&id=' + id_agente_modulo + '&label=' + label + '&height=' + height + '&pure=1&width=' + width + '&period=' + period;
+	var img = 'include/fgraph.php?tipo=sparse&id=' + id_agente_modulo + '&label=' + Base64.encode(label) + '&height=' + height + '&pure=1&width=' + width + '&period=' + period;
 	
 	return img;
 }

pandora_console/godmode/reporting/visual_console_builder.editor.php

@@ -265,6 +265,8 @@ require_javascript_file('wz_jsgraphics');
 require_javascript_file('pandora_visual_console');
 require_jquery_file ('autocomplete');
 require_javascript_file('visual_console_builder.editor', 'godmode/reporting/');
+// Javascript file for base 64 encoding of label parameter 
+require_javascript_file ('encode_decode_base64');
 ?>
 <style type="text/css">
 .ui-resizable-handle {

pandora_console/include/javascript/encode_decode_base64.js

@@ -0,0 +1,147 @@
+/** 
+ * Javascript functions for encoding /decoding in base 64 codification
+ */
+
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/
+
+var Base64 = {
+
+	// private property
+	_keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+	// public method for encoding
+	encode : function (input) {
+		var output = "";
+		var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+		var i = 0;
+
+		input = Base64._utf8_encode(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 +
+			this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+			this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+		}
+
+		return output;
+	},
+
+	// public method for decoding
+	decode : 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 = this._keyStr.indexOf(input.charAt(i++));
+			enc2 = this._keyStr.indexOf(input.charAt(i++));
+			enc3 = this._keyStr.indexOf(input.charAt(i++));
+			enc4 = this._keyStr.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 = Base64._utf8_decode(output);
+
+		return output;
+
+	},
+
+	// private method for UTF-8 encoding
+	_utf8_encode : function (string) {
+		string = string.replace(/\r\n/g,"\n");
+		var utftext = "";
+
+		for (var n = 0; n < string.length; n++) {
+
+			var c = string.charCodeAt(n);
+
+			if (c < 128) {
+				utftext += String.fromCharCode(c);
+			}
+			else if((c > 127) && (c < 2048)) {
+				utftext += String.fromCharCode((c >> 6) | 192);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+			else {
+				utftext += String.fromCharCode((c >> 12) | 224);
+				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+				utftext += String.fromCharCode((c & 63) | 128);
+			}
+
+		}
+
+		return utftext;
+	},
+
+	// private method for UTF-8 decoding
+	_utf8_decode : function (utftext) {
+		var string = "";
+		var i = 0;
+		var c = c1 = c2 = 0;
+
+		while ( i < utftext.length ) {
+
+			c = utftext.charCodeAt(i);
+
+			if (c < 128) {
+				string += String.fromCharCode(c);
+				i++;
+			}
+			else if((c > 191) && (c < 224)) {
+				c2 = utftext.charCodeAt(i+1);
+				string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+				i += 2;
+			}
+			else {
+				c2 = utftext.charCodeAt(i+1);
+				c3 = utftext.charCodeAt(i+2);
+				string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+				i += 3;
+			}
+
+		}
+
+		return string;
+	}
+
+}
+