mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Specify graph format from GET param (#10118)

Browse Source 
Allows to specify a graph format (svg or png) for the GET parameter
"graph_type"
This commit is contained in:
Anthony Ruhier
2019-05-01 10:52:07 +02:00
committed by Neil Lathwood
parent 9d5e780c59
commit 6e76f1d8e7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/html/graphs/graph.inc.php
View File

@@ -1,5 +1,7 @@
<?php
use LibreNMS\Config;
// Push $_GET into $vars to be compatible with web interface naming
foreach ($_GET as $name => $value) {
$vars[$name] = $value;
@@ -24,6 +26,7 @@ $legend = $vars['legend'];
$output = (!empty($vars['output']) ? $vars['output'] : 'default');
$from = (isset($vars['from']) ? $vars['from'] : time() - 60 * 60 * 24);
$to = (isset($vars['to']) ? $vars['to'] : time());
$graph_type = (isset($vars['graph_type']) ? $vars['graph_type'] : Config::get('webui.graph_type'));
if ($from < 0) {
$from = ($to + $from);
@@ -97,7 +100,7 @@ if ($error_msg) {
}
} else {
// $rrd_options .= " HRULE:0#999999";
if ($config['webui']['graph_type'] === 'svg') {
if ($graph_type === 'svg') {
$rrd_options .= " --imgformat=SVG";
if ($width < 350) {
$rrd_options .= " -m 0.75 -R light";
@@ -130,7 +133,7 @@ if ($error_msg) {
if (is_file($graphfile)) {
if (!$debug) {
set_image_type();
if ($config['trim_tobias'] && $config['webui']['graph_type'] !== 'svg') {
if ($config['trim_tobias'] && $graph_type !== 'svg') {
list($w, $h, $type, $attr) = getimagesize($graphfile);
$src_im = imagecreatefrompng($graphfile);
$src_x = '0';
@@ -157,7 +160,7 @@ if ($error_msg) {
$imagedata = ob_get_contents();
imagedestroy($png);
ob_end_clean();
$base64_output = base64_encode($imagedata);
} else {
imagepng($dst_im);