projects
/
php-utility-classes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't error out if the graph doesn't exist but can be created
[php-utility-classes.git]
/
classes
/
rrdstat.php-class
diff --git
a/classes/rrdstat.php-class
b/classes/rrdstat.php-class
index 68b6d23902295dc0f9f9cdc6b527ced307ebcaca..0a71f13da11858fc9456fc7e44ed759fd891d90e 100644
(file)
--- a/
classes/rrdstat.php-class
+++ b/
classes/rrdstat.php-class
@@
-760,15
+760,16
@@
class rrdstat {
}
$graph_cmd = $this->rrdtool_bin.' 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) {
- trigger_error($this->rrd_file.' - rrd graph error: '.$return, E_USER_WARNING);
- $return = 'command:'.$graph_cmd."\n\n".$return;
+ if ((file_exists($fname) && !is_writable($fname)) ||
+ (!file_exists($fname) && !is_writable(dirname($fname)))) {
+ trigger_error($this->rrd_file.' - graph file not writable: '.$fname, E_USER_WARNING);
+ return 'command:'.$graph_cmd."\n\n".'unwritable file: '.$fname;
}
}
- if (0) {
- // debug output
- $return = 'command:'.$graph_cmd."\n\n".$return;
+ $graph_out = `$graph_cmd 2>&1`;
+
+ if (strpos($graph_out, 'ERROR') !== false) {
+ trigger_error($this->rrd_file.' - rrd graph error: '.$graph_out, E_USER_WARNING);
+ return 'command:'.$graph_cmd."\n\n".$graph_out;
}
$legendlines = '';
foreach ($graphrows as $grow) {
}
$legendlines = '';
foreach ($graphrows as $grow) {
@@
-778,7
+779,7
@@
class rrdstat {
$legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:'');
$legendlines .= 'legend:'.$legendline."\n";
}
$legendline .= '|'.(isset($grow['legend_long'])?$grow['legend_long']:'');
$legendlines .= 'legend:'.$legendline."\n";
}
- $return = 'file:'.$fname."\n".$legendlines.$
return
;
+ $return = 'file:'.$fname."\n".$legendlines.$
graph_out
;
return $return;
}
return $return;
}
@@
-868,7
+869,8
@@
class rrdstat {
$td = $this->mod_textdomain;
$ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics index');
$td = $this->mod_textdomain;
$ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics index');
- $out = '<html><head>'."\n";
+ $out = '<!DOCTYPE html>'."\n";
+ $out .= '<html><head>'."\n";
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
@@
-896,7
+898,7
@@
class rrdstat {
else { $sURL_base = '?stat=%i%a'; }
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
else { $sURL_base = '?stat=%i%a'; }
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
- else { $sURL_add = '&sub=%s'; }
+ else { $sURL_add = '&
amp;
sub=%s'; }
$out .= '<ul class="indexlist">'."\n";
foreach ($stats as $stat) {
$out .= '<ul class="indexlist">'."\n";
foreach ($stats as $stat) {
@@
-913,7
+915,7
@@
class rrdstat {
$sURL = str_replace('%s', $ssub, $sURL);
$sprt[] = '<a href="'.$sURL.'">'.$ssub.'</a>';
}
$sURL = str_replace('%s', $ssub, $sURL);
$sprt[] = '<a href="'.$sURL.'">'.$ssub.'</a>';
}
- $out .= ' <span="subs">('.implode(', ', $sprt).')</span>';
+ $out .= ' <span
class
="subs">('.implode(', ', $sprt).')</span>';
}
$out .= '</li>'."\n";
}
}
$out .= '</li>'."\n";
}
@@
-929,7
+931,8
@@
class rrdstat {
$td = $this->mod_textdomain;
$ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics overview');
$td = $this->mod_textdomain;
$ptitle = isset($pconf['title_page'])?$pconf['title_page']:dgettext($td, 'RRD statistics overview');
- $out = '<html><head>'."\n";
+ $out = '<!DOCTYPE html>'."\n";
+ $out .= '<html><head>'."\n";
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
@@
-955,7
+958,7
@@
class rrdstat {
else { $sURL_base = '?stat=%i%a'; }
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
else { $sURL_base = '?stat=%i%a'; }
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
- else { $sURL_add = '&sub=%s'; }
+ else { $sURL_add = '&
amp;
sub=%s'; }
$default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
$num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
$default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
$num_cols = is_numeric(@$pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
@@
-1041,7
+1044,8
@@
class rrdstat {
$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:');
$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 = '<html><head>'."\n";
+ $out = '<!DOCTYPE html>'."\n";
+ $out .= '<html><head>'."\n";
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }
$out .= '<title>'.$ptitle.'</title>'."\n";
$out .= '<style type="text/css">'."\n";
if (isset($pconf['style_base'])) { $out .= $pconf['style_base']; }