// 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);
}
}
- 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;
$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 {
}
- // 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)
$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);
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; }
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();
$evalcode = 'function { return 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);
+ if (substr_count($ds['update'], ':') >= 4) {
+ list($nix, $snmphost, $snmpcomm, $ifname, $valtype) = explode(':', $ds['update'], 5);
+ }
+ else {
+ $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) {
$upvals[$ds['name']] = $val;
}
}
- $key_names = (!is_numeric(array_shift(array_keys($upvals))));
+ $upval_keys = array_keys($upvals);
+ $keys_have_names = !is_numeric(array_shift($upval_keys));
if (in_array('L', $upvals, true)) {
// for at least one value, we need to set the same as the last recorded value
$fvals = $this->fetch();
$rowids = array_shift($fvals);
$lastvals = array_shift($fvals);
foreach (array_keys($upvals, 'L') as $akey) {
- $upvals[$akey] = $key_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
+ $upvals[$akey] = $keys_have_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
}
}
$walkfunc = create_function('&$val,$key', '$val = is_numeric(trim($val))?trim($val):"U";');
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
+ .($keys_have_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
$return = `$update_cmd 2>&1`;
}
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; }
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) {
$fresult = array();
$rows = explode("\n", $return);
$fields = preg_split('/\s+/', array_shift($rows));
- if (array_shift($fields) == 'timestamp') {
- $fresult[0] = $fields;
+ if (in_array(array_shift($fields), array('timestamp', ''))) {
+ //$fresult[0] = $fields;
foreach ($rows as $row) {
if (strlen(trim($row))) {
$rvals = preg_split('/\s+/', $row);
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;
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]) {
$grow = array();
$grow['dType'] = 'CDEF';
$grow['name'] = $erow['name'];
- $grow['rpn_expr'] = $erow['name'].'_tmp,'.$erow['scale'].',*';
+ $grow['rpn_expr'] = $erow['name'].'_tmp,'.sprintf('%F', $erow['scale']).',*';
}
if ($use_gcrows) { $grow['gType'] = isset($erow['gType'])?$erow['gType']:'LINE1'; }
else { $grow['gType'] = ((count($grow_def)==2) && ($key==0))?'AREA':'LINE1'; }
}
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'])) {
$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');
+ $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');
+ $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');
+ $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');
}
}
}
$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) {
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);
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
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;
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');
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');
$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);
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
else { $sURL_add = '&sub=%s'; }
- $num_rows = is_numeric($pconf['num_rows'])?$pconf['num_rows']:2;
- $num_cols = ceil(count($stats)/$num_rows);
+ $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
+ $num_cols = is_numeric($pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
+ $num_rows = ceil(count($stats)/$num_cols);
$out .= '<table class="overview">'."\n";
- for ($col = 0; $col < $num_cols; $col++) {
+ for ($row = 0; $row < $num_rows; $row++) {
$out .= '<tr>'."\n";
- for ($row = 0; $row < $num_rows; $row++) {
- $idx = $col * $num_rows + $row;
+ for ($col = 0; $col < $num_cols; $col++) {
+ $idx = $row * $num_cols + $col;
$out .= '<td>'."\n";
if ($idx < count($stats)) {
@list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2);
$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";
$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 {
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;
$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'); }
$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) {
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();
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;
+ }
}
?>
projects / php-utility-classes.git / blobdiff