X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=0cc03ef556fc62aada4882a69cef84bc2c8d6fdf;hp=833820a8e30bf3bee8e91d1bf0fd03cf0b2082dd;hb=633b21afce66bd8ea1f0a3345173f2a6c33b9389;hpb=31cb3fc44710f4ba3ca6de3ec119183e2e38e1a2

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 833820a..0cc03ef 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -286,19 +286,23 @@ class rrdstat {
 
   function update($upArray = null) {
     // feed new data into RRD
-    if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return 1; }
+    if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return false; }
     $upvals = array();
     if (isset($this->config_raw['update'])) {
-      $evalcode = $this->config_raw['update'];
-      if (!is_null($evalcode)) {
-        ob_start();
-        eval($evalcode);
-        $ret = ob_get_contents();
-        if (strlen($ret)) { $upvals = explode("\n", $ret); }
-        ob_end_clean();
+      if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $this->config_raw['update'], $regs)) {
+        $upfunc = create_function('', $regs[1]);
+        $upvals = $upfunc();
+      }
+      else {
+        $evalcode = $this->config_raw['update'];
+        if (!is_null($evalcode)) {
+          ob_start();
+          eval($evalcode);
+          $ret = ob_get_contents();
+          if (strlen($ret)) { $upvals = explode("\n", $ret); }
+          ob_end_clean();
+        }
       }
-      $walkfunc = create_function('&$val,$key', '$val = is_numeric(trim($val))?trim($val):((trim($val)=="L")?"L":"U");');
-      array_walk($upvals, $walkfunc);
     }
     else {
       foreach ($this->rrd_fields as $ds) {
@@ -306,7 +310,7 @@ class rrdstat {
         elseif (isset($ds['update'])) {
           $val = null; $evalcode = null;
           if (substr($ds['update'], 0, 4) == 'val:') {
-            $evalcode = 'print(trim('.substr($ds['update'], 4).'));';
+            $evalcode = 'function { return trim('.substr($ds['update'], 4).')); }';
           }
           elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
             $snmphost = 'localhost'; $snmpcomm = 'public';
@@ -320,11 +324,15 @@ class rrdstat {
             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 = 'print(trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)));';
+              $evalcode = 'function { return trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)); }';
             }
           }
           else { $evalcode = $ds['update']; }
-          if (!is_null($evalcode)) {
+          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();
@@ -332,21 +340,24 @@ class rrdstat {
           }
         }
         else { $val = null; }
-        $upvals[] = is_null($val)?'U':$val;
+        $upvals[$ds['name']] = $val;
       }
     }
+    $key_names = (!is_numeric(array_shift(array_keys($upvals))));
     if (in_array('L', $upvals)) {
       // for at least one value, we need to set the same as the last recorded value
       $fvals = $this->fetch();
       $rowids = array_shift($fvals);
       $lastvals = array_shift($fvals);
       foreach (array_keys($upvals, 'L') as $akey) {
-        $upvals[$akey] = $lastvals[$rowids[$akey]];
+        $upvals[$akey] = $key_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
       }
     }
+    $walkfunc = create_function('&$val,$key', '$val = is_numeric(trim($val))?trim($val):"U";');
+    array_walk($upvals, $walkfunc);
     $return = null;
     if (count($upvals)) {
-      $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
+      $update_cmd = 'rrdtool update '.$this->rrd_file.($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
       $return = `$update_cmd 2>&1`;
     }
 
@@ -355,7 +366,7 @@ class rrdstat {
       $success = false;
     }
     else { $success = true; }
-  return ($return_var == 0);
+  return $success;
   }
 
   function fetch($cf = 'AVERAGE', $resolution = null, $start = null, $end = null) {