From d0faeb3ec1fe73adcbf76c201a5abf236b960123 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 16 Feb 2017 11:18:42 +0100
Subject: [PATCH] fixed errors in graphs

---
 .../images/logo_vertical_water.png            | Bin 1280 -> 1866 bytes
 pandora_console/include/ajax/module.php       |   2 ++
 pandora_console/include/functions_graph.php   |   2 +-
 pandora_console/include/functions_html.php    |   1 +
 .../include/functions_reporting_html.php      |   1 +
 .../include/graphs/flot/pandora.flot.js       |   7 ++++---
 .../include/graphs/functions_flot.php         |   5 -----
 .../operation/agentes/stat_win.php            |  10 ++++++----
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pandora_console/images/logo_vertical_water.png b/pandora_console/images/logo_vertical_water.png
index 5f00e736d4fd69ce459772cad3bbc9eecc28f887..2238c38be72113c91e8a981eef89049fca5791cd 100644
GIT binary patch
delta 1850
zcmV-A2gUe+3d#;4iBL{Q4GJ0x0000DNk~Le0001o0000O2nGNE0jJR33Xvfve+KMH
zL_t(|+G1d!0$>CYO*{1(p!^LkyfX}dv;q(x0AdHI_zfV|0OAfHt^nc(K>WkX%4)^2
zW5*zRfre--Je|})u1f#{h=FR}dGYB+!;e3o85D#}8=%hn0K^wS-T^upCiVd8O$H>d
zJ^;!ufO)3@DO^Yf00G2^%t1D&f6o0<1KooJ<_HcJUItLmK<NiS$1H#b#}6RpKne~J
z+XBRa2AKkoegKbcNbGkY@nQNHph4LIl>Y&g2bog=G6Tb9KnE!dL?QtQph1I>qs9T2
z+31}<K!62_?NIA>k>TO{GYkwnlN&&efu#><e1mfT3sBa9#VJrM0Vykif3n#QAdY~F
ztpKGXP_}}qV}R*JN;@Bb{0Sfi6U-GLM>Ox!XIOMP8QrlQP=jEJl>zD~26*0uur~lH
z31~ilf#e_tsMrapUYH{mz{D_e4cJy_&KZd485B7NAb<!uY@}spMl6A#0ZnHN@<JvI
zaVB%Y;x9knWSDh4jA}^-e^eMFWt<O4;;;hy#6ScH3l_16IMcZd@`5Jd%nZUH;HT3J
z3$O%G4Ft=GNF@r0o&m%e(2~Ldnt30<ib+@r0@ag%rgs4@F|=9=RO%FfN-R*I!OTNa
z&j4*a7$CKUc0l<ONNPVo&A5T=c_wV31PY8*7YZ=Mkcv+X0QE=)e>6}SkV-NJ<iJ2n
zB`~oIpsE{9i~%MFqz`~FRGR><6a-Qa#UGG_L4n}`6q|vj9Ar)ex|<krlpUaC>wzvl
zpe5}n7#IK$fE_aiX&?xq=#;S$D?L(Om(rA42x=7@NoAc%uCcTfEX7K&(9%W_t0RrU
z>O_kO7AIK5LfACnf2t5GQ@V5fImUGZDFT9*A%U>jot^yK?7W%zYo2naOt)@frRxxT
zcO+$Fk3xvO`We-hxAM<Oxi?mj-VC^7No5G5#sjnmj2{0JF{}`ro14t*hucqd|9(nl
z_(J>Zw*`MlW<h$&Q2k1^5=b+^tyDbCgAv{#c%gyy(oh(qf2a_D{9Q%)8DqU(BLa2>
zCNV!!^VZbbd~XrnWeyf27oz=kM9=-}oJLuQgN-|%m>pD688+d7E_G!kP=tWArI=?B
zc!0nX@JmI_H3(kw#R+(VoR&hOz>4>+!?#$5Q<))FGZDa;M!AZ69khSa%0ksAMhj1g
zH;XYAxln`Je>IqJIwdd?0q{3+O=z;APG-xQ6FT6>VmCbx;TRpeNc{QmJbn1M2tU6D
zv|8OQ1mU{n{Bg(kL#`A>hKfqb6-1$S(NqA!=VBo!ro&&<%cq5#M#^Vw$5O1{)bpH&
zFoM5WiNgD8fqGM2pnP|%EY_%R?+w^YF3|swT02&Ve=e2P%Gl?a8|+(vcC8S$jUWg<
zC@6{gtj`)LpoY(Clm;3GMk+B(Sz(}|RTNklP!Q-Ay-FGtJxtjZRC?0tTJ%zgrIOx$
zW}ETm|NNo#of5^d*XO(4xw+k0r=K()#-R}!DUe^4118rfW7_1}9RWuG#qkgzG$WC*
z{&UkMfAI>G0FqU5@qY}C0E{<UcPkhU4_;?4p1tb+muB79A0M)I{WB}}o`=UDyCO#`
zrT~!ho?3n}@Nr$q%K0_&^=Xf7gT@}`=APAH^yZ}SaT{M3xIZ=|bZ81QQ}D3uWw7<O
zF6h~d%y~`gDKYP3YfP<%qewW^FKly3>$YO{e-&z)37*fl`J2b15sZ;5D5Sc5x_8SG
zQtsO-SHPiC0A9;wjtGNr(I*Z&MNySYgVhEXb}<JQ+S`%fQ4nk}{<S0kgi{oZ4!X$P
z+8O6d<$Ga+OLp3*I}VRqe6wK=uzBozjY4<cw~^j&G~Df<hpc;vJ<bOFazgS;O>@oR
ze{XMlOIyLAz<3#$;_%>Bs`>W&^S$1a4$+2GC?nwHk@*X%;0v;C;RFq;C#S?pCshq3
zcvoYn6AYkY+$5t8J_%`RTeBRpg$<RB8h~Y=w5BQcokx_?MITd|=W4L(3Hhq(0m%|}
z)1LLWBriP(99?4h1iIIk@9zQt-bdfie_bt`j1o&uOHkWJLW}3ltQ@lqYzV|s87T6(
z`vkUv0#}*!&Vt<v04j`*w(dLW#2Pu~cC?np%pcp!Vg#@&u#c|a4FLFz_QyJ--V8_C
zopw169C96q$PuoI{MU`^n4#NI0E^@ua@A-8Dt!hY9)EIg8654vmEy3tmFXhuf2qk~
z<L!MY6o^yc=p;58ETQZ0=N$KYNheI5W3L#G>w{0v0`H#yAPn?c^9Zc7VTKWU20&*3
zVM(X6!um3k+q7mcJ`xsdbD^NstC#%i4RcKJ%ZJeo^=igeD?>?PY}5f5Rm%ByN9Rxq
oDhIN2mvoLa(nuqXT^@e{&PtA85QC5`?*IS*07*qoM6N<$g1B!$mH+?%

delta 1259
zcmV<H1Qh$q4uA?FiBL{Q4GJ0x0000DNk~Le0000f0000f2nGNE0pDjZV38pwe*~gQ
zL_t(|+G1cJ1m3=V`yYg1d?uLS)H9B71t6LcL_BzY^*=A01YEbUurMP|qi_O%0K$qG
zku8In4R#I8B`_K+=&V={=7?~q;MR`SB7gwG76b-BydOkkbrrJF8*UadJpFuuAwa#K
zL7LY9#VQu4LWdh~cQEX|-^q||f3hE&Z4N*U2QW+qfz!_xGVrpCGiV5Vkmv~{01!ar
zBcM|nKp0;rya!SOX!0L`?i55$Jq|EMpg5az-WMEXATgj^0!DO!6v2Y(&9^%YZ@%9F
zhX6bUz!aHDCBW?jMLZ~sQ4%gL;HA=x>6vG*9{y)%=79&isZ=~lpu<fBe=0JBv0;jU
zz>szk0T4hmL5%pK9Z1#V(c1_Nlm?;<#gRl9w%w^^xc}h@oUbTg1B(`T^1*5-dXWMv
z20$QAZ#kG=c{P>c=ie`&m|{pV+>Et+LQcdW*MVFKPMaW&AOO+`OAp8Zlr~O1TY#LK
z4S@z<KuIG&fe#@1$m6MSe*-}puo;M!j$ryP;7ZCDY-F?H2Etqoauv)XP`HAE1!Osr
zD<2SwC{Xcro`e(>2z2EJqLLKUf_@-XfJJHo(4a!PCVqeb8p7EVDLg^NpFfm)5EzCN
zNH!3f`0r!OqDVjxmY$IT6OJVGo`7K>@E)i(0Iv&?vn4WsRi?-Qe<`af0$mDE=q%{A
zB6B|fdcm;hQY4(OFCM}G%2}|20}AdVJB$g<t0=C583w9~VA&2<;ejkeuJW;!LLeOu
z=w8$i@nCRPC`a)Itdv5^+ZTY|HbjpUuwfvDFvCDDLpKZ-ez4jW3Jh?@GRSrq2-lj8
zGm3fHC4eQ-Q3is^e+C9%Z8&^DQNS9nffI<$UZ7z4{PP98!3YEkaMm}V=E{w?JHcTG
zDqIf(3sw*t)Zzmf1S)86yxD=$z{6VCpvN>a09o?v^F?T^yE7m+tbyPF&_G9$t65wC
zy(P(nMS&oCoq+>9z}75f!eOf-C=x-HJQnE>(EO`7TKa<le?WkC%vdLZAPB=ef(Zqs
zP+H(KXr;ZCjmZ@}hqWC(fyTy|Xm|o51r^mP39Uy-C6D0#>&&_A&FtMCoS|UCl}F}g
zcK`pIIsE?3OatBsU;&(Ut6T+)gyy+-U1;Y?lKDKiGQCA)gmUSwumnlH$EXoB6yC$~
z_iG;=tFN96e{SG*tt2)5l|W-=s2VPz1>A#K0m*t8zoFSN^H(rII1n72ao?FsEySF5
zu52~oSYO}M9B8nkaO}>P@LmiwY9ue>nZ_~P`p?yyov7TZDr6x}3R;qd)f1}nvKUlO
zP72sGwmytFH~r^QchxNWj4nzZyiW4l8fcvwF5iM{e{nRtILGFx%(c_91W^SLWNd==
zU30s6Z>B`~+(E-h`q$2jLV{A8ss=t75B^7}VkXIvM!89zWcxDza<rHe9A|f}r}=fE
z%Aq#nOrtY6$I6E$u@Z#oY~*fhPE1v?rIBv$$Lh5pM{ck-23nn%Dn8Z`^Db>Ij#|yd
znp`K_LCU-7#*Z3ER;^xb3L^Ts)r7uc3~5`qZWPr7070dXJwn2bTGF&UIZ*LF#1B}|
VGFG|4-|qkb002ovPDHLkV1l>iCOiND

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 9e894c51b3..edf2101ed2 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -720,6 +720,8 @@ if ($list_modules) {
 	if (empty ($modules)) {
 		$modules = array ();
 	}
+
+	$table = new stdClass();
 	$table->width = "100%";
 	$table->cellpadding = 4;
 	$table->cellspacing = 4;
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 18ad490a06..41dbf2d362 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -4058,7 +4058,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
 		'file' => $config['homedir'] .  "/images/logo_vertical_water.png",
 		'url' => ui_get_full_url("/images/logo_vertical_water.png",
 		false, false, false));
-	
+	$type_graph = $config['type_module_charts'];
 	if ($type_graph === 'area') {
 		if ($compare === 'separated') {
 			return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index a2de63bc35..03fb765b0e 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -170,6 +170,7 @@ function html_print_side_layer ($params) {
 	
 	$out_html = '<div id="side_layer" class="menu_sidebar ' . $round_class . '" style="display:none; z-index:1; overflow: hidden; height: ' . $params['height'] . '; width: ' . $params['width'] . ';">';
 	
+	$table = new stdClass();
 	$table->id = 'side_layer_layout';
 	$table->width = $params['width'] . 'px';
 	$table->cellspacing = 2;
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 723065d57d..134f13c5b7 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -3710,6 +3710,7 @@ function reporting_get_event_histogram ($events, $text_header_event = false) {
 				);
 		}
 	}
+	$table = new stdClass();
 	if (!$text_header_event) {
 		$table->width = '100%';
 	}
diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index e1d61fbcf1..4c7a47e136 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -2251,9 +2251,10 @@ function set_watermark(graph_id, plot, watermark_src) {
 		if ($('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height') != undefined) {
 			down_ticks_height = $('#'+graph_id+' .yAxis .tickLabel').eq(0).css('height').split('px')[0];
 		}
-		var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
-		var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
-
+		//var left_pos = parseInt(context.canvas.width - 3) - $('#watermark_image_'+graph_id)[0].width;
+		//var top_pos = parseInt(context.canvas.height - down_ticks_height - 10) - $('#watermark_image_'+graph_id)[0].height;
+		var left_pos = 380;
+		var top_pos  = 6;
 		context.drawImage(this, left_pos, top_pos);
 
 	}, false);
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index 5faa5ee845..952ac1717b 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -208,8 +208,6 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 	$return .= "<p id='legend_$graph_id' class='legend_graph' style='font-size:".$font_size."pt'></p>";
 	
 	if (!empty($threshold_data)) {
-		html_debug($threshold_data, true);
-		html_debug($yellow_threshold, true);
 		$yellow_up = $threshold_data['yellow_up'];
 		$red_up = $threshold_data['red_up'];
 		$yellow_inverse = $threshold_data['yellow_inverse'];
@@ -228,9 +226,6 @@ function flot_area_graph($chart_data, $width, $height, $color, $legend,
 			$red_up = $module_data['max_critical'];
 			$yellow_inverse = !($module_data['warning_inverse'] == 0);
 			$red_inverse = !($module_data['critical_inverse'] == 0);
-			html_debug($yellow_up, true);
-			html_debug($yellow_threshold, true);
-			html_debug($yellow_inverse, true);
 		}
 	}
 	
diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php
index 6e6fe8c972..8782b2c05b 100644
--- a/pandora_console/operation/agentes/stat_win.php
+++ b/pandora_console/operation/agentes/stat_win.php
@@ -152,6 +152,7 @@ $id = get_parameter('id');
 		$width = get_parameter ("width", STATWIN_DEFAULT_CHART_WIDTH);
 		$height = get_parameter ("height", STATWIN_DEFAULT_CHART_HEIGHT);
 		$label = get_parameter ("label", "");
+		$label_graph = base64_decode(get_parameter ("label", ""));
 		$start_date = get_parameter ("start_date", date("Y/m/d"));
 		$start_time = get_parameter ("start_time", date("H:i:s"));
 		$draw_events = get_parameter ("draw_events", 0);
@@ -204,7 +205,7 @@ $id = get_parameter('id');
 		switch ($graph_type) {
 			case 'boolean':
 				echo grafico_modulo_boolean ($id, $period, $draw_events,
-					$width, $height, $label, $unit, $draw_alerts,
+					$width, $height, $label_graph, $unit, $draw_alerts,
 					$avg_only, false, $date, false, $urlImage,
 					'adapter_' . $graph_type, $time_compare,
 					$unknown_graph);
@@ -216,7 +217,7 @@ $id = get_parameter('id');
 				break;
 			case 'sparse':
 				echo grafico_modulo_sparse ($id, $period, $draw_events,
-					$width, $height, $label, $unit, $draw_alerts,
+					$width, $height, $label_graph, $unit, $draw_alerts,
 					$avg_only, false, $date, $unit, $baseline, 0, true,
 					false, $urlImage, 1, false,
 					'adapter_' . $graph_type, $time_compare,
@@ -230,7 +231,7 @@ $id = get_parameter('id');
 				break;
 			case 'string':
 				echo grafico_modulo_string ($id, $period, $draw_events,
-					$width, $height, $label, null, $draw_alerts, 1,
+					$width, $height, $label_graph, null, $draw_alerts, 1,
 					false, $date, false, $urlImage,
 					'adapter_' . $graph_type);
 				echo '<br>';
@@ -241,7 +242,7 @@ $id = get_parameter('id');
 				break;
 			case 'log4x':
 				echo grafico_modulo_log4x ($id, $period, $draw_events,
-					$width, $height, $label, $unit, $draw_alerts, 1,
+					$width, $height, $label_graph, $unit, $draw_alerts, 1,
 					$pure, $date);
 				echo '<br>';
 				if ($show_events_graph)
@@ -398,6 +399,7 @@ $id = get_parameter('id');
 		
 		unset($table);
 		
+		$table = new stdClass();
 		$table->id = 'stat_win_form';
 		$table->width = '100%';
 		$table->cellspacing = 2;