aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/inc/collectd.inc.php
diff options
context:
space:
mode:
authorPim van den Berg2013-03-30 14:08:23 +0100
committerPim van den Berg2013-03-30 14:13:23 +0100
commit1ad4de5b08e5d9fde394380418dda6f909ff91b4 (patch)
treed15865f975c4e21c1e4dfa87ef519d5a8c8e0683 /inc/collectd.inc.php
parentconf: disable overview_filter by default (diff)
downloadapt-panopticon_cgp-1ad4de5b08e5d9fde394380418dda6f909ff91b4.zip
apt-panopticon_cgp-1ad4de5b08e5d9fde394380418dda6f909ff91b4.tar.gz
apt-panopticon_cgp-1ad4de5b08e5d9fde394380418dda6f909ff91b4.tar.bz2
apt-panopticon_cgp-1ad4de5b08e5d9fde394380418dda6f909ff91b4.tar.xz
rewrite some code of added overview_filter feature
Use less variables, less code.
Diffstat (limited to 'inc/collectd.inc.php')
-rw-r--r--inc/collectd.inc.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php
index e8f3662..ad15774 100644
--- a/inc/collectd.inc.php
+++ b/inc/collectd.inc.php
@@ -154,15 +154,12 @@ function graphs_from_plugin($host, $plugin, $overview=false) {
154 $plugindata = group_plugindata($plugindata); 154 $plugindata = group_plugindata($plugindata);
155 $plugindata = plugin_sort($plugindata); 155 $plugindata = plugin_sort($plugindata);
156 156
157 $f = array();
158
159 if ($overview == true && isset($CONFIG['overview_filter'][$plugin])) {
160 $f = $CONFIG['overview_filter'][$plugin];
161 }
162
163 foreach ($plugindata as $items) { 157 foreach ($plugindata as $items) {
164 158
165 if (!empty($f) && ($f !== array_intersect_assoc($f, $items))) { 159 if (
160 $overview && isset($CONFIG['overview_filter'][$plugin]) &&
161 $CONFIG['overview_filter'][$plugin] !== array_intersect_assoc($CONFIG['overview_filter'][$plugin], $items)
162 ) {
166 continue; 163 continue;
167 } 164 }
168 165