X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=3f5e98f920ca49e0dde13dc64a164752774fccff;hp=67af03abcbc99187d97f048073d656b32974ea98;hb=ea29ba0c875bd7bfb762d831e81e8074c5f6ce32;hpb=e557425924bfdff40e245aa462aaa2bf5fa346d3

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 67af03a..3f5e98f 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -12,7 +12,7 @@
  *
  * The Initial Developer of the Original Code is
  * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2005
+ * Portions created by the Initial Developer are Copyright (C) 2005-2006
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): Robert Kaiser <kairo@kairo.at>
@@ -23,141 +23,146 @@ class rrdstat {
   // rrdstat PHP class
   // rrdtool statistics functions
   //
-  // function rrdstat($rrdconfig, [$conf_id])
+  // function __construct($rrdconfig, [$conf_id])
   //   CONSTRUCTOR
   //     if $conf_id is set, $rrdconfig is a total configuration set
   //     else it's the configuration for this one RRD
   //     currently only a config array is supported, XML config is planned
   //
-  // var $rrd_file
+  // private $rrdtool_bin
+  // RRDtool binary to use
+  //
+  // private $rrd_file
   // RRD file name
   //
-  // var $basename
+  // private $basename
   // base name for this RRD (usually file name without .rrd)
   //
-  // var $basedir
+  // private $basedir
   // base directory for this RRD (with a trailing slash)
   //   note that $rrd_file usually includes that path as well, but graph directory gets based on this value
   //
-  // var $config_all
+  // private $config_all
   // complete, raw configuration array set
   //
-  // var $config_raw
+  // private $config_raw
   // configuration array set for current RRD
   //
-  // var $config_graph
+  // private $config_graph
   // configuration array set for default graph in this RRD
   //
-  // var $config_page
+  // private $config_page
   // configuration array set for default page in this RRD
   //
-  // var $rrd_fields
+  // private $rrd_fields
   // definition of this RRD's fields
   //
-  // var $rra_base
+  // private $rra_base
   // definition of this RRD's base RRAs
   //
-  // var $rrd_step
+  // private $rrd_step
   // basic stepping of this RRD in seconds (default: 300)
   //
-  // var $rra_add_max
+  // private $rra_add_max
   // should RRAs for MAX be added for every base RRA? (bool, default: true)
   //
-  // var $status
+  // private $status
   // status of the RRD (unused/ok/readonly/graphonly)
   //   note that most functions require certain status values
   //   (e.g. update only works if status is ok, graph for ok/readonly/graphonly)
   //
-  // var $mod_textdomain
+  // private $mod_textdomain
   //   GNU gettext domain for this module
   //
-  // function set_def($rrdconfig, [$conf_id])
+  // private function set_def($rrdconfig, [$conf_id])
   //   set definitions based on given configuration
   //   [intended for internal use, called by the constructor]
   //
-  // function rrd_version() {
+  // public function rrd_version() {
   //   get RRDtool version string
   //
-  // function create()
+  // public function create()
   //   create RRD file according to set config
   //
-  // function update([$upArray])
+  // public function update([$upArray])
   //   feed new data into RRD (either use given array of values or use auto-update info from config)
   //
-  // function fetch([$cf] = 'AVERAGE', $resolution = null, $start = null, $end = null)
+  // public function fetch([$cf] = 'AVERAGE', $resolution = null, $start = null, $end = null)
   //   fetch data from the defined RRD
   //     using given consolidation function [default is AVERAGE],
   //     resolution (seconds, default is the RRD's stepping),
   //     start and end times (unix epoch, defaults are the RRD's last update time)
   //
-  // function last_update()
+  // public function last_update()
   //   fetch time of last update in this RRD file
   //
-  // function graph([$timeframe], [$sub], [$extra])
+  // public function graph([$timeframe], [$sub], [$extra])
   //   create a RRD graph (and return all meta info in a flat string)
   //     for given timeframe (day [default]/week/month/year),
   //     sub-graph ID (if given) and extra config options (if given)
   //
-  // function graph_plus([$timeframe], [$sub], [$extra])
+  // public function graph_plus([$timeframe], [$sub], [$extra])
   //   create a RRD graph (see above) and return meta info as a ready-to-use array
   //
-  // function page([$sub], [$page_extras], [$graph_extras])
+  // public function page([$sub], [$page_extras], [$graph_extras])
   //   create a (HTML) page and return it in a string
   //     for given sub-page ID (if given, default is a simple HTML page)
   //     and extra page and graph config options (if given)
   //
-  // function simple_html([$sub], [$page_extras], [$graph_extras])
+  // public function simple_html([$sub], [$page_extras], [$graph_extras])
   //   create a simple (MRTG-like) HTML page and return it in a string
   //   XXX: this is here temporarily for compat only, it's preferred to use page()!
   //
-  // function page_index($pconf)
+  // private function page_index($pconf)
   //   create a bare, very simple index list HTML page and return it in a string
   //   using given page config options
   //   [intended for internal use, called by page()]
   //
-  // function page_overview($pconf, [$graph_extras])
+  // private function page_overview($pconf, [$graph_extras])
   //   create an overview HTML page (including graphs) and return it in a string
   //   using given page config options and extra graph options (if given)
   //   [intended for internal use, called by page()]
   //
-  // function page_simple($pconf, [$graph_extras])
+  // private function page_simple($pconf, [$graph_extras])
   //   create a simple (MRTG-like) HTML page and return it in a string
   //   using given page config options and extra graph options (if given)
   //   [intended for internal use, called by page()]
   //
-  // function h_page_statsArray($pconf)
+  // private function h_page_statsArray($pconf)
   //   return array of stats to list on a page, using given page config options
   //   [intended for internal use, called by page_*()]
   //
-  // function h_page_footer()
+  // private function h_page_footer()
   //   return generic page footer
   //   [intended for internal use, called by page_*()]
   //
-  // function text_quote($text)
+  // private function text_quote($text)
   //   return a quoted/escaped text for use in rrdtool commandline text fields
 
-  var $rrd_file = null;
-  var $basename = null;
-  var $basedir = null;
+  private $rrdtool_bin = '/usr/bin/rrdtool';
+
+  private $rrd_file = null;
+  private $basename = null;
+  private $basedir = null;
 
-  var $config_all = null;
-  var $config_raw = null;
-  var $config_graph = null;
-  var $config_page = null;
+  private $config_all = null;
+  private $config_raw = null;
+  private $config_graph = null;
+  private $config_page = null;
 
-  var $rrd_fields = array();
-  var $rra_base = array();
-  var $rrd_step = 300;
-  var $rra_add_max = true;
+  private $rrd_fields = array();
+  private $rra_base = array();
+  private $rrd_step = 300;
+  private $rra_add_max = true;
 
-  var $status = 'unused';
+  private $status = 'unused';
 
-  var $mod_textdomain;
+  private $mod_textdomain;
 
-  function rrdstat($rrdconfig, $conf_id = null) {
+  function __construct($rrdconfig, $conf_id = null) {
     // ***** init RRD stat module *****
     $this->mod_textdomain = 'class_rrdstat';
-    $mod_charset = 'iso-8859-15';
+    $mod_charset = 'utf-8';
 
     bindtextdomain($this->mod_textdomain, class_exists('baseutils')?baseutils::getDir('locale'):'locale/');
     bind_textdomain_codeset($this->mod_textdomain, $mod_charset);
@@ -181,7 +186,7 @@ class rrdstat {
     }
   }
 
-  function set_def($rrdconfig, $conf_id = null) {
+  private function set_def($rrdconfig, $conf_id = null) {
     if (is_array($rrdconfig)) {
       // we have an array in the format we like to have
       $complete_conf =& $rrdconfig;
@@ -195,8 +200,12 @@ class rrdstat {
       $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']; }
+        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 {
@@ -241,7 +250,7 @@ class rrdstat {
       }
 
 
-      // MRTG-style RRD "database", see http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/tut/rrdtutorial.en.html
+      // MRTG-style RRD "database", see http://oss.oetiker.ch/rrdtool/tut/rrdtutorial.en.html
       //
       // archives (RRAs):
       // 600 samples of 5 minutes  (2 days and 2 hours)
@@ -270,11 +279,11 @@ class rrdstat {
     $this->config_all = $complete_conf;
   }
 
-  function rrd_version() {
+  public function rrd_version() {
     // return RRDtool version
     static $version;
     if (!isset($version)) {
-      $create_cmd = 'rrdtool --version';
+      $create_cmd = $this->rrdtool_bin.' --version';
       $return = `$create_cmd 2>&1`;
       if (strpos($return, 'ERROR') !== false) {
         trigger_error($this->rrd_file.' - rrd version error: '.$return, E_USER_WARNING);
@@ -290,11 +299,11 @@ class rrdstat {
   return $version;
   }
 
-  function create() {
+  public function create() {
     // create RRD file
 
     // compose create command
-    $create_cmd = 'rrdtool create '.$this->rrd_file.' --step '.$this->rrd_step;
+    $create_cmd = $this->rrdtool_bin.' create '.$this->rrd_file.' --step '.$this->rrd_step;
     foreach ($this->rrd_fields as $ds) {
       if (!isset($ds['type'])) { $ds['type'] = 'COUNTER'; }
       if (!isset($ds['heartbeat'])) { $ds['heartbeat'] = 2*$this->rrd_step; }
@@ -328,7 +337,7 @@ class rrdstat {
     else { $this->status = 'ok'; }
   }
 
-  function update($upArray = null) {
+  public function update($upArray = null) {
     // feed new data into RRD
     if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return false; }
     $upvals = array();
@@ -401,7 +410,8 @@ class rrdstat {
     array_walk($upvals, $walkfunc);
     $return = null;
     if (count($upvals)) {
-      $update_cmd = 'rrdtool update '.$this->rrd_file.($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
+      $update_cmd = $this->rrdtool_bin.' update '.$this->rrd_file
+                    .($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
       $return = `$update_cmd 2>&1`;
     }
 
@@ -413,9 +423,11 @@ class rrdstat {
   return $success;
   }
 
-  function fetch($cf = 'AVERAGE', $resolution = null, $start = null, $end = null) {
+  public function fetch($cf = 'AVERAGE', $resolution = null, $start = null, $end = null) {
     // fetch data from a RRD
-    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'))) {
+      trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false;
+    }
 
     if (!in_array($cf, array('AVERAGE','MIN','MAX','LAST'))) { $cf = 'AVERAGE'; }
     if (!is_numeric($resolution)) { $resolution = $this->rrd_step; }
@@ -426,7 +438,8 @@ class rrdstat {
     elseif ($start < 0) { $start += $end; }
     $start = intval($start/$resolution)*$resolution;
 
-    $fetch_cmd = 'rrdtool fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution.' --start '.$start.' --end '.$end;
+    $fetch_cmd = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+                 .' --start '.$start.' --end '.$end;
     $return = `$fetch_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
@@ -455,25 +468,28 @@ class rrdstat {
   return $fresult;
   }
 
-  function last_update() {
+  public function last_update() {
     // fetch time of last update in this RRD file
     static $last_update;
     if (!isset($last_update) && in_array($this->status, array('ok','readonly'))) {
-      $last_cmd = 'rrdtool last '.$this->rrd_file;
+      $last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
       $return = trim(`$last_cmd 2>&1`);
       $last_update = is_numeric($return)?$return:null;
     }
   return isset($last_update)?$last_update:null;
   }
 
-  function graph($timeframe = 'day', $sub = null, $extra = null) {
+  public 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');
+      $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','graphonly'))) { 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 = (array)$extra;
@@ -549,8 +565,12 @@ class rrdstat {
     foreach ($grow_def as $key=>$erow) {
       if (isset($erow['name']) && strlen($erow['name'])) {
         if (!isset($erow['scale']) && isset($gconf['scale'])) { $erow['scale'] = $gconf['scale']; }
-        if (!isset($erow['scale_time_src']) && isset($gconf['scale_time_src'])) { $erow['scale_time_src'] = $gconf['scale_time_src']; }
-        if (!isset($erow['scale_time_tgt']) && isset($gconf['scale_time_tgt'])) { $erow['scale_time_tgt'] = $gconf['scale_time_tgt']; }
+        if (!isset($erow['scale_time_src']) && isset($gconf['scale_time_src'])) {
+          $erow['scale_time_src'] = $gconf['scale_time_src'];
+        }
+        if (!isset($erow['scale_time_tgt']) && isset($gconf['scale_time_tgt'])) {
+          $erow['scale_time_tgt'] = $gconf['scale_time_tgt'];
+        }
         foreach (array('scale_time_src','scale_time_tgt') as $st) {
           if (!isset($erow[$st]) || !is_numeric($erow[$st])) {
             switch (@$erow[$st]) {
@@ -637,7 +657,8 @@ class rrdstat {
           }
           if (isset($crow['cf'])) {
             if ($this->rrd_version() >= '1.2') {
-              $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'].'_'.$crow['cf'], 'rpn_expr'=>$srow['name'].','.$crow['cf']);
+              $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'].'_'.$crow['cf'],
+                                   'rpn_expr'=>$srow['name'].','.$crow['cf']);
             }
           }
           elseif (isset($crow['rpn_expr'])) {
@@ -656,17 +677,23 @@ class rrdstat {
         if (isset($grow['gType']) && strlen($grow['gType'])) {
           $textprefix = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
           if ($this->rrd_version() >= '1.2') {
-            $graphrows[] = array('dType'=>'VDEF', 'name'=>$grow['name'].'_max', 'rpn_expr'=>$grow['name'].',MAXIMUM');
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'].'_max', 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
-            $graphrows[] = array('dType'=>'VDEF', 'name'=>$grow['name'].'_avg', 'rpn_expr'=>$grow['name'].',AVERAGE');
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'].'_avg', 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
-            $graphrows[] = array('dType'=>'VDEF', 'name'=>$grow['name'].'_last', 'rpn_expr'=>$grow['name'].',LAST');
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'].'_last', 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
+            $graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__max', 'rpn_expr'=>$grow['name'].',MAXIMUM');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__max',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
+            $graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__avg', 'rpn_expr'=>$grow['name'].',AVERAGE');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__avg',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
+            $graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__last', 'rpn_expr'=>$grow['name'].',LAST');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__last',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
           }
           else {
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'MAX', 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'AVERAGE', 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
-            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'LAST', 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'MAX',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'AVERAGE',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
+            $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'LAST',
+                                   'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
           }
         }
       }
@@ -740,7 +767,7 @@ class rrdstat {
       $addSpecial .= ':'.$this->text_quote($srow['text']);
     }
 
-    $graph_cmd = 'rrdtool graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
+    $graph_cmd = $this->rrdtool_bin.' graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
     $return = `$graph_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
@@ -763,7 +790,7 @@ class rrdstat {
   return $return;
   }
 
-  function graph_plus($timeframe = 'day', $sub = null, $extra = null) {
+  public function graph_plus($timeframe = 'day', $sub = null, $extra = null) {
     // create a RRD graph and return meta info as a ready-to-use array
     $gmeta = array('filename'=>null,'legends_long'=>false,'default_colorize'=>false);
     $ret = $this->graph($timeframe, $sub, $extra);
@@ -803,7 +830,7 @@ class rrdstat {
   return $gmeta;
   }
 
-  function page($sub = null, $page_extras = null, $graph_extras = null) {
+  public function page($sub = null, $page_extras = null, $graph_extras = null) {
     // create a (HTML) page and return it in a string
 
     // assemble configuration
@@ -829,9 +856,10 @@ class rrdstat {
   return $return;
   }
 
-  function simple_html($sub = null, $page_extras = null, $graph_extras = null) {
+  public function simple_html($sub = null, $page_extras = null, $graph_extras = null) {
     // create a simple (MRTG-like) HTML page and return it in a string
     // XXX: this is here temporarily for compat only, it's preferred to use page()!
+    trigger_error(__CLASS__.'::'.__METHOD__.' is deprecated, use page() instead.', E_USER_NOTICE);
 
     // assemble configuration
     $pconf = (array)$page_extras;
@@ -843,7 +871,7 @@ class rrdstat {
   return $this->page_simple($pconf, $graph_extras);
   }
 
-  function page_index($pconf) {
+  private function page_index($pconf) {
     // create a bare, very simple index list HTML page and return it in a string
     $td = $this->mod_textdomain;
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics index');
@@ -904,7 +932,7 @@ class rrdstat {
   return $out;
   }
 
-  function page_overview($pconf, $graph_extras = null) {
+  private function page_overview($pconf, $graph_extras = null) {
     // create an overview HTML page (including graphs) and return it in a string
     $td = $this->mod_textdomain;
     $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics overview');
@@ -925,7 +953,9 @@ class rrdstat {
     $out .= '<body>'."\n";
 
     $out .= '<h1>'.$ptitle.'</h1>'."\n";
-    if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'; }
+    if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) {
+      $out .= '<p class="intro">'.$pconf['text_intro'].'</p>';
+    }
 
     $stats = $this->h_page_statsArray($pconf);
 
@@ -956,7 +986,9 @@ class rrdstat {
             $s_ptitle = $this->config_all[$sname]['page']['title_page'];
           }
           else {
-            $s_ptitle = isset($s_psub)?sprintf(dgettext($td, '%s (%s) statistics'), $sname, $s_psub):sprintf(dgettext($td, '%s statistics'), $sname);
+            $s_ptitle = isset($s_psub)
+                        ?sprintf(dgettext($td, '%s (%s) statistics'), $sname, $s_psub)
+                        :sprintf(dgettext($td, '%s statistics'), $sname);
           }
           if (!isset($pconf['hide_titles']) || !$pconf['hide_titles']) {
             $out .= '<h2>'.$s_ptitle.'</h2>'."\n";
@@ -981,7 +1013,9 @@ class rrdstat {
             $out .= '<a href="'.$sURL.'">';
             $out .= '<img src="'.$gURL.'"';
             $out .= ' alt="'.$s_rrd->basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
-            if (isset($gmeta['width']) && isset($gmeta['height'])) { $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"'; }
+            if (isset($gmeta['width']) && isset($gmeta['height'])) {
+              $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"';
+            }
             $out .= '></a>'."\n";
           }
           else {
@@ -1002,7 +1036,7 @@ class rrdstat {
   return $out;
   }
 
-  function page_simple($pconf, $graph_extras = null) {
+  private function page_simple($pconf, $graph_extras = null) {
     // create a simple (MRTG-like) HTML page and return it in a string
     $td = $this->mod_textdomain;
 
@@ -1035,7 +1069,9 @@ class rrdstat {
     $out .= '<body>'."\n";
 
     $out .= '<h1>'.$ptitle.'</h1>'."\n";
-    if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'."\n"; }
+    if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) {
+      $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'."\n";
+    }
     if (!isset($pconf['show_update']) || $pconf['show_update']) {
       $out .= '<p class="last_up">';
       if (is_null($this->last_update())) { $up_time = dgettext($td, 'unknown'); }
@@ -1070,9 +1106,12 @@ class rrdstat {
         $out .= '<h2>'.$gtitle[$tframe].'</h2>'."\n";
         $out .= '<img src="'.$gURL.'"';
         $out .= ' alt="'.$this->basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
-        if (isset($gmeta['width']) && isset($gmeta['height'])) { $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"'; }
+        if (isset($gmeta['width']) && isset($gmeta['height'])) {
+          $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"';
+        }
         $out .= '>'."\n";
-        $colorize_data = (isset($pconf['data_colorize']) && $pconf['data_colorize']) || (!isset($pconf['data_colorize']) && $gmeta['default_colorize']);
+        $colorize_data = (isset($pconf['data_colorize']) && $pconf['data_colorize']) ||
+                         (!isset($pconf['data_colorize']) && $gmeta['default_colorize']);
         if (isset($gmeta['data']) && count($gmeta['data'])) {
           $out .= '<table class="gdata">'."\n";
           foreach ($gmeta['data'] as $field=>$gdata) {
@@ -1136,7 +1175,7 @@ class rrdstat {
   return $out;
   }
 
-  function h_page_statsArray($pconf) {
+  private function h_page_statsArray($pconf) {
     // return array of stats to list on a page
     $stats = array();
     $snames = array(); $s_exclude = array(); $sfiles = array();
@@ -1176,16 +1215,20 @@ class rrdstat {
   return $stats;
   }
 
-  function h_page_footer() {
+  private function h_page_footer() {
     // return generic page footer
     $out = '<p class="footer">';
     $out .= sprintf(dgettext($this->mod_textdomain, 'Statistics created with %s using a library created by %s.'),
-                    '<a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">RRDtool</a>',
+                    '<a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a>',
                     '<a href="http://www.kairo.at/">KaiRo.at</a>');
     $out .= '</p>'."\n";
   return $out;
   }
 
-  function text_quote($text) { return '"'.str_replace('"', '\"', str_replace(':', '\:', $text)).'"'; }
+  private function text_quote($text) {
+    $trans = array('"' => '\"', ':' => '\:');
+    $qtext = '"'.strtr($text, $trans).'"';
+  return $qtext;
+  }
 }
 ?>