Imported Upstream version 0.6.26

2017-10-20 17:10:51 +02:00
parent bebe87317f
commit a6b4158f1f
158 changed files with 13552 additions and 2851 deletions
--- a/share/pnp/application/models/rrdtool.php
+++ b/share/pnp/application/models/rrdtool.php
@@ -106,8 +106,11 @@ class Rrdtool_Model extends System_Model
        if ($height > 0){
            $command .= " --height=$height";
        }
-        if ($height < 81 ){
-            $command .= " --only-graph ";
+        if ($height < 81 || (isset($conf['graph_only']) && $conf['graph_only'])){
+            $command .= " --only-graph";
+        }
+        elseif (isset($conf['no_legend']) && $conf['no_legend']){
+            $command .= " --no-legend";
        }

        $command .= $RRD_CMD;