diff options
| author | Pim van den Berg | 2012-12-28 19:52:04 +0100 |
|---|---|---|
| committer | Pim van den Berg | 2012-12-28 19:52:04 +0100 |
| commit | 1ec1ac396e8158886f302ac1b1fb20655e5f6b9f (patch) | |
| tree | 4887553f307853bea33795871be07a69ad6206b7 /inc/collectd.inc.php | |
| parent | layout: use the max width of the browser to show the graphs (diff) | |
| download | apt-panopticon_cgp-1ec1ac396e8158886f302ac1b1fb20655e5f6b9f.zip apt-panopticon_cgp-1ec1ac396e8158886f302ac1b1fb20655e5f6b9f.tar.gz apt-panopticon_cgp-1ec1ac396e8158886f302ac1b1fb20655e5f6b9f.tar.bz2 apt-panopticon_cgp-1ec1ac396e8158886f302ac1b1fb20655e5f6b9f.tar.xz | |
resolve php warning/notices when plugin doesn't exist
For example when a non existing plugin is defined in $CONFIG['overview'] it
causes a lot of php warnings/notices.
Diffstat (limited to 'inc/collectd.inc.php')
| -rw-r--r-- | inc/collectd.inc.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php index 3467667..99ffdd1 100644 --- a/inc/collectd.inc.php +++ b/inc/collectd.inc.php | |||
| @@ -54,6 +54,7 @@ function collectd_plugindata($host, $plugin=NULL) { | |||
| 54 | 54 | ||
| 55 | # only return data about one plugin | 55 | # only return data about one plugin |
| 56 | if (!is_null($plugin)) { | 56 | if (!is_null($plugin)) { |
| 57 | $pdata = array(); | ||
| 57 | foreach($data as $item) { | 58 | foreach($data as $item) { |
| 58 | if ($item['p'] == $plugin) | 59 | if ($item['p'] == $plugin) |
| 59 | $pdata[] = $item; | 60 | $pdata[] = $item; |
| @@ -113,6 +114,7 @@ function collectd_plugindetail($host, $plugin, $detail, $where=NULL) { | |||
| 113 | function group_plugindata($plugindata) { | 114 | function group_plugindata($plugindata) { |
| 114 | global $CONFIG; | 115 | global $CONFIG; |
| 115 | 116 | ||
| 117 | $data = array(); | ||
| 116 | # type instances should be grouped in 1 graph | 118 | # type instances should be grouped in 1 graph |
| 117 | foreach ($plugindata as $item) { | 119 | foreach ($plugindata as $item) { |
| 118 | # backwards compatibility | 120 | # backwards compatibility |
| @@ -129,6 +131,9 @@ function group_plugindata($plugindata) { | |||
| 129 | } | 131 | } |
| 130 | 132 | ||
| 131 | function plugin_sort($data) { | 133 | function plugin_sort($data) { |
| 134 | if (empty($data)) | ||
| 135 | return $data; | ||
| 136 | |||
| 132 | foreach ($data as $key => $row) { | 137 | foreach ($data as $key => $row) { |
| 133 | $pi[$key] = (isset($row['pi'])) ? $row['pi'] : null; | 138 | $pi[$key] = (isset($row['pi'])) ? $row['pi'] : null; |
| 134 | $c[$key] = (isset($row['c'])) ? $row['c'] : null; | 139 | $c[$key] = (isset($row['c'])) ? $row['c'] : null; |
