$this->status = 'graphonly';
}
elseif (isset($iinfo['file'])) {
- $this->rrd_file = (($iinfo['file']{0} != '/')?$this->basedir:'').$iinfo['file'];
+ $this->rrd_file = (($iinfo['file'][0] != '/')?$this->basedir:'').$iinfo['file'];
$this->basename = basename((substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file);
}
elseif (!is_null($conf_id) && file_exists($conf_id.'.rrd')) {
- $this->rrd_file = (($iinfo['file']{0} != '/')?$this->basedir:'').$conf_id.'.rrd';
+ $this->rrd_file = (($iinfo['file'][0] != '/')?$this->basedir:'').$conf_id.'.rrd';
$this->basename = $conf_id;
}
else {
if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return false; }
$upvals = array();
if (isset($this->config_raw['update'])) {
- if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $this->config_raw['update'], $regs)) {
- $upfunc = create_function('', $regs[1]);
- $upvals = $upfunc();
+ if (is_object($this->config_raw['update'])) {
+ // We assume it's an anonymous function
+ $upvals = $this->config_raw['update']();
}
else {
- $evalcode = $this->config_raw['update'];
+ if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $this->config_raw['update'], $regs)) {
+ $evalcode = '$upfunc = function() {'."\n".$regs[1]."\n".'};'."\n".'print(implode("\n", $upfunc()));';
+ }
+ else {
+ $evalcode = $this->config_raw['update'];
+ }
if (!is_null($evalcode)) {
ob_start();
eval($evalcode);
foreach ($this->rrd_fields as $ds) {
if (is_array($upArray) && isset($upArray[$ds['name']])) { $val = $upArray[$ds['name']]; }
elseif (isset($ds['update'])) {
- $val = null; $evalcode = null;
- if (substr($ds['update'], 0, 4) == 'val:') {
- $evalcode = 'function { return trim('.substr($ds['update'], 4).')); }';
+ $val = null;
+ if (is_object($ds['update'])) {
+ // We assume it's an anonymous function
+ $val = $ds['update']();
+ }
+ elseif (substr($ds['update'], 0, 4) == 'val:') {
+ $val = trim(substr($ds['update'], 4));
}
elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
if (substr_count($ds['update'], ':') >= 4) {
if ($valtype == 'in') { $oid = '1.3.6.1.2.1.2.2.1.10.'.$ifnr; }
elseif ($valtype == 'out') { $oid = '1.3.6.1.2.1.2.2.1.16.'.$ifnr; }
if (!is_null($ifnr) && !is_null($oid)) {
- $evalcode = 'function { return trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)); }';
+ $val = trim(substr(strrchr(`snmpget -v2c -c $snmpcomm $snmphost $oid`,":"),1));
}
}
- else { $evalcode = $ds['update']; }
- if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $evalcode, $regs)) {
- $upfunc = create_function('', $regs[1]);
- $val = $upfunc();
- }
- elseif (!is_null($evalcode)) {
- ob_start();
- eval($evalcode);
- $val = ob_get_contents();
- ob_end_clean();
+ else {
+ if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $ds['update'], $regs)) {
+ $evalcode = '$upfunc = function() {'."\n".$regs[1]."\n".'};'."\n".'print($upfunc());';
+ }
+ else {
+ $evalcode = $ds['update'];
+ }
+ if (!is_null($evalcode)) {
+ ob_start();
+ eval($evalcode);
+ $val = ob_get_contents();
+ ob_end_clean();
+ }
}
}
else { $val = null; }
$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);
+ array_walk($upvals, function(&$val, $key) { $val = is_numeric(trim($val)) ? trim($val) : "U"; });
$return = null;
if (count($upvals)) {
$update_cmd = $this->rrdtool_bin.' update '.$this->rrd_file
$fname = str_replace('%t', $timeframe, $fname);
$fname = str_replace('%f', $fmt_ext, $fname);
if (substr($fname, -strlen($fmt_ext)) != $fmt_ext) { $fname .= $fmt_ext; }
- if (isset($gconf['path']) && ($fname{0} != '/')) { $fname = $gconf['path'].'/'.$fname; }
- if ($fname{0} != '/') { $fname = $this->basedir.$fname; }
+ if (isset($gconf['path']) && ($fname[0] != '/')) { $fname = $gconf['path'].'/'.$fname; }
+ if ($fname[0] != '/') { $fname = $this->basedir.$fname; }
$fname = str_replace('//', '/', $fname);
$graphrows = array(); $specialrows = array(); $gC = 0;
}
$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) {
$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;
}
$snames = array(); $s_exclude = array(); $sfiles = array();
if (isset($pconf['index_ids'])) {
foreach (explode(',', $pconf['index_ids']) as $iid) {
- if ($iid{0} == '-') { $s_exclude[] = substr($iid, 1); }
+ if ($iid[0] == '-') { $s_exclude[] = substr($iid, 1); }
else { $snames[] = $iid; }
}
}