X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=18bd78633ab39ea4dee8f4402823bad207f91c11;hp=c1eed086555576cc5e904ccf885690fcd6e74212;hb=253ead9f08505693b3a6d0cd1d83724e20be9586;hpb=c5db3bd5b84bf9682b099901a4a75e55c7952f1b

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index c1eed08..18bd786 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -15,9 +15,9 @@ class rrdstat {
 
   var $status = 'unused';
 
-  function rrdstat($init_info = null) {
+  function rrdstat($rrdconfig, $conf_id = null) {
     // ***** init RRD stat module *****
-    $this->set_def($init_info);
+    $this->set_def($rrdconfig, $conf_id);
 
     if (!is_null($this->rrd_file)) {
       if (!is_writeable($this->rrd_file)) {
@@ -36,14 +36,26 @@ class rrdstat {
     }
   }
 
-  function set_def($init_info = null) {
-    if (is_array($init_info) && isset($init_info['file'])) {
+  function set_def($rrdconfig, $conf_id = null) {
+    if (is_array($rrdconfig)) {
       // we have an array in the format we like to have
-      $iinfo =& $init_info;
+      $complete_conf =& $rrdconfig;
     }
     else {
       // we have something else (XML data?), try to generate the iinfo aray from it
-      $iinfo =& $init_info;
+      $complete_conf =& $rrdconfig;
+    }
+
+    if (!is_null($conf_id)) {
+      $iinfo = isset($complete_conf[$conf_id])?$complete_conf[$conf_id]:array();
+      if (isset($complete_conf['*'])) {
+        $iinfo = (array)$iinfo + (array)$complete_conf['*'];
+        if (isset($complete_conf['*']['graph'])) { $iinfo['graph'] = (array)$iinfo['graph'] + (array)$complete_conf['*']['graph']; }
+        if (isset($complete_conf['*']['page'])) { $iinfo['page'] = (array)$iinfo['page'] + (array)$complete_conf['*']['page']; }
+      }
+    }
+    else {
+      $iinfo = $complete_conf;
     }
 
     if (!isset($iinfo['file'])) { return false; }
@@ -226,15 +238,11 @@ class rrdstat {
     if (!in_array($this->status, array('ok','readonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
 
     // assemble configuration
-    $gconf = $this->config_graph;
+    $gconf = (array)$extra;
     if (!is_null($sub) && is_array($this->config_raw['graph.'.$sub])) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $this->config_raw['graph.'.$sub]); }
-      else { $gconf = $this->config_raw['graph.'.$sub]; }
-    }
-    if (is_array($extra)) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $extra); }
-      else { $gconf = $extra; }
+      $gconf = $gconf + $this->config_raw['graph.'.$sub];
     }
+    $gconf = $gconf + (array)$this->config_graph;
 
     if (isset($gconf['format']) && ($gconf['format'] == 'SVG')) {
       $format = $gconf['format']; $fmt_ext = '.svg';
@@ -255,6 +263,8 @@ class rrdstat {
     $fname = str_replace('%t', $timeframe, $fname);
     $fname = str_replace('%f', $fmt_ext, $fname);
     if (substr($fname, -strlen($fmt_ext)) != $fmt_ext) { $fname .= $fmt_ext; }
+    if (isset($gconf['path'])) { $fname = $gconf['path'].'/'.$fname; }
+    $fname = str_replace('//', '/', $fname);
 
     $graphrows = array(); $gC = 0;
     $gDefs = ''; $gGraphs = ''; $addSpecial = '';
@@ -327,7 +337,7 @@ class rrdstat {
       }
     }
     else {
-      foreach ($this->rrd_fields as $ds) {
+      foreach ($this->rrd_fields as $key=>$ds) {
         $grow = array();
         $grow['dType'] = 'DEF';
         $grow['name'] = $ds['name'].(isset($gconf['scale'])?'_tmp':'');
@@ -340,7 +350,7 @@ class rrdstat {
           $grow['name'] = $ds['name'];
           $grow['rpn_expr'] = $ds['name'].'_tmp,'.$gconf['scale'].',*';
         }
-        $grow['gType'] = ($ds['name']=='ds0')?'AREA':'LINE1';
+        $grow['gType'] = ((count($this->rrd_fields)==2) && ($key==0))?'AREA':'LINE1';
         $grow['color'] = $gColors[$gC++]; if ($gC >= count($gColors)) { $gC = 0; }
         $graphrows[] = $grow;
       }
@@ -437,6 +447,7 @@ class rrdstat {
       trigger_error('rrd graph error: '.$return, E_USER_WARNING);
       $return = $graph_cmd."\n\n".$return;
     }
+    $return = 'file:'.$fname."\n".$return;
   return $return;
   }
 
@@ -445,15 +456,11 @@ class rrdstat {
     $basename = str_replace('.rrd', '', $this->rrd_file);
 
     // assemble configuration
-    $pconf = $this->config_page;
+    $pconf = (array)$page_extras;
     if (!is_null($sub) && is_array($this->config_raw['page.'.$sub])) {
-      if (is_array($pconf)) { $gconf = array_merge($pconf, $this->config_raw['page.'.$sub]); }
-      else { $pconf = $this->config_raw['page.'.$sub]; }
-    }
-    if (is_array($page_extras)) {
-      if (is_array($pconf)) { $pconf = array_merge($pconf, $page_extras); }
-      else { $pconf = $page_extras; }
+      $pconf = $pconf + $this->config_raw['page.'.$sub];
     }
+    $pconf = $pconf + (array)$this->config_page;
 
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$basename.' - RRD statistics';
     $gtitle = array();
@@ -491,9 +498,13 @@ class rrdstat {
         if (strpos($ret, "\n\n") !== false) { $graph_cmd = substr($ret, 0, strpos($ret, "\n\n")); $ret = substr($ret, strpos($ret, "\n\n")+2); }
         else { $graph_cmd = null; }
         $grout = explode("\n",$ret);
+        $gfilename = null;
         $gmeta = array();
         foreach ($grout as $gline) {
-          if (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) {
+          if (preg_match('/^file:(.+)$/', $gline, $regs)) {
+            $gfilename = $regs[1];
+          }
+          elseif (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) {
             $gmeta['width'] = $regs[1]; $gmeta['height'] = $regs[2];
           }
           elseif (preg_match('/^([^\|]+)\|([^|]+)\|([^\|]*)$/', $gline, $regs)) {
@@ -506,10 +517,20 @@ class rrdstat {
             $gmeta['info'][] = $gline;
           }
         }
+        if (is_null($gfilename)) { $gfilename = $basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png'; }
+        if (isset($pconf['graph_url'])) {
+          $gURL = $pconf['graph_url'];
+          $fname = str_replace('%f', basename($gfilename), $gURL);
+          $fname = str_replace('%p', $gfilename, $gURL);
+          if (substr($gURL, -1) == '/') { $gURL .= $gfilename; }
+        }
+        else {
+          $gURL = $gfilename;
+        }
         $out .= '<div class="'.$tframe.'">';
 //         $out .= '<p>'.nl2br($ret).'</p>';
         $out .= '<h2>'.$gtitle[$tframe].'</h2>';
-        $out .= '<img src="'.$basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png"';
+        $out .= '<img src="'.$gURL.'"';
         $out .= ' alt="'.$basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
         $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">';
         if (isset($gmeta['data']) && count($gmeta['data'])) {