X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=2eece6d227f1f7a09b2cbdf5d1b0a586fded0d9d;hp=0709315d178716bb789ec7a55fd33864fc7ca3aa;hb=b177694469faa37e07b9c0f826f3e0bd472d2960;hpb=2a386f5a68929d82a68f97c83eb0cc1ea6d9b236

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 0709315..2eece6d 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -3,6 +3,7 @@
 class rrdstat {
 
   var $rrd_file = null;
+  var $basename = null;
 
   var $config_raw = null;
   var $config_graph = null;
@@ -15,14 +16,14 @@ 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 (($this->status == 'unused') && !is_null($this->rrd_file)) {
       if (!is_writeable($this->rrd_file)) {
         if (!file_exists($this->rrd_file)) {
-          if (touch($this->rrd_file)) { $this->create(); }
+          if (@touch($this->rrd_file)) { $this->create(); }
           else { trigger_error('RRD file can not be created', E_USER_WARNING); }
         }
         else {
@@ -36,19 +37,38 @@ 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 (!isset($iinfo['file'])) { return false; }
+    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;
+    }
 
-    $this->rrd_file = $iinfo['file'];
+    if (isset($iinfo['graph-only']) && $iinfo['graph-only'] && !is_null($conf_id)) {
+      $this->basename = $conf_id;
+      $this->status = 'graphonly';
+    }
+    else {
+      if (!isset($iinfo['file'])) { return false; }
+
+      $this->rrd_file = $iinfo['file'];
+      $this->basename = (substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file;
+    }
 
     // fields (data sources, DS)
     //  name - DS name
@@ -124,9 +144,10 @@ class rrdstat {
         }
       }
     }
-    $output = array(); $return_var = null;
-    exec($create_cmd, $output, $return_var);
-    if ($return_var) { trigger_error('rrd create returned with value '.$return_var, E_USER_WARNING); }
+    $return = `$create_cmd 2>&1`;
+    if (strpos($return, 'ERROR') !== false) {
+      trigger_error($this->rrd_file.' - rrd create error: '.$return, E_USER_WARNING);
+    }
     else { $this->status = 'ok'; }
   }
 
@@ -134,16 +155,64 @@ class rrdstat {
     // feed new data into RRD
     if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return 1; }
     $upvals = array();
-    foreach($this->rrd_fields as $ds) {
-      if (is_array($upArray) && isset($upArray[$ds['name']])) { $val = $upArray[$ds['name']]; }
-      elseif (isset($ds['update'])) { $val = eval($ds['update']); }
-      else { $val = null; }
-      $upvals[] = $val;
-    }
-    $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
-    $output = array(); $return_var = null;
-    exec($update_cmd, $output, $return_var);
-    if ($return_var) { trigger_error('rrd update returned with value '.$return_var, E_USER_WARNING); }
+    if (isset($this->config_raw['update'])) {
+      $evalcode = $this->config_raw['update'];
+      if (!is_null($evalcode)) {
+        ob_start();
+        eval($evalcode);
+        $ret = ob_get_contents();
+        if (strlen($ret)) { $upvals = explode("\n", $ret); }
+        ob_end_clean();
+      }
+      $walkfunc = create_function('&$val,$key', '$val = is_numeric($val)?$val:"U";');
+      array_walk($upvals, $walkfunc);
+    }
+    else {
+      foreach ($this->rrd_fields as $ds) {
+        if (is_array($upArray) && isset($upArray[$ds['name']])) { $val = $upArray[$ds['name']]; }
+        elseif (isset($ds['update'])) {
+          $val = null; $evalcode = null;
+          if (substr($ds['update'], 0, 4) == 'val:') {
+            $evalcode = 'print(trim('.substr($ds['update'], 4).'));';
+          }
+          elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
+            $snmphost = 'localhost'; $snmpcomm = 'public';
+            list($nix, $ifname, $valtype) = explode(':', $ds['update'], 3);
+            $iflist = explode("\n", `snmpwalk -v2c -c $snmpcomm $snmphost interfaces.ifTable.ifEntry.ifDescr`);
+            $ifnr = null;
+            foreach ($iflist as $ifdesc) {
+              if (preg_match('/ifDescr\.(\d+) = STRING: '.$ifname.'/', $ifdesc, $regs)) { $ifnr = $regs[1]; }
+            }
+            $oid = null;
+            if ($valtype == 'in') { $oid = '1.3.6.1.2.1.2.2.1.10.'.$ifnr; }
+            elseif ($valtype == 'out') { $oid = '1.3.6.1.2.1.2.2.1.16.'.$ifnr; }
+            if (!is_null($ifnr) && !is_null($oid)) {
+              $evalcode = 'print(trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)));';
+            }
+          }
+          else { $evalcode = $ds['update']; }
+          if (!is_null($evalcode)) {
+            ob_start();
+            eval($evalcode);
+            $val = ob_get_contents();
+            ob_end_clean();
+          }
+        }
+        else { $val = null; }
+        $upvals[] = is_null($val)?'U':$val;
+      }
+    }
+    $return = null;
+    if (count($upvals)) {
+      $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
+      $return = `$update_cmd 2>&1`;
+    }
+
+    if (strpos($return, 'ERROR') !== false) {
+      trigger_error($this->rrd_file.' - rrd update error: '.$return, E_USER_WARNING);
+      $success = false;
+    }
+    else { $success = true; }
   return ($return_var == 0);
   }
 
@@ -164,7 +233,7 @@ class rrdstat {
     $return = `$fetch_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
-      trigger_error('rrd fetch error: '.$return, E_USER_WARNING);
+      trigger_error($this->rrd_file.' - rrd fetch error: '.$return, E_USER_WARNING);
       $fresult = false;
     }
     else {
@@ -189,25 +258,21 @@ class rrdstat {
   return $fresult;
   }
 
-  function graph($timeframe = 'day', $special = null, $extra = null) {
+  function graph($timeframe = 'day', $sub = null, $extra = null) {
     // create a RRD graph
     static $gColors;
     if (!isset($gColors)) {
       $gColors = array('#00CC00','#0000FF','#000000','#FF0000','#00FF00','#FFFF00','#FF00FF','#00FFFF','#808080','#800000','#008000','#000080','#808000','#800080','#008080','#C0C0C0');
     }
 
-    if (!in_array($this->status, array('ok','readonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
+    if (!in_array($this->status, array('ok','readonly','graphonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
 
     // assemble configuration
-    $gconf = $this->config_graph;
-    if (!is_null($special) && is_array($this->config_raw['graph'][$special])) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $this->config_raw['graph'][$special]); }
-      else { $gconf = $this->config_raw['graph'][$special]; }
-    }
-    if (is_array($extra)) {
-      if (is_array($gconf)) { $gconf = array_merge($gconf, $extra); }
-      else { $gconf = $extra; }
+    $gconf = (array)$extra;
+    if (!is_null($sub) && is_array($this->config_raw['graph.'.$sub])) {
+      $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';
@@ -223,10 +288,13 @@ class rrdstat {
     }
 
     if (isset($gconf['filename'])) { $fname = $gconf['filename']; }
-    else { $fname = str_replace('.rrd', '-%t%f', $this->rrd_file); }
+    else { $fname = $this->basename.(is_null($sub)?'':'-%s').'-%t%f'; }
+    $fname = str_replace('%s', strval($sub), $fname);
     $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 = '';
@@ -257,8 +325,8 @@ class rrdstat {
       $duration = isset($gconf['duration'])?$gconf['duration']:396*86400; // 365+31 days
       $slice = isset($gconf['slice'])?$gconf['slice']:86400; // 1 day
       // vertical lines at month borders
-      $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01')).'#FF0000';
-      $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01').' -1 year').'#FF0000';
+      $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01 12:00:00')).'#FF0000';
+      $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01 12:00:00').' -1 year').'#FF0000';
     }
     else {
       $duration = isset($gconf['duration'])?$gconf['duration']:$this->rrd_step*500; // 500 steps
@@ -272,9 +340,14 @@ class rrdstat {
           $grow = array();
           $grow['dType'] = isset($erow['dType'])?$erow['dType']:'DEF';
           $grow['name'] = $erow['name'].(isset($erow['scale'])?'_tmp':'');
-          $grow['dsname'] = isset($erow['dsname'])?$erow['dsname']:$erow['name'];
-          $grow['cf'] = isset($erow['cf'])?$erow['cf']:'AVERAGE';
-          if (isset($erow['rpn_expr'])) { $grow['rpn_expr'] = $erow['rpn_expr']; }
+          if ($grow['dType'] == 'DEF') {
+            $grow['dsname'] = isset($erow['dsname'])?$erow['dsname']:$erow['name'];
+            if (isset($erow['dsfile'])) { $grow['dsfile'] = $erow['dsfile']; }
+            $grow['cf'] = isset($erow['cf'])?$erow['cf']:'AVERAGE';
+          }
+          else {
+            $grow['rpn_expr'] = isset($erow['rpn_expr'])?$erow['rpn_expr']:'0';
+          }
           if (isset($erow['scale'])) {
             $graphrows[] = $grow;
             $grow = array();
@@ -290,12 +363,13 @@ class rrdstat {
             if (!isset($gconf['show_legend'])) { $gconf['show_legend'] = true; }
           }
           if (isset($erow['stack'])) { $grow['stack'] = ($erow['stack'] == true); }
+          if (isset($erow['desc'])) { $grow['desc'] = $erow['desc']; }
           $graphrows[] = $grow;
         }
       }
     }
     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':'');
@@ -308,12 +382,48 @@ 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;
       }
     }
 
+    if (isset($gconf['special']) && count($gconf['special'])) {
+      foreach ($gconf['special'] as $crow) {
+        $srow = array();
+        $srow['sType'] = isset($crow['sType'])?$crow['sType']:'COMMENT';
+        if ($grow['sType'] != 'COMMENT') {
+          // XXX: use line below and remove cf var once we have rrdtol 1.2
+          // $srow['name'] = $crow['name'].(isset($crow['cf'])?'_'.$crow['cf']:'');
+          $srow['name'] = $crow['name'];
+          $srow['cf'] = isset($crow['cf'])?$crow['cf']:'AVERAGE';
+          if (isset($crow['cf'])) {
+            // XXX: use line below once we have rrdtol 1.2
+            // $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'].'_'.$crow['cf'], 'rpn_expr'=>$srow['name'].','.$crow['cf']);
+          }
+          elseif (isset($crow['rpn_expr'])) {
+            // XXX: does only work with rrdtool 1.2
+            $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'], 'rpn_expr'=>$crow['rpn_expr']);
+          }
+        }
+        $srow['text'] = isset($crow['text'])?$crow['text']:'';
+        $specialrows[] = $srow;
+      }
+    }
+    else {
+      foreach ($graphrows as $grow) {
+        if (isset($grow['gType']) && strlen($grow['gType'])) {
+          $textprefix = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
+          // XXX: use lines below once we have rrdtol 1.2
+          // $graphrows[] = array('dType'=>'VDEF', 'name'=>$grow['name'].'_last', 'rpn_expr'=>$grow['name'].',LAST');
+          // $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'].'_last', 'text'=>'%3.2lf%s');
+          $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'MAX', 'text'=>$textprefix.'|Maximum|%.2lf%s');
+          $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'AVERAGE', 'text'=>$textprefix.'|Average|%.2lf%s');
+          $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'LAST', 'text'=>$textprefix.'|Current|%.2lf%s');
+        }
+      }
+    }
+
     $endtime = isset($gconf['time_end'])?$gconf['time_end']:(is_numeric($this->last_update())?$this->last_update():time());
     $gOpts = ' --start '.($endtime-$duration).' --end '.$endtime.' --step '.$slice;
     if (isset($gconf['label_top'])) { $gOpts .= ' --title '.$this->text_quote($gconf['label_top']); }
@@ -342,55 +452,156 @@ class rrdstat {
     foreach ($graphrows as $grow) {
       if (isset($grow['dType']) && strlen($grow['dType'])) {
         $gDefs .= ' '.$grow['dType'].':'.$grow['name'].'=';
-        $gDefs .= ($grow['dType']=='DEF')?$this->rrd_file.':'.$grow['dsname'].':'.$grow['cf']:$grow['rpn_expr'];
+        if ($grow['dType'] == 'DEF') {
+          $gDefs .= isset($grow['dsfile'])?$grow['dsfile']:$this->rrd_file;
+          $gDefs .= ':'.$grow['dsname'].':'.$grow['cf'];
+        }
+        else { $gDefs .= $grow['rpn_expr']; }
       }
       if (isset($grow['gType']) && strlen($grow['gType'])) {
-        // XXX: current rrdtools version doesn't support STACK flag, only STACK type
+        // XXX: change from STACK type to STACK flag once we have rrdtool 1.2
         if (isset($grow['stack']) && $grow['stack']) { $grow['gType'] = 'STACK'; }
         $gGraphs .= ' '.$grow['gType'].':'.$grow['name'].$grow['color'];
         if (isset($grow['legend'])) { $gGraphs .= ':'.$this->text_quote($grow['legend']); }
-        // XXX: when STACK flag is supported, remove above STACK if-command and uncomment the one below
+        // XXX: remove above STACK if-command and uncomment the one below once we have rrdtool 1.2
         //if (isset($grow['stack']) && $grow['stack']) { $gGraphs .= ':STACK'; }
       }
     }
 
+    foreach ($specialrows as $srow) {
+      $addSpecial .= ' '.$srow['sType'];
+      // XXX: eliminate cf once we have rrdtool 1.2
+      // $addSpecial .= ($grow['sType']!='COMMENT')?':'.$grow['name']:'');
+      $addSpecial .= (($srow['sType']!='COMMENT')?':'.$srow['name'].':'.$srow['cf']:'');
+      $addSpecial .= ':'.$this->text_quote($srow['text']);
+    }
+
     $graph_cmd = 'rrdtool graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
     $return = `$graph_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
-      trigger_error('rrd graph error: '.$return, E_USER_WARNING);
+      trigger_error($this->rrd_file.' - rrd graph error: '.$return, E_USER_WARNING);
       $return = $graph_cmd."\n\n".$return;
     }
+    $return = 'file:'.$fname."\n".$return;
   return $return;
   }
 
-  function simple_html($page_extras = null, $graph_extras = null) {
+  function simple_html($sub = null, $page_extras = null, $graph_extras = null) {
     // create a simple (MRTG-like) HTML page and return it in a string
-    $basename = str_replace('.rrd', '', $this->rrd_file);
 
     // assemble configuration
-    $pconf = $this->config_page;
-    if (is_array($page_extras)) {
-      if (is_array($pconf)) { $pconf = array_merge($pconf, $page_extras); }
-      else { $pconf = $page_extras; }
+    $pconf = (array)$page_extras;
+    if (!is_null($sub) && is_array($this->config_raw['page.'.$sub])) {
+      $pconf = $pconf + $this->config_raw['page.'.$sub];
+    }
+    $pconf = $pconf + (array)$this->config_page;
+
+    $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$this->basename.' - RRD statistics';
+    $gtitle = array();
+    $gtitle['day'] = isset($pconf['title_day'])?$pconf['title_day']:'Day overview (scaling 5 minutes)';
+    $gtitle['week'] = isset($pconf['title_week'])?$pconf['title_week']:'Week overview (scaling 30 minutes)';
+    $gtitle['month'] = isset($pconf['title_month'])?$pconf['title_month']:'Month overview (scaling 2 hours)';
+    $gtitle['year'] = isset($pconf['title_year'])?$pconf['title_year']:'Year overview (scaling 1 day)';
+
+    $out = '<html><head>';
+    $out .= '<title>'.$ptitle.'</title>';
+    $out .= '<style>';
+    if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
+    else {
+      $out .= 'h1 { font-weight: bold; font-size: 1.5em; }';
+      $out .= 'h2 { font-weight: bold; font-size: 1em; }';
+      $out .= '.gdata, .gvar, .ginfo { font-size: 0.75em; margin: 0.5em 0; }';
+      $out .= 'table.gdata { border: 1px solid gray; border-collapse: collapse; }';
+      $out .= 'table.gdata td, table.gdata th { border: 1px solid gray; padding: 0.1em 0.2em; }';
+      $out .= '.footer { font-size: 0.75em; margin: 0.5em 0; }';
     }
+    if (isset($pconf['style'])) { $out .= $pconf['style']; }
+    $out .= '</style>';
+    $out .= '</head>';
+    $out .= '<body>';
 
-    $out = '<html><head><title>'.$basename.' - RRD statistics</title></head><body>';
-
-    $out .= '<p>Last Update: '.date('Y-m-d H:i:s', $this->last_update()).'</p>';
+    $out .= '<h1>'.$ptitle.'</h1>';
+    if (!isset($pconf['show_update']) || $pconf['show_update']) {
+      $out .= '<p class="last_up">Last Update: '.(is_null($this->last_update())?'unknown':date('Y-m-d H:i:s', $this->last_update())).'</p>';
+    }
 
-    if (in_array($this->status, array('ok','readonly'))) {
+    if (in_array($this->status, array('ok','readonly','graphonly'))) {
+      $g_sub = isset($pconf['graph_sub'])?$pconf['graph_sub']:null;
       foreach (array('day','week','month','year') as $tframe) {
-        $ret = $this->graph($tframe, null, $graph_extras);
-        $out .= '<p>'.nl2br($ret).'</p>';
-        $out .= '<p><img src="'.$basename.'-'.$tframe.'.png"></p>';
+        $ret = $this->graph($tframe, $g_sub, $graph_extras);
+        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('/^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)) {
+            $gmeta['data'][$regs[1]][$regs[2]] = $regs[3];
+          }
+          elseif (preg_match('/^([^\|]+)\|([^\|]*)$/', $gline, $regs)) {
+            $gmeta['var'][$regs[1]] = $regs[2];
+          }
+          elseif (strlen(trim($gline))) {
+            $gmeta['info'][] = $gline;
+          }
+        }
+        if (is_null($gfilename)) { $gfilename = $this->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="'.$gURL.'"';
+        $out .= ' alt="'.$this->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'])) {
+          $out .= '<table class="gdata">';
+          foreach ($gmeta['data'] as $field=>$gdata) {
+            $out .= '<tr><th>'.$field.'</th>';
+            foreach ($gdata as $gkey=>$gval) {
+              $out .= '<td><span class="gkey">'.$gkey.': </span>'.$gval.'</td>';
+            }
+            $out .= '</tr>';
+          }
+          $out .= '</table>';
+        }
+        if (isset($gmeta['var']) && count($gmeta['var'])) {
+          foreach ($gmeta['var'] as $gkey=>$gval) {
+            $out .= '<p class="gvar"><span class="gkey">'.$gkey.': </span>'.$gval.'</p>';
+          }
+        }
+        if (isset($gmeta['info']) && count($gmeta['info'])) {
+          foreach ($gmeta['info'] as $gval) {
+            $out .= '<p class="ginfo">'.$gval.'</p>';
+          }
+        }
       }
     }
     else {
       $out .= 'RRD error: status is "'.$this->status.'"';
     }
+    $out .= '</div>';
+
+    $out .= '<p class="footer">';
+    $out .= 'Statistics created by <a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">RRDtool</a>';
+    $out .= ' using a library created by <a href="http://www.kairo.at/">KaiRo.at</a>.';
+    $out .= '</p>';
 
-    $ou .= '</body></html>';
+    $out .= '</body></html>';
   return $out;
   }