X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=4c5b4596bcc54c4bb3f3e35cac2dadf9b534745d;hp=ea32b5276821c585c79a613eb691aff1ed2dbb7c;hb=2304f1ba2ce7ee318208f0cf68773a5cb0eed79f;hpb=82d064f49d1504d936007f150bcc4f12d29cc44f diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class index ea32b52..4c5b459 100644 --- a/include/classes/rrdstat.php-class +++ b/include/classes/rrdstat.php-class @@ -68,6 +68,9 @@ class rrdstat { // 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 + // GNU gettext domain for this module + // // function set_def($rrdconfig, [$conf_id]) // set definitions based on given configuration // [intended for internal use, called by the constructor] @@ -146,8 +149,16 @@ class rrdstat { var $status = 'unused'; + var $mod_textdomain; + function rrdstat($rrdconfig, $conf_id = null) { // ***** init RRD stat module ***** + $this->mod_textdomain = 'class_rrdstat'; + $mod_charset = 'iso-8859-15'; + + bindtextdomain($this->mod_textdomain, class_exists('baseutils')?baseutils::getDir('locale'):'locale/'); + bind_textdomain_codeset($this->mod_textdomain, $mod_charset); + $this->set_def($rrdconfig, $conf_id); if (($this->status == 'unused') && !is_null($this->rrd_file)) { @@ -512,6 +523,45 @@ class rrdstat { foreach ($gconf['rows'] as $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']; } + foreach (array('scale_time_src','scale_time_tgt') as $st) { + if (!isset($erow[$st]) || !is_numeric($erow[$st])) { + switch (@$erow[$st]) { + case 'dyn': + case 'auto': + $erow[$st] = $slice; + break; + case 'day': + $erow[$st] = 24*3600; + break; + case '2hr': + case '2hours': + $erow[$st] = 7200; + break; + case 'hr': + case 'hour': + $erow[$st] = 3600; + break; + case '30min': + $erow[$st] = 1800; + break; + case '5min': + $erow[$st] = 300; + break; + case 'min': + $erow[$st] = 60; + break; + case 's': + case 'sec': + default: + $erow[$st] = 1; + break; + } + } + } + $scale_time_factor = $erow['scale_time_tgt']/$erow['scale_time_src']; + if ($scale_time_factor != 1) { $erow['scale'] = (isset($erow['scale'])?$erow['scale']:1)*$scale_time_factor; } $grow = array(); $grow['dType'] = isset($erow['dType'])?$erow['dType']:'DEF'; $grow['name'] = $erow['name'].(isset($erow['scale'])?'_tmp':''); @@ -532,6 +582,7 @@ class rrdstat { } $grow['gType'] = isset($erow['gType'])?$erow['gType']:'LINE1'; $grow['color'] = isset($erow['color'])?$erow['color']:$gColors[$gC++]; + $grow['color_bg'] = isset($erow['color_bg'])?$erow['color_bg']:''; if ($gC >= count($gColors)) { $gC = 0; } if (isset($erow['legend'])) { $grow['legend'] = $erow['legend']; @@ -539,6 +590,7 @@ class rrdstat { } if (isset($erow['stack'])) { $grow['stack'] = ($erow['stack'] == true); } if (isset($erow['desc'])) { $grow['desc'] = $erow['desc']; } + if (isset($erow['legend_long'])) { $grow['legend_long'] = $erow['legend_long']; } $graphrows[] = $grow; } } @@ -564,6 +616,7 @@ class rrdstat { if (!isset($gconf['show_legend'])) { $gconf['show_legend'] = true; } } if (isset($ds['desc'])) { $grow['desc'] = $ds['desc']; } + if (isset($ds['legend_long'])) { $grow['legend_long'] = $ds['legend_long']; } $graphrows[] = $grow; } } @@ -591,15 +644,16 @@ class rrdstat { } } else { + $td = $this->mod_textdomain; 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'); + $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'); } } } @@ -613,11 +667,15 @@ class rrdstat { if (($gconf['height'] <= 32) && isset($gconf['thumb']) && ($gconf['thumb'])) { $gOpts .= ' --only-graph'; } } if (!isset($gconf['show_legend']) || (!$gconf['show_legend'])) { $gOpts .= ' --no-legend'; } + if (isset($gconf['logarithmic']) && $gconf['logarithmic']) { $gOpts .= ' --logarithmic'; } if (isset($gconf['min_y'])) { $gOpts .= ' --lower-limit '.$gconf['min_y']; } if (isset($gconf['max_y'])) { $gOpts .= ' --upper-limit '.$gconf['max_y']; } if (isset($gconf['fix_scale_y']) && $gconf['fix_scale_y']) { $gOpts .= ' --rigid'; } if (isset($gconf['grid_x'])) { $gOpts .= ' --x-grid '.$gconf['grid_x']; } if (isset($gconf['grid_y'])) { $gOpts .= ' --y-grid '.$gconf['grid_y']; } + if (isset($gconf['gridfit']) && (!$gconf['gridfit'])) { $gOpts .= ' --no-gridfit'; } + if (isset($gconf['calc_scale_y']) && $gconf['calc_scale_y']) { $gOpts .= ' --alt-autoscale'; } + if (isset($gconf['calc_max_y']) && $gconf['calc_max_y']) { $gOpts .= ' --alt-autoscale-max'; } if (isset($gconf['units_exponent'])) { $gOpts .= ' --units-exponent '.$gconf['units_exponent']; } if (isset($gconf['units_length'])) { $gOpts .= ' --units-length '.$gconf['units_length']; } if (!isset($gconf['force_recreate']) || (!$gconf['force_recreate'])) { $gOpts .= ' --lazy'; } @@ -663,13 +721,21 @@ class rrdstat { trigger_error($this->rrd_file.' - rrd graph error: '.$return, E_USER_WARNING); $return = $graph_cmd."\n\n".$return; } - $return = 'file:'.$fname."\n".$return; + $legendlines = ''; + foreach ($graphrows as $grow) { + $legendline = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']); + $legendline .= '|'.@$grow['color']; + $legendline .= '|'.(isset($grow['color_bg'])?$grow['color_bg']:''); + $legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:''); + $legendlines .= 'legend:'.$legendline."\n"; + } + $return = 'file:'.$fname."\n".$legendlines.$return; return $return; } 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); + $gmeta = array('filename'=>null,'legends_long'=>false,'default_colorize'=>false); $ret = $this->graph($timeframe, $sub, $extra); if (strpos($ret, "\n\n") !== false) { $gmeta['graph_cmd'] = substr($ret, 0, strpos($ret, "\n\n")); $ret = substr($ret, strpos($ret, "\n\n")+2); } else { $gmeta['graph_cmd'] = null; } @@ -678,6 +744,11 @@ class rrdstat { if (preg_match('/^file:(.+)$/', $gline, $regs)) { $gmeta['filename'] = $regs[1]; } + elseif (preg_match('/^legend:([^\|]+)\|([^|]+)\|([^\|]*)\|(.*)$/', $gline, $regs)) { + $gmeta['legend'][$regs[1]] = array('color'=>$regs[2], 'color_bg'=>$regs[3], 'desc_long'=>$regs[4]); + if (strlen($regs[4])) { $gmeta['legends_long'] = true; } + if (strlen($regs[3]) || strlen($regs[4])) { $gmeta['default_colorize'] = true; } + } elseif (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) { $gmeta['width'] = $regs[1]; $gmeta['height'] = $regs[2]; } @@ -739,8 +810,8 @@ class rrdstat { function page_index($pconf) { // create a bare, very simple index list HTML page and return it in a string - - $ptitle = isset($pconf['title_page'])?$pconf['title_page']:'RRD statistics index'; + $td = $this->mod_textdomain; + $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics index'); $out = ''; $out .= ''.$ptitle.''; @@ -761,7 +832,7 @@ class rrdstat { $out .= '

'.$pconf['text_intro'].'

'; } elseif (!isset($pconf['text_intro'])) { - $out .= '

The following RRD stats are available:

'; + $out .= '

'.dgettext($td, 'The following RRD stats are available:').'

'; } $stats = $this->h_page_statsArray($pconf); @@ -800,8 +871,8 @@ class rrdstat { function page_overview($pconf, $graph_extras = null) { // create an overview HTML page (including graphs) and return it in a string - - $ptitle = isset($pconf['title_page'])?$pconf['title_page']:'RRD statistics overview'; + $td = $this->mod_textdomain; + $ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics overview'); $out = ''; $out .= ''.$ptitle.''; @@ -819,10 +890,16 @@ class rrdstat { $out .= ''; $out .= '

'.$ptitle.'

'; - if (isset($pconf['text_intro'])) { $out .= '

'.$pconf['text_intro'].'

'; } + if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '

'.$pconf['text_intro'].'

'; } $stats = $this->h_page_statsArray($pconf); + if (isset($pconf['stats_url'])) { $sURL_base = $pconf['stats_url']; } + else { $sURL_base = '?stat=%i%a'; } + + 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); @@ -833,9 +910,9 @@ class rrdstat { $idx = $col * $num_rows + $row; $out .= ''; if ($idx < count($stats)) { - list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2); + @list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2); $s_psname = 'page'.(isset($s_psub)?'.'.$s_psub:''); - $g_sub = $this->config_all[$sname][$s_psname]['graph_sub']; + $g_sub = @$this->config_all[$sname][$s_psname]['graph_sub']; if (isset($this->config_all[$sname][$s_psname]['title_page'])) { $s_ptitle = $this->config_all[$sname][$s_psname]['title_page']; @@ -844,7 +921,7 @@ class rrdstat { $s_ptitle = $this->config_all[$sname]['page']['title_page']; } else { - $s_ptitle = $sname.(isset($s_psub)?' ('.$s_psub.')':'').' statistics'; + $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 .= '

'.$s_ptitle.'

'; @@ -856,21 +933,24 @@ class rrdstat { $gmeta = $s_rrd->graph_plus($tframe, $g_sub); if (isset($pconf['graph_url'])) { $gURL = $pconf['graph_url']; - $fname = str_replace('%f', basename($gmeta['filename']), $gURL); - $fname = str_replace('%p', $gmeta['filename'], $gURL); + $gURL = str_replace('%f', basename($gmeta['filename']), $gURL); + $gURL = str_replace('%p', $gmeta['filename'], $gURL); if (substr($gURL, -1) == '/') { $gURL .= $gmeta['filename']; } } else { $gURL = $gmeta['filename']; } - $out .= ''; $out .= 'basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"'; - $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">'; - $out .= ''; + if (isset($gmeta['width']) && isset($gmeta['height'])) { $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"'; } + $out .= '>'; } else { - $out .= 'RRD error: status is "'.$s_rrd->status.'"'; + $out .= sprintf(dgettext($td, 'RRD error: status is "%s"'), $s_rrd->status); } } else { @@ -889,13 +969,15 @@ class rrdstat { function page_simple($pconf, $graph_extras = null) { // create a simple (MRTG-like) HTML page and return it in a string + $td = $this->mod_textdomain; - $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$this->basename.' - RRD statistics'; + $ptitle = isset($pconf['title_page'])?$pconf['title_page']:sprintf(dgettext($td, '%s - RRD statistics'),$this->basename); $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)'; + $gtitle['day'] = isset($pconf['title_day'])?$pconf['title_day']:dgettext($td, 'Day overview (scaling 5 minutes)'); + $gtitle['week'] = isset($pconf['title_week'])?$pconf['title_week']:dgettext($td, 'Week overview (scaling 30 minutes)'); + $gtitle['month'] = isset($pconf['title_month'])?$pconf['title_month']:dgettext($td, 'Month overview (scaling 2 hours)'); + $gtitle['year'] = isset($pconf['title_year'])?$pconf['title_year']:dgettext($td, 'Year overview (scaling 1 day)'); + $ltitle = isset($pconf['title_legend'])?$pconf['title_legend']:dgettext($td, 'Legend:'); $out = ''; $out .= ''.$ptitle.''; @@ -905,8 +987,11 @@ class rrdstat { $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 .= 'table.gdata, table.legend { border: 1px solid gray; border-collapse: collapse; }'; + $out .= 'table.gdata td, table.gdata th, '; + $out .= 'table.legend td, table.legend th { border: 1px solid gray; padding: 0.1em 0.2em; }'; + $out .= 'div.legend { font-size: 0.75em; margin: 0.5em 0; }'; + $out .= 'div.legend p { margin: 0; }'; $out .= '.footer { font-size: 0.75em; margin: 0.5em 0; }'; } if (isset($pconf['style'])) { $out .= $pconf['style']; } @@ -915,8 +1000,14 @@ class rrdstat { $out .= ''; $out .= '

'.$ptitle.'

'; + if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '

'.$pconf['text_intro'].'

'; } if (!isset($pconf['show_update']) || $pconf['show_update']) { - $out .= '

Last Update: '.(is_null($this->last_update())?'unknown':date('Y-m-d H:i:s', $this->last_update())).'

'; + $out .= '

'; + if (is_null($this->last_update())) { $up_time = dgettext($td, 'unknown'); } + elseif (class_exists('baseutils')) { $up_time = baseutils::dateFormat($this->last_update(), 'short'); } + else { $up_time = date('Y-m-d H:i:s', $this->last_update()); } + $out .= sprintf(dgettext($td, 'Last Update: %s'), $up_time); + $out .= '

'; } $g_sub = isset($pconf['graph_sub'])?$pconf['graph_sub']:null; @@ -939,10 +1030,19 @@ class rrdstat { $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;"'; } $out .= '>'; + $colorize_data = (isset($pconf['data_colorize']) && $pconf['data_colorize']) || (!isset($pconf['data_colorize']) && $gmeta['default_colorize']); if (isset($gmeta['data']) && count($gmeta['data'])) { $out .= ''; foreach ($gmeta['data'] as $field=>$gdata) { - $out .= ''; + $out .= ''; foreach ($gdata as $gkey=>$gval) { $out .= ''; } @@ -962,9 +1062,31 @@ class rrdstat { } $out .= ''; } + if ($gmeta['legends_long'] && (!isset($pconf['show_legend']) || $pconf['show_legend'])) { + $out .= '
'; + $out .= '

'.$ltitle.'

'; + $out .= '
'.$field.'
'.$gkey.': '.$gval.'
'; + foreach ($gmeta['legend'] as $field=>$legend) { + if (strlen($legend['desc_long'])) { + $out .= ''; + $out .= ''; + $out .= ''; + } + } + $out .= '
'.$legend['desc_long'].'
'; + $out .= ''; + } } else { - $out .= 'RRD error: status is "'.$this->status.'"'; + $out .= sprintf(dgettext($td, 'RRD error: status is "%s"'), $this->status); } $out .= $this->h_page_footer(); @@ -1015,8 +1137,9 @@ class rrdstat { function h_page_footer() { // return generic page footer $out = '

'; - $out .= 'Statistics created by RRDtool'; - $out .= ' using a library created by KaiRo.at.'; + $out .= sprintf(dgettext($this->mod_textdomain, 'Statistics created with %s using a library created by %s.'), + 'RRDtool', + 'KaiRo.at'); $out .= '

'; return $out; }