1 files changed, 4 insertions, 18 deletions

diff --git a/plugin/swap.php b/plugin/swap.php
index 638ddc3..e1527cc 100644
--- a/plugin/swap.php
+++ b/plugin/swap.php
@@ -4,6 +4,7 @@
 
 require_once 'conf/common.inc.php';
 require_once 'type/GenericStacked.class.php';
+require_once 'inc/collectd.inc.php';
 
 ## LAYOUT
 # swap/
@@ -11,25 +12,12 @@ require_once 'type/GenericStacked.class.php';
 # swap/swap-free.rrd
 # swap/swap-used.rrd
 
-if ($type == 'swap_io') {
+if ($_GET['t'] == 'swap_io') {
         die_img('Error: swap_io not supported yet');
         exit;
 }
 
-# grouped
-require_once 'inc/collectd.inc.php';
-$tinstance = collectd_plugindetail($host, $plugin, 'ti', array('t' => $type));
-
-$obj = new Type_GenericStacked;
-$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_GenericStacked($CONFIG['datadir']);
 $obj->order = array('free', 'cached', 'used');
 $obj->ds_names = array(
         'free' => 'Free    ',
@@ -43,14 +31,12 @@ $obj->colors = array(
 );
 $obj->width = $width;
 $obj->heigth = $heigth;
-$obj->seconds = $seconds;
 
 $obj->rrd_title = 'Swap utilization';
 $obj->rrd_vertical = 'Bytes';
 $obj->rrd_format = '%5.1lf%s';
 
-collectd_flush(ident_from_args($obj->args));
-
+collectd_flush($obj->identifiers);
 $obj->rrd_graph();
 
 ?>