projects
/
php-utility-classes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make year separator move correctly to Jan 1
[php-utility-classes.git]
/
include
/
classes
/
rrdstat.php-class
diff --git
a/include/classes/rrdstat.php-class
b/include/classes/rrdstat.php-class
index 55ffaec9d380e2ac7099597ddfb7757a92c91149..083ccfeee052b1e117883516455dd919fba2cd26 100644
(file)
--- a/
include/classes/rrdstat.php-class
+++ b/
include/classes/rrdstat.php-class
@@
-154,9
+154,12
@@
class rrdstat {
if (!is_null($evalcode)) {
ob_start();
eval($evalcode);
if (!is_null($evalcode)) {
ob_start();
eval($evalcode);
- $upvals = explode("\n", ob_get_contents());
+ $ret = ob_get_contents();
+ if (strlen($ret)) { $upvals = explode("\n", $ret); }
ob_end_clean();
}
ob_end_clean();
}
+ $walkfunc = create_function('&$val,$key', '$val = is_numeric($val)?$val:"U";');
+ array_walk($upvals, $walkfunc);
}
else {
foreach ($this->rrd_fields as $ds) {
}
else {
foreach ($this->rrd_fields as $ds) {
@@
-193,8
+196,11
@@
class rrdstat {
$upvals[] = is_null($val)?'U':$val;
}
}
$upvals[] = is_null($val)?'U':$val;
}
}
- $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
- $return = `$update_cmd 2>&1`;
+ $return = null;
+ if (count($upvals)) {
+ $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
+ $return = `$update_cmd 2>&1`;
+ }
if (strpos($return, 'ERROR') !== false) {
trigger_error($this->rrd_file.' - rrd update error: '.$return, E_USER_WARNING);
if (strpos($return, 'ERROR') !== false) {
trigger_error($this->rrd_file.' - rrd update error: '.$return, E_USER_WARNING);
@@
-313,8
+319,8
@@
class rrdstat {
$duration = isset($gconf['duration'])?$gconf['duration']:396*86400; // 365+31 days
$slice = isset($gconf['slice'])?$gconf['slice']:86400; // 1 day
// vertical lines at month borders
$duration = isset($gconf['duration'])?$gconf['duration']:396*86400; // 365+31 days
$slice = isset($gconf['slice'])?$gconf['slice']:86400; // 1 day
// vertical lines at month borders
- $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01')).'#FF0000';
- $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01').' -1 year').'#FF0000';
+ $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01
12:00:00
')).'#FF0000';
+ $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01
12:00:00
').' -1 year').'#FF0000';
}
else {
$duration = isset($gconf['duration'])?$gconf['duration']:$this->rrd_step*500; // 500 steps
}
else {
$duration = isset($gconf['duration'])?$gconf['duration']:$this->rrd_step*500; // 500 steps