1 files changed, 7 insertions, 21 deletions

diff --git a/plugin/sensors.php b/plugin/sensors.php
index 048f9f1..fda5432 100644
--- a/plugin/sensors.php
+++ b/plugin/sensors.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/Default.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # disk-XXXX/
@@ -11,49 +12,34 @@ require_once 'type/Default.class.php';
 # disk-XXXX/temerature-XXXX.rrd
 # disk-XXXX/voltage-XXXX.rrd
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti', array('t' => $type));
-
-$obj = new Type_Default;
-$obj->datadir = $CONFIG['datadir'];
-$obj->args = array(
-        'host' => $host,
-        'plugin' => $plugin,
-        'pinstance' => $pinstance,
-        'type' => $type,
-        'tinstance' => $tinstance,
-);
-$obj->data_sources = array('value');
+$obj = new Type_Default($CONFIG['datadir']);
 $obj->ds_names = array(
         'value' => 'Value  ',
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
-switch($type) {
+switch($obj->args['type']) {
         case 'fanspeed':
                 $obj->colors = '00ff00';
-                $obj->rrd_title = sprintf('Fanspeed (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Fanspeed (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'RPM';
                 $obj->rrd_format = '%5.1lf';
         break;
         case 'temperature':
                 $obj->colors = '0000ff';
-                $obj->rrd_title = sprintf('Temperature (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Temperature (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Celius';
                 $obj->rrd_format = '%5.1lf%s';
         break;
         case 'voltage':
                 $obj->colors = 'ff0000';
-                $obj->rrd_title = sprintf('Voltage (%s)', $pinstance);
+                $obj->rrd_title = sprintf('Voltage (%s)', $obj->args['pinstance']);
                 $obj->rrd_vertical = 'Volt';
                 $obj->rrd_format = '%5.1lf';
         break;
 }
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>