tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2984-problemas-tras-actualizacion-php7' into 'develop' 

fixed errors php7

See merge request artica/pandorafms!1909
This commit is contained in:
vgilc 2018-10-30 09:36:18 +01:00
parent 5a057490ad 8e206eeeef
commit 020f9579a2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/graphs/functions_flot.php
View File

@ -690,7 +690,8 @@ function flot_slicesbar_graph (
$round_corner, $homeurl, $watermark = '', $round_corner, $homeurl, $watermark = '',
$adapt_key = '', $stat_win = false, $adapt_key = '', $stat_win = false,
$id_agent = 0, $full_legend_date = array(), $id_agent = 0, $full_legend_date = array(),
$not_interactive = 0, $ttl = 1) { $not_interactive = 0, $ttl = 1,
$widgets = false) {
global $config; global $config;
@ -725,7 +726,12 @@ function flot_slicesbar_graph (
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."%; height: ".$height."px; display: inline-block;'></div>"; $return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."%; height: ".$height."px; display: inline-block;'></div>";
} }
else { else {
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."%; height: ".$height."px;'></div>"; if($widgets){
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."px; height: ".$height."px;'></div>";
}
else{
$return = "<div id='$graph_id' class='noresizevc graph $adapt_key' style='width: ".$width."%; height: ".$height."px;'></div>";
}
} }
$return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>"; $return .= "<div id='value_$graph_id' style='display:none; position:absolute; background:#fff; border: solid 1px #aaa; padding: 2px'></div>";