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':'');
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'; }
$legendlines = '';
foreach ($graphrows as $grow) {
$legendline = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
- $legendline .= '|'.$grow['color'];
+ $legendline .= '|'.@$grow['color'];
$legendline .= '|'.(isset($grow['color_bg'])?$grow['color_bg']:'');
$legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:'');
$legendlines .= 'legend:'.$legendline."\n";
$out .= '<body>';
$out .= '<h1>'.$ptitle.'</h1>';
- if (isset($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);
$idx = $col * $num_rows + $row;
$out .= '<td>';
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'];
$out .= '<body>';
$out .= '<h1>'.$ptitle.'</h1>';
+ if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'; }
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 .= '<p>'.$ltitle.'</p>';
$out .= '<table class="legend">';
foreach ($gmeta['legend'] as $field=>$legend) {
- $out .= '<tr><th';
- if ($colorize_data && isset($gmeta['legend'][$field])) {
- $out .= ' style="color:'.$gmeta['legend'][$field]['color'].';';
- if (strlen($gmeta['legend'][$field]['color_bg'])) {
- $out .= 'background-color:'.$gmeta['legend'][$field]['color_bg'].';';
+ if (strlen($legend['desc_long'])) {
+ $out .= '<tr><th';
+ if ($colorize_data && isset($gmeta['legend'][$field])) {
+ $out .= ' style="color:'.$gmeta['legend'][$field]['color'].';';
+ if (strlen($gmeta['legend'][$field]['color_bg'])) {
+ $out .= 'background-color:'.$gmeta['legend'][$field]['color_bg'].';';
+ }
+ $out .= '"';
}
- $out .= '"';
+ $out .= '>'.$field.'</th>';
+ $out .= '<td>'.$legend['desc_long'].'</td>';
+ $out .= '</tr>';
}
- $out .= '>'.$field.'</th>';
- $out .= '<td>'.$legend['desc_long'].'</td>';
- $out .= '</tr>';
}
$out .= '</table>';
$out .= '</div>';